From 7d8823bcd8a4548a2cb940599820cc720f9ee96f Mon Sep 17 00:00:00 2001
From: amrein <amrein@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Mon, 30 Mar 2020 11:10:00 +0000
Subject: [PATCH] Remove .bm files from tarball No more bm file handling in
 tarball build scripts

git-svn-id: svn://ultimatepp.org/upp/trunk@14203 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppbox/Scripts/Makefile  | 2 --
 uppbox/Scripts/doinstall | 5 -----
 uppbox/Scripts/domake    | 8 +-------
 uppbox/Scripts/src       | 2 --
 uppbox/Scripts/upp.spec  | 2 --
 5 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/uppbox/Scripts/Makefile b/uppbox/Scripts/Makefile
index 95900590c..cc12d7a55 100644
--- a/uppbox/Scripts/Makefile
+++ b/uppbox/Scripts/Makefile
@@ -29,8 +29,6 @@ distclean: clean
 	rm -f theide
 	rm -f umk
 	rm -f theide.desktop
-	rm -f GCC.bm
-	rm -f CLANG.bm
 	rm -f uppsrc/Makefile
 	rm -f uppsrc/uMakefile
 	rm -f uppsrc/build_info.h
diff --git a/uppbox/Scripts/doinstall b/uppbox/Scripts/doinstall
index e68cf864c..42afe1164 100755
--- a/uppbox/Scripts/doinstall
+++ b/uppbox/Scripts/doinstall
@@ -321,11 +321,6 @@ log_debug_info "Cleaning source code"
   rm -r "$DESTDIR$prefix/upp/uppsrc/umk.out"
 #<end> TODO
 
-  if [ "$(ls *.bm 2>/dev/null)" != "" ]
-  then
-log_debug_info "Copying" *.bm
-    cp -p *.bm  "$DESTDIR$prefix/.upp/theide"
-  fi
 
   if [ "$(ls *.udc 2>/dev/null)" != "" ]
   then
diff --git a/uppbox/Scripts/domake b/uppbox/Scripts/domake
index 62ca1d030..a1e0435a2 100755
--- a/uppbox/Scripts/domake
+++ b/uppbox/Scripts/domake
@@ -392,7 +392,7 @@ then
   log_debug_info "Extra parameters will supersede default parameters"
 fi
 
-log_debug_info "Configuring" uppsrc/*Makefile.in *.bm.in "with pkg-config"
+log_debug_info "Configuring" uppsrc/*Makefile.in
 
 library_list=""
 for i in uppsrc/*Makefile.in
@@ -401,12 +401,6 @@ do
   cp -a "$i" "${i%.in}"
 done
 
-for i in *.bm.in
-do
-##  sed -e "s@((INCLUDES))@`pkg-config --cflags-only-I $library_list|sed -e s/-I//g -e \"s/ /;/g\"`@g" -e "s@((LIBRARIES))@`pkg-config --libs-only-L $library_list|sed -e s/-L//g -e \"s/ /;/g\"`@g ${CXXSTD_RE}" "$i" > "${i%.in}"
-  cp -a "$i" "${i%.in}"
-done
-
 if [ "$platform" = "Darwin" ]
 then
   log_debug_info "Adjusting Makefiles for Mac OS X"
diff --git a/uppbox/Scripts/src b/uppbox/Scripts/src
index 8127c11c5..181933877 100644
--- a/uppbox/Scripts/src
+++ b/uppbox/Scripts/src
@@ -33,8 +33,6 @@ cp -p ~/Scripts/readme.md ~/upp.tmp/upp
 cp -p ~/Scripts/upp.spec ~/upp.tmp/upp
 cp -p ~/Scripts/debian ~/upp.tmp/upp/buildrequires.debian
 cp -p ~/Scripts/fedora ~/upp.tmp/upp/buildrequires.fedora
-cp -p ~/Scripts/GCCMK.bm ~/upp.tmp/upp/GCC.bm.in
-cp -p ~/Scripts/CLANGMK.bm ~/upp.tmp/upp/CLANG.bm.in
 
 svn_snapshot_version=$(svnversion ~/upp.src)
 current_date=$(LC_TIME=En date '+%a %b %d %Y')
diff --git a/uppbox/Scripts/upp.spec b/uppbox/Scripts/upp.spec
index 9ac6c629d..7e9b110a2 100644
--- a/uppbox/Scripts/upp.spec
+++ b/uppbox/Scripts/upp.spec
@@ -137,8 +137,6 @@ rm -fr %{buildroot}
 %{_datadir}/icons/hicolor/48x48/apps/theide.png
 %{_datadir}/pixmaps/theide.png
 %dir %{_datadir}/%{name}
-%{_datadir}/%{name}/CLANG.bm
-%{_datadir}/%{name}/GCC.bm
 %dir %{_datadir}/%{name}/speller
 %{_datadir}/%{name}/speller/*