From aafa6a715ccf53af3dad55ce79de27e1592dcad2 Mon Sep 17 00:00:00 2001 From: waker Date: Sun, 17 Apr 2011 22:13:02 +0200 Subject: prepared for building static 0.5-beta1 --- scripts/portable_build.sh | 2 +- scripts/portable_postbuild.sh | 32 +++++++++++++++++++------------- 2 files changed, 20 insertions(+), 14 deletions(-) (limited to 'scripts') diff --git a/scripts/portable_build.sh b/scripts/portable_build.sh index 35ee48a1..d5caf566 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-staticlink --enable-portable=yes --disable-pulse --disable-mpris --disable-nls +CC=$ORIGIN/tools/apbuild/apgcc CXX=$ORIGIN/tools/apbuild/apgcc ./configure --enable-staticlink --enable-portable --disable-nls --disable-pulse sed -i 's/-lstdc++ -lm -lgcc_s -lc -lgcc_s/-lm -lc/g' libtool make clean make -j9 diff --git a/scripts/portable_postbuild.sh b/scripts/portable_postbuild.sh index 41c573dd..51adbec2 100755 --- a/scripts/portable_postbuild.sh +++ b/scripts/portable_postbuild.sh @@ -1,7 +1,7 @@ #!/bin/sh VERSION=`cat PORTABLE_VERSION | perl -ne 'chomp and print'` OSTYPE=`uname -s` -OUTDIR=deadbeef-$VERSION-portable +OUTDIR=portable/deadbeef-$VERSION PLUGDIR=$OUTDIR/plugins DOCDIR=$OUTDIR/doc PIXMAPDIR=$OUTDIR/pixmaps @@ -9,27 +9,33 @@ mkdir -p $PLUGDIR mkdir -p $DOCDIR mkdir -p $PIXMAPDIR -cp ./deadbeef ./deadbeef-$VERSION-portable/ +cp ./deadbeef $OUTDIR for i in nullout cdda flac alsa mpgmad hotkeys vtx \ ffap ffmpeg wavpack vorbis oss vfs_curl \ lastfm sid adplug sndfile artwork \ supereq gme dumb notify musepack wildmidi \ - tta dca aac mms shn ao shellexec; do - if [ -f ./plugins/$i/.libs/$i.so ]; then + tta dca aac mms shn ao shellexec vfs_zip \ + m3u ; do + if [ -f ./plugins/$i/.libs/$i.so ]; then cp ./plugins/$i/.libs/$i.so $PLUGDIR/ else - echo $i not found + echo ./plugins/$i/.libs/$i.so not found fi + if [ -f ./plugins/$i/.libs/$i.fallback.so ]; then + cp ./plugins/$i/.libs/$i.fallback.so $PLUGDIR/ + fi done -for i in gtkui gtkui.fallback;do - if [ -f ./plugins/$i/.libs/$i.so ]; then - cp ./plugins/$i/.libs/$i.so $PLUGDIR/ - else - echo $i not found - fi -done +if [ -f ./plugins/gtkui/.libs/ddb_gui_GTK2.so ]; then + cp ./plugins/gtkui/.libs/ddb_gui_GTK2.so $PLUGDIR/ +else + echo ./plugins/gtkui/.libs/ddb_gui_GTK2.so not found +fi +if [ -f ./plugins/gtkui/.libs/ddb_gui_GTK2.fallback.so ]; then + cp ./plugins/gtkui/.libs/ddb_gui_GTK2.fallback.so $PLUGDIR/ +fi + #pixmaps @@ -47,6 +53,6 @@ cp ./icons/32x32/deadbeef.png $OUTDIR/ # strip if [ $OSTYPE != 'Darwin' ];then - strip --strip-unneeded ./deadbeef-$VERSION-portable/deadbeef + strip --strip-unneeded $OUTDIR/deadbeef for i in $PLUGDIR/*.so ; do strip --strip-unneeded $i ; done fi -- cgit v1.2.3