summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--PORTABLE_BUILD2
-rwxr-xr-xportable_build.sh11
-rwxr-xr-xportable_package.sh5
-rwxr-xr-xportable_upload.sh9
4 files changed, 20 insertions, 7 deletions
diff --git a/PORTABLE_BUILD b/PORTABLE_BUILD
index d00491fd..0cfbf088 100644
--- a/PORTABLE_BUILD
+++ b/PORTABLE_BUILD
@@ -1 +1 @@
-1
+2
diff --git a/portable_build.sh b/portable_build.sh
index b9e2b4ca..062d391b 100755
--- a/portable_build.sh
+++ b/portable_build.sh
@@ -1,14 +1,17 @@
#!/bin/sh
VERSION=`cat PORTABLE_VERSION | perl -ne 'chomp and print'`
+ORIGIN=`pwd | perl -ne 'chomp and print'`
+export APBUILD_STATIC_LIBGCC=1
-CC=tools/apbuild/apgcc CXX=tools/apbuild/apgcc ./configure --enable-portable --disable-pulse --enable-maintainer-mode --disable-nls
+CC=$ORIGIN/tools/apbuild/apgcc CXX=$ORIGIN/tools/apbuild/apgcc ./configure --enable-portable --disable-pulse --disable-mpris --enable-maintainer-mode --disable-nls
sed -i 's/-lstdc++ -lm -lgcc_s -lc -lgcc_s/-lm -lc/g' libtool
-#make clean
+make clean
make -j9
-#./portable_postbuild.sh
-
cd tools/pluginfo
make
cd ../../
+
+./portable_postbuild.sh
+
diff --git a/portable_package.sh b/portable_package.sh
index c201b469..14a6233f 100755
--- a/portable_package.sh
+++ b/portable_package.sh
@@ -10,10 +10,11 @@ PLUGDIR=$SRCDIR/plugins
DOCDIR=$SRCDIR/doc
PIXMAPDIR=$SRCDIR/pixmaps
-mkdir -p portable_out 2>/dev/null
+mkdir -p portable_out/build 2>/dev/null
rm portable_out/* 2>/dev/null
+rm portable_out/build/* 2>/dev/null
-tar jcvf portable_out/deadbeef-$VERSION-portable-build$BUILD.tar.bz2\
+tar jcvf portable_out/build/deadbeef-$VERSION-portable-build$BUILD.tar.bz2\
$SRCDIR/deadbeef\
$SRCDIR/deadbeef.png\
$DOCDIR\
diff --git a/portable_upload.sh b/portable_upload.sh
new file mode 100755
index 00000000..482e66ea
--- /dev/null
+++ b/portable_upload.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+VERSION=`cat PORTABLE_VERSION | perl -ne 'chomp and print'`
+BUILD=`cat PORTABLE_BUILD | perl -ne 'chomp and print'`
+
+UPLOAD_URI=waker,deadbeef@frs.sourceforge.net:/home/frs/project/d/de/deadbeef/portable/$VERSION/
+
+scp portable_out/* $UPLOAD_URI/
+scp portable_out/build/* $UPLOAD_URI/