Fix up packaging

Signed-off-by: falkTX <falktx@falktx.com>

utils/pack-linux.sh

@@ -2,8 +2,6 @@
 
 set -e
 
-MODGUIS=("Kars" "MVerb" "MVerb" "Nekobi" "PingPongPan")
-
 # --------------------------------------------------------------------------------------------------------------------------------
 # extract debs and pack them
 
@@ -22,51 +20,37 @@ fi
 
 # --------------------------------------------------------------------------------------------------------------------------------
 
-cd bin
-
-mkdir -p tmp
-rm -rf tmp/*
-
 NAME="$1"
 
-make -C .. clean
-CFLAGS="-m32" CXXFLAGS="-m32" LDFLAGS="-m32" make HAVE_JACK=false HAVE_PROJM=false -C .. -j 8
+rm -rf "$NAME-linux32bit"
+rm -rf "$NAME-linux64bit"
+
+make clean
+CFLAGS="-m32" CXXFLAGS="-m32" LDFLAGS="-m32" make HAVE_JACK=false HAVE_PROJM=false -j 8
 mkdir -p "$NAME-linux32bit/ladspa"
 mkdir -p "$NAME-linux32bit/dssi"
 mkdir -p "$NAME-linux32bit/lv2"
 mkdir -p "$NAME-linux32bit/vst"
-mv *-ladspa.so "$NAME-linux32bit/ladspa"
-mv *-dssi *-dssi.so "$NAME-linux32bit/dssi"
-mv *.lv2/ "$NAME-linux32bit/lv2"
-mv *-vst.so "$NAME-linux32bit/vst"
-for MODGUI in ${MODGUIS[@]}; do
-  cp -r ../modguis/$MODGUI.modgui/modgui "$NAME-linux32bit"/lv2/$MODGUI.lv2/
-  cp ../modguis/$MODGUI.modgui/manifest.ttl "$NAME-linux32bit"/lv2/$MODGUI.lv2/modgui.ttl
-done
-cp "../utils/README-Linux.txt" "$NAME-linux32bit/README.txt"
+mv bin/*-ladspa.so "$NAME-linux32bit/ladspa"
+mv bin/*-dssi bin/*-dssi.so "$NAME-linux32bit/dssi"
+mv bin/*.lv2/ "$NAME-linux32bit/lv2"
+mv bin/*-vst.so "$NAME-linux32bit/vst"
+cp utils/README-Linux.txt "$NAME-linux32bit/README.txt"
 compressFolderAsTarGz "$NAME-linux32bit"
-rm -rf tmp/*
 
-make -C .. clean
-CFLAGS="-m64" CXXFLAGS="-m64" LDFLAGS="-m64" make HAVE_JACK=false HAVE_PROJM=false -C .. -j 8
+make clean
+CFLAGS="-m64" CXXFLAGS="-m64" LDFLAGS="-m64" make HAVE_JACK=false HAVE_PROJM=false -j 8
 mkdir -p "$NAME-linux64bit/ladspa"
 mkdir -p "$NAME-linux64bit/dssi"
 mkdir -p "$NAME-linux64bit/lv2"
 mkdir -p "$NAME-linux64bit/vst"
-mv *-ladspa.so "$NAME-linux64bit/ladspa"
-mv *-dssi *-dssi.so "$NAME-linux64bit/dssi"
-mv *.lv2/ "$NAME-linux64bit/lv2"
-mv *-vst.so "$NAME-linux64bit/vst"
-for MODGUI in ${MODGUIS[@]}; do
-  cp -rv ../modguis/$MODGUI.modgui/modgui "$NAME-linux64bit"/lv2/$MODGUI.lv2/
-  cp -v ../modguis/$MODGUI.modgui/manifest.ttl "$NAME-linux64bit"/lv2/$MODGUI.lv2/modgui.ttl
-done
-cp "../utils/README-Linux.txt" "$NAME-linux64bit/README.txt"
+mv bin/*-ladspa.so "$NAME-linux64bit/ladspa"
+mv bin/*-dssi bin/*-dssi.so "$NAME-linux64bit/dssi"
+mv bin/*.lv2/ "$NAME-linux64bit/lv2"
+mv bin/*-vst.so "$NAME-linux64bit/vst"
+cp utils/README-Linux.txt "$NAME-linux64bit/README.txt"
 compressFolderAsTarGz "$NAME-linux64bit"
-rm -rf tmp/*
-
-make -C .. clean
 
-cd ..
+make clean
 
 # --------------------------------------------------------------------------------------------------------------------------------

utils/pack-macos-10.08.sh

@@ -2,14 +2,12 @@
 
 set -e
 
-MODGUIS=("Kars" "MVerb" "MVerb" "Nekobi" "PingPongPan")
-
 # --------------------------------------------------------------------------------------------------------------------------------
 # extract debs and pack them
 
 function compressFolderAsZip() {
 rm -f "$1.zip"
-zip -X -r "$1" "$1"
+zip -X -r "$1.zip" "$1"
 rm -r "$1"
 }
 
@@ -24,35 +22,25 @@ sed -i -e "s|-MD -MP|-D_MD_MP_WORKAROUND|" */*.mk dpf/dgl/*.mk
 
 # --------------------------------------------------------------------------------------------------------------------------------
 
-cd bin
-
-mkdir -p tmp
-rm -rf tmp/*
-
 NAME="$1"
 
+rm -rf "$NAME-macOS"
+
 export CFLAGS="-mmacosx-version-min=10.5 -DMAC_OS_X_VERSION_MAX_ALLOWED=1060 -arch i386 -arch x86_64 -mfpmath=sse"
 export CXXFLAGS="$CFLAGS"
 export LDFLAGS="$CFLAGS"
 export MACOS="true"
 export MACOS_OLD="true"
 
-make -C .. clean
+make clean
 make HAVE_JACK=false HAVE_LIBLO=false HAVE_PROJM=false -C .. -j 2
-rm -rf *ladspa* *dssi*
+rm -rf bin/*ladspa* bin/*dssi*
 mkdir -p "$NAME-macOS"
-mv *.lv2 *.vst "$NAME-macOS"
-for MODGUI in ${MODGUIS[@]}; do
-  cp -r ../modguis/$MODGUI.modgui/modgui "$NAME-macOS"/$MODGUI.lv2/
-  cp ../modguis/$MODGUI.modgui/manifest.ttl "$NAME-macOS"/$MODGUI.lv2/modgui.ttl
-done
-cp "../utils/README-MacOS.txt" "$NAME-macOS/README.txt"
+mv bin/*.lv2 bin/*.vst "$NAME-macOS"
+cp utils/README-MacOS.txt "$NAME-macOS/README.txt"
 compressFolderAsZip "$NAME-macOS"
-rm -rf tmp/*
-
-make -C .. clean
 
-cd ..
+make clean
 
 # --------------------------------------------------------------------------------------------------------------------------------
 

utils/pack-windows-cross.sh

@@ -2,14 +2,12 @@
 
 set -e
 
-MODGUIS=("Kars" "MVerb" "MVerb" "Nekobi" "PingPongPan")
-
 # --------------------------------------------------------------------------------------------------------------------------------
 # extract debs and pack them
 
 function compressFolderAsZip() {
 rm -f "$1.zip"
-zip -X -r "$1" "$1"
+zip -X -r "$1.zip" "$1"
 rm -r "$1"
 }
 
@@ -22,43 +20,29 @@ fi
 
 # --------------------------------------------------------------------------------------------------------------------------------
 
-cd bin
-
-mkdir -p tmp
-rm -rf tmp/*
-
 NAME="$1"
 
-_mingw32-build make -C .. clean
-_mingw32-build make -C .. -j8
-for i in `ls *-vst.dll`; do mv $i `echo $i | awk 'sub("-vst","")'`; done
-rm -rf *ladspa* *dssi* *vst*
+rm -rf "$NAME-win32bit"
+rm -rf "$NAME-win64bit"
+
+_mingw32-build make clean
+_mingw32-build make HAVE_JACK=false HAVE_LIBLO=false HAVE_PROJM=false -j8
+for i in `ls bin/*-vst.dll`; do mv $i `echo $i | awk 'sub("-vst","")'`; done
+rm -rf bin/*ladspa* bin/*dssi* bin/*vst*
 mkdir -p "$NAME-win32bit"
-mv *.dll *.lv2/ "$NAME-win32bit"
-for MODGUI in ${MODGUIS[@]}; do
-  cp -r ../modguis/$MODGUI.modgui/modgui "$NAME-win32bit"/$MODGUI.lv2/
-  cp ../modguis/$MODGUI.modgui/manifest.ttl "$NAME-win32bit"/$MODGUI.lv2/modgui.ttl
-done
-cp "../utils/README-Windows.txt" "$NAME-win32bit/README.txt"
+mv bin/*.dll bin/*.lv2/ "$NAME-win32bit"
+cp utils/README-Windows.txt "$NAME-win32bit/README.txt"
 compressFolderAsZip "$NAME-win32bit"
-rm -rf tmp/*
 
-_mingw64-build make -C .. clean
-_mingw64-build make -C .. -j8
-for i in `ls *-vst.dll`; do mv $i `echo $i | awk 'sub("-vst","")'`; done
-rm -rf *ladspa* *dssi* *vst*
+_mingw64-build make clean
+_mingw64-build make HAVE_JACK=false HAVE_LIBLO=false HAVE_PROJM=false -j8
+for i in `ls bin/*-vst.dll`; do mv $i `echo $i | awk 'sub("-vst","")'`; done
+rm -rf bin/*ladspa* bin/*dssi* bin/*vst*
 mkdir -p "$NAME-win64bit"
-mv *.dll *.lv2/ "$NAME-win64bit"
-for MODGUI in ${MODGUIS[@]}; do
-  cp -rv ../modguis/$MODGUI.modgui/modgui "$NAME-win64bit"/$MODGUI.lv2/
-  cp -v ../modguis/$MODGUI.modgui/manifest.ttl "$NAME-win64bit"/$MODGUI.lv2/modgui.ttl
-done
-cp "../utils/README-Windows.txt" "$NAME-win64bit/README.txt"
+mv bin/*.dll bin/*.lv2/ "$NAME-win64bit"
+cp utils/README-Windows.txt "$NAME-win64bit/README.txt"
 compressFolderAsZip "$NAME-win64bit"
-rm -rf tmp/*
-
-_mingw64-build make -C .. clean
 
-cd ..
+_mingw64-build make clean
 
 # --------------------------------------------------------------------------------------------------------------------------------