diff options
| author |  waker <wakeroid@gmail.com> | 2010-11-20 18:12:49 +0100 |
|---|---|---|
| committer | waker <wakeroid@gmail.com> | 2010-11-20 18:12:49 +0100 |
| commit | 625c61f5fd96f8d84bd2a21f5b7951f64f8f5025 (patch) | |
| tree | adc0fb11fcf5f6deed9615f4805d55bf0d378828 /scripts | |
| parent | d90cdb9cf2344a8891643bdaaeba091603889821 (diff) | |
| parent | 38c085d04677559b5232b1ac7ae5469f6bb77e4d (diff) | |
Merge branch 'static' into multichannel
Conflicts:
main.c
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/portable_build.sh | 4 | ||||
| -rwxr-xr-x | scripts/portable_package.sh | 2 | ||||
| -rwxr-xr-x | scripts/portable_package_partial.sh | 36 |
3 files changed, 39 insertions, 3 deletions
diff --git a/scripts/portable_build.sh b/scripts/portable_build.sh index e973993b..4259c845 100755 --- a/scripts/portable_build.sh +++ b/scripts/portable_build.sh @@ -3,7 +3,7 @@ VERSION=`cat PORTABLE_VERSION | perl -ne 'chomp and print'` ORIGIN=`pwd | perl -ne 'chomp and print'` export APBUILD_STATIC_LIBGCC=1 -CC=$ORIGIN/tools/apbuild/apgcc CXX=$ORIGIN/tools/apbuild/apgcc ./configure --enable-portable --disable-pulse --disable-mpris --enable-maintainer-mode --disable-nls +CC=$ORIGIN/tools/apbuild/apgcc CXX=$ORIGIN/tools/apbuild/apgcc ./configure --enable-staticlink --enable-portable=yes --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 -j9 @@ -13,5 +13,5 @@ cd tools/pluginfo make cd ../../ -./portable_postbuild.sh +./scripts/portable_postbuild.sh diff --git a/scripts/portable_package.sh b/scripts/portable_package.sh index bf292789..fc6e09b6 100755 --- a/scripts/portable_package.sh +++ b/scripts/portable_package.sh @@ -14,7 +14,7 @@ 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/build/deadbeef-$VERSION-portable-build$BUILD.tar.bz2\ +tar jcvf portable_out/build/deadbeef-$VERSION-portable-r$BUILD.tar.bz2\ $SRCDIR/deadbeef\ $SRCDIR/deadbeef.png\ $DOCDIR\ diff --git a/scripts/portable_package_partial.sh b/scripts/portable_package_partial.sh new file mode 100755 index 00000000..d3d63396 --- /dev/null +++ b/scripts/portable_package_partial.sh @@ -0,0 +1,36 @@ +#!/bin/sh + +# package for distribution +VERSION=`cat PORTABLE_VERSION | perl -ne 'chomp and print'` +BUILD=`cat PORTABLE_BUILD | perl -ne 'chomp and print'` + +# main distro +SRCDIR=deadbeef-$VERSION-portable +PLUGDIR=$SRCDIR/plugins +DOCDIR=$SRCDIR/doc +PIXMAPDIR=$SRCDIR/pixmaps + +tar jcvf portable_out/build/deadbeef-$VERSION-portable-partial-r$BUILD.tar.bz2\ + $SRCDIR/deadbeef\ + $SRCDIR/deadbeef.png\ + $DOCDIR\ + $PLUGDIR/alsa.so\ + $PLUGDIR/oss.so\ + $PLUGDIR/vfs_curl.so\ + $PLUGDIR/artwork.so\ + $PLUGDIR/gtkui.so\ + $PLUGDIR/gtkui.fallback.so\ + $PLUGDIR/hotkeys.so\ + $PLUGDIR/cdda.so\ + $PLUGDIR/mpgmad.so\ + $PLUGDIR/vorbis.so\ + $PLUGDIR/wavpack.so\ + $PLUGDIR/flac.so\ + $PLUGDIR/ffap.so\ + $PLUGDIR/musepack.so\ + $PLUGDIR/notify.so\ + $PLUGDIR/sndfile.so\ + $PLUGDIR/supereq.so\ + $PLUGDIR/tta.so\ + $PIXMAPDIR + |