build scripts update

4 files changed, 19 insertions, 6 deletions

diff --git a/scripts/portable_build.sh b/scripts/portable_build.sh
index 89f2d1ca..3a11ea99 100755
--- a/scripts/portable_build.sh
+++ b/scripts/portable_build.sh
@@ -9,7 +9,7 @@ export APBUILD_STATIC_LIBGCC=1
 
 ./autogen.sh
 
-./configure --enable-staticlink=yes --enable-portable=yes --disable-artwork-imlib2
+./configure --enable-staticlink --enable-portable --disable-artwork-imlib2
 sed -i 's/-lstdc++ -lm -lgcc_s -lc -lgcc_s/-lm -lc/g' libtool
 make clean
 make -j9
@@ -23,5 +23,3 @@ cd tools/pluginfo
 make
 cd ../../
 
-./scripts/portable_postbuild.sh
-
diff --git a/scripts/portable_package_static.sh b/scripts/portable_package_static.sh
index 26fa6051..1ad0c076 100755
--- a/scripts/portable_package_static.sh
+++ b/scripts/portable_package_static.sh
@@ -1,23 +1,28 @@
 #!/bin/sh
 
+./scripts/portable_postbuild.sh
+
 # package for distribution
 VERSION=`cat PORTABLE_VERSION | perl -ne 'chomp and print'`
 BUILD=`cat PORTABLE_BUILD | perl -ne 'chomp and print'`
+ARCH=`uname -m | perl -ne 'chomp and print'`
 
 # main distro
 SRCDIR=deadbeef-$VERSION
 PLUGDIR=$SRCDIR/plugins
 DOCDIR=$SRCDIR/doc
 PIXMAPDIR=$SRCDIR/pixmaps
+OUTNAME=deadbeef-static_${VERSION}-${BUILD}_${ARCH}.tar.bz2
 
 ARCH=`uname -m | perl -ne 'chomp and print'`
 
-rm portable_out/build/deadbeef-$VERSION-static-$ARCH.tar.bz2
+rm portable_out/build/$OUTNAME
 
 cd portable/$ARCH
-tar jcvf ../..//portable_out/build/deadbeef-$VERSION-static-$ARCH.tar.bz2\
+tar jcvf ../../portable_out/build/$OUTNAME\
     $SRCDIR/deadbeef\
     $SRCDIR/deadbeef.png\
+    $SRCDIR/.ddb_portable\
     $DOCDIR\
     $PLUGDIR/aac.so\
     $PLUGDIR/adplug.so\
diff --git a/scripts/portable_postbuild.sh b/scripts/portable_postbuild.sh
index 65bf55fd..45db6740 100755
--- a/scripts/portable_postbuild.sh
+++ b/scripts/portable_postbuild.sh
@@ -79,6 +79,7 @@ for i in po/*.gmo ; do
 done
 cp translation/help.pt_BR.txt $OUTDIR/doc/
 cp translation/help.ru.txt $OUTDIR/doc/
+touch $OUTDIR/.ddb_portable
 
 # strip
 if [ $OSTYPE != 'Darwin' ];then
diff --git a/scripts/static_build.sh b/scripts/static_build.sh
index e7a0bacc..250b29e8 100755
--- a/scripts/static_build.sh
+++ b/scripts/static_build.sh
@@ -4,10 +4,19 @@ ORIGIN=`pwd | perl -ne 'chomp and print'`
 AP=$ORIGIN/tools/apbuild
 ARCH=`uname -m | perl -ne 'chomp and print'`
 
+cd tools/apbuild
+./apinit
+cd ../../
+
 ./autogen.sh
 
 export APBUILD_STATIC_LIBGCC=1
-CC=$AP/apgcc CXX=$AP/apgcc  ./configure --enable-staticlink=yes --disable-artwork-imlib2 --prefix=/opt/deadbeef
+CC=$AP/apgcc CXX=$AP/apgcc ./configure --enable-staticlink --disable-artwork-imlib2 --prefix=/opt/deadbeef
 sed -i 's/-lstdc++ -lm -lgcc_s -lc -lgcc_s/-lm -lc/g' libtool
+make clean
 make DESTDIR=`pwd`/static/$ARCH/deadbeef-$VERSION -j8 install
 
+echo "building pluginfo tool..."
+cd tools/pluginfo
+make
+cd ../../