X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=toolbox;h=18e9c11883944c62a48b4ae02940a39da0772aa5;hb=410b11fd0f49e1c0b1afc895c3ff4c2de093b347;hp=e8e848d53500097859f37cc09bc17380db633c64;hpb=c5d781b4710fe6fec3f6de90c67b10165c1760f4;p=vlc diff --git a/toolbox b/toolbox index e8e848d535..18e9c11883 100755 --- a/toolbox +++ b/toolbox @@ -1,9 +1,10 @@ #! /bin/sh + ## toolbox for the VLC media player ## $Id$ ## -## Copyright (C) 2005 the VideoLAN team +## Copyright (C) 2002-2006 the VideoLAN team ## ## Authors: Samuel Hocevar ## Rémi Denis-Courmont @@ -35,7 +36,6 @@ recognized flags are: --update-flexml generate and fix flexml and flex code --distclean "make distclean" on steroids --dist-contrib add the contrib dir to MAKE_DIST - --make-woody change distdir to a woody distdir EOF exit 1 } @@ -91,9 +91,6 @@ case "$1" in --distclean) action=distclean ;; - --make-woody) - action=woody - ;; --add-include) action=include ;; @@ -130,7 +127,7 @@ if test "${action}" = "changelog" then YEAR="`date +%Y`" echo "toolbox --changelog no longer required. use this instead:" - echo " svn log -v -r '{$YEAR-12-31}:{$YEAR-01-01}' > ChangeLog" + echo " LANG=C svn log -v -r '{$YEAR-12-31}:{$YEAR-01-01}' > ChangeLog" exit 0 fi @@ -178,7 +175,7 @@ then do printf "." # Top of the project file - perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target} + perl -pe 'if(/ZSOURCESZ/){last;}' < ${target}.in > ${target} # The source files for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep -v "/.*/"` do @@ -275,7 +272,7 @@ EOF EOF done # The headers - perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){if(/§HEADERS§/){last;}print $_}' < ${target}.in >> ${target} + perl -e 'while(<>){if(/ZSOURCESZ/){last;}}while(<>){if(/ZHEADERSZ/){last;}print $_}' < ${target}.in >> ${target} for file in ${LIBVLC_HEADERS} do cat >> ${target} << EOF @@ -298,7 +295,7 @@ EOF cat >> ${target} << EOF # End Group${M} EOF - perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${target}.in >> ${target} + perl -e 'while(<>){if(/ZHEADERSZ/){last;}}while(<>){print $_}' < ${target}.in >> ${target} done # plugins files @@ -319,7 +316,7 @@ EOF source="${msdir}/plugins.${suf}.in" target="${msdir}/plugin_${mod}.${suf}" printf "." - perl -pe 'if(/§SOURCES§/){last;} s/§PLUGIN§/'${mod}'/g' < ${source} > ${target} + perl -pe 'if(/ZSOURCESZ/){last;} s/ZPLUGINZ/'${mod}'/g' < ${source} > ${target} for cfile in ${cfiles} do cat >> ${target} << EOF @@ -336,8 +333,8 @@ SOURCE="..\\modules\\`echo ${dir}/${cfile} | sed 's,/,\\\\,g'`"${M} EOF done # sed is really nicer for this... unfortunately it's broken under cygwin - # sed -ne '1,/§SOURCES§/d; /§HEADERS§/,$d; p' < ${source} >> ${target} - perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){if(/§HEADERS§/){last;}print $_}' < ${source} >> ${target} + # sed -ne '1,/ZSOURCESZ/d; /ZHEADERSZ/,$d; p' < ${source} >> ${target} + perl -e 'while(<>){if(/ZSOURCESZ/){last;}}while(<>){if(/ZHEADERSZ/){last;}print $_}' < ${source} >> ${target} for hfile in ${hfiles} do cat >> ${target} << EOF @@ -346,8 +343,8 @@ SOURCE="..\\modules\\`echo ${dir}/${hfile} | sed 's,/,\\\\,g'`"${M} # End Source File${M} EOF done - # sed -ne '1,/§HEADERS§/d; p' < ${source} >> ${target} - perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${source} >> ${target} + # sed -ne '1,/ZHEADERSZ/d; p' < ${source} >> ${target} + perl -e 'while(<>){if(/ZHEADERSZ/){last;}}while(<>){print $_}' < ${source} >> ${target} done done done @@ -357,7 +354,7 @@ EOF do printf "." # Top of the project file - perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target} + perl -pe 'if(/ZSOURCESZ/){last;}' < ${target}.in > ${target} # The source files cat >> ${target} << EOF # Begin Source File${M} @@ -365,7 +362,7 @@ SOURCE="..\\src\\vlc.c"${M} # End Source File${M} EOF # Bottom of the project file - handles resource files too - perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){print $_}' < ${target}.in >> ${target} + perl -e 'while(<>){if(/ZSOURCESZ/){last;}}while(<>){print $_}' < ${target}.in >> ${target} done echo " done." @@ -415,20 +412,20 @@ then printf "." # Top of the project file guid=`perl -e 'sub r {return sprintf("%X", int rand(65536))} print r.r."-".r."-".r."-".r."-".r.r.r'` - perl -pe 'if(/§SOURCES§/){last;} s/§GUID§/'${guid}'/g' < ${target}.in > ${target} + perl -pe 'if(/ZSOURCESZ/){last;} s/ZGUIDZ/'${guid}'/g' < ${target}.in > ${target} # The source files cat >> ${target} << EOF ${M} EOF # Bottom of the project file - handles resource files too - perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){print $_}' < ${target}.in >> ${target} + perl -e 'while(<>){if(/ZSOURCESZ/){last;}}while(<>){print $_}' < ${target}.in >> ${target} # libvlc files target=msvc/libvlc.vcproj printf "." # Top of the project file guid=`perl -e 'sub r {return sprintf("%X", int rand(65536))} print r.r."-".r."-".r."-".r."-".r.r.r'` - perl -pe 'if(/§SOURCES§/){last;} s/§GUID§/'${guid}'/g' < ${target}.in > ${target} + perl -pe 'if(/ZSOURCESZ/){last;} s/ZGUIDZ/'${guid}'/g' < ${target}.in > ${target} # The source files for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep -v "/.*/"` do @@ -463,7 +460,7 @@ EOF EOF done # The headers - perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){if(/§HEADERS§/){last;}print $_}' < ${target}.in >> ${target} + perl -e 'while(<>){if(/ZSOURCESZ/){last;}}while(<>){if(/ZHEADERSZ/){last;}print $_}' < ${target}.in >> ${target} for file in ${LIBVLC_HEADERS} do cat >> ${target} << EOF @@ -482,7 +479,7 @@ EOF cat >> ${target} << EOF ${M} EOF - perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${target}.in >> ${target} + perl -e 'while(<>){if(/ZHEADERSZ/){last;}}while(<>){print $_}' < ${target}.in >> ${target} # plugins files for dir in `sed -ne 's,modules/\(.*\)/Makefile,\1,p' ${srcdir}/configure.ac` @@ -502,7 +499,7 @@ EOF target="${msdir}/plugin_${mod}.vcproj" printf "." guid=`perl -e 'sub r {return sprintf("%X", int rand(65536))} print r.r."-".r."-".r."-".r."-".r.r.r'` - perl -pe 'if(/§SOURCES§/){last;} s/§PLUGIN§/'${mod}'/g' < ${source} | sed 's,§GUID§,'${guid}',' > ${target} + perl -pe 'if(/ZSOURCESZ/){last;} s/ZPLUGINZ/'${mod}'/g' < ${source} | sed 's,ZGUIDZ,'${guid}',' > ${target} for cfile in ${cfiles} do cat >> ${target} << EOF @@ -510,16 +507,16 @@ EOF EOF done # sed is really nicer for this... unfortunately it's broken under cygwin - # sed -ne '1,/§SOURCES§/d; /§HEADERS§/,$d; p' < ${source} >> ${target} - perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){if(/§HEADERS§/){last;}print $_}' < ${source} >> ${target} + # sed -ne '1,/ZSOURCESZ/d; /ZHEADERSZ/,$d; p' < ${source} >> ${target} + perl -e 'while(<>){if(/ZSOURCESZ/){last;}}while(<>){if(/ZHEADERSZ/){last;}print $_}' < ${source} >> ${target} for hfile in ${hfiles} do cat >> ${target} << EOF ${M} EOF done - # sed -ne '1,/§HEADERS§/d; p' < ${source} >> ${target} - perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${source} >> ${target} + # sed -ne '1,/ZHEADERSZ/d; p' < ${source} >> ${target} + perl -e 'while(<>){if(/ZHEADERSZ/){last;}}while(<>){print $_}' < ${source} >> ${target} done done done @@ -552,7 +549,7 @@ then if test -z "${builddir}"; then builddir="`sed -ne 's/^top_builddir *= *//p' < Makefile`" fi - BUILTINS=`sed -ne 's/.*builtins *= *" *\([^"]*\)".*/\1/p' vlc-config` + BUILTINS=`sed -ne 's/.*builtins *= *" *\([^"]*\)".*/\1/p' ${builddir}/vlc-config` file="${builddir}/src/misc/modules_builtin.h" @@ -730,14 +727,14 @@ if test "${action}" = "distclean" then set -x # a naive sanity check to make sure we are in a VLC tree - test -f vlc.spec.mdk -a -f debian/rules || exit 1 + test -f vlc.spec.mdk -a -f vlc.win32.nsi.in || exit 1 # let's rock! find . -type f '(' -name '*.[oa]' -o -name '*.so' -o -name '*.sl' -o -name '*.dylib' -o -name '*.dll' -o -name .dirstamp -o '(' '(' ! -path '\./doc/developer/Makefile\.in' ')' -a -name Makefile.in ')' -o -name 'stamp-h*' -o -name '*~' -o -name '*.bak' -o -name '*.moc.cpp' ')' -exec rm -f '{}' ';' (cd autotools && find . -name '[a-z]*' -maxdepth 1 -exec rm -f '{}' ';') - (cd debian && find . -type d '(' -name '[a-z]*' ! -name 'patches' ')' -maxdepth 1 -exec rm -Rf '{}' ';') find msvc -type f -name '*.dsp' -exec rm -f '{}' ';' find evc -type f -name '*.vcp' -exec rm -f '{}' ';' find . -type d -name '.deps' -exec rm -Rf '{}' ';' + find . -type d -name '.libs' -exec rm -Rf '{}' ';' # there's some more cruft all around rm -f config.h config.log config.status rm -f vlc vlc-config Makefile Modules.am @@ -777,70 +774,3 @@ then cp ${srcdir}/extras/contrib/src/Patches/* "${distdir}/extras/contrib/src/Patches/" fi -## -## Build a woody-friendly package -## -if test "${action}" = "woody" -then - set -ex - test -d "$1" - - # changelog: replace (1.2.3-4) with (1.2.3-0woody.4) - sed -e 's/^vlc (\([^)]*\)-\([^-)]*\))/vlc-woody (\1-0woody.\2)/' \ - -e 's/ unstable; / stable; /' \ - < "$1/debian/changelog" > "$1/debian/changelog.woody" - mv "$1/debian/changelog.woody" "$1/debian/changelog" - - # control: replace liba52-*-dev with a52dec-dev (>=0.7.3) - # libdv*-dev with libdv-dev - # kdelibs4-dev with kdelibs-dev - # libqt3-mt-dev libqt3-compat-headers with libqt-dev - # libarts1-dev with libarts-dev - # libdvdread3-dev with libdvdread2-dev - # libdvdplay0-dev (>=1.0.1-2) with libdvdplay0-dev - # libxosd-dev (>=2.2.4-1.3) with libxosd-dev - # ttf-freefont with ttf-thryomanes - # dvb-dev (>= 1.0.1-6) with dvb-dev - # remove libwxgtk2.4-dev - # libidl0 (workaround for mozilla-dev's bad deps) - # libglib2.0-0 (workaround for mozilla-dev's bad deps) - # gcc-3.2 (workaround for an ICE in gcc-3.3) - # change Section: gnome with Section: graphics - # Section: kde with Section: kde - # Section: libdevel with Section: devel - sed -e 's/liba52-[^-]*-dev/a52dec-dev (>=0.7.3)/' \ - -e 's/libdv[0-9]*-dev/libdv-dev/' \ - -e 's/kdelibs[0-9]*-dev/kdelibs-dev/' \ - -e 's/libqt[0-9]*-mt-dev/libqt-dev/' \ - -e 's/, libqt[0-9]*-compat-headers[^,]*//' \ - -e 's/libarts[0-9]*-dev/libarts-dev/' \ - -e 's/libdvdread[0-9]*-dev/libdvdread2-dev/' \ - -e 's/, libdvdplay0-dev[^,]*/, libdvdplay0-dev/' \ - -e 's/, libxosd-dev[^,]*/, libxosd-dev/' \ - -e 's/, ttf-freefont[^,]*/, ttf-thryomanes/' \ - -e 's/, dvb-dev[^,]*/, dvb-dev/' \ - -e 's/, libwx[^,]*//' \ - -e '/Package: wxvlc/,/^ *$/d' \ - -e 's/, libidl0[^,]*//' \ - -e 's/, libglib2.0-0[^,]*//' \ - -e 's/, gcc-3.2[^,]*//' \ - -e 's/Section: gnome/Section: graphics/' \ - -e 's/Section: kde/Section: graphics/' \ - -e 's/Section: libdevel/Section: devel/' \ - < "$1/debian/control" > "$1/debian/control.woody" - mv "$1/debian/control.woody" "$1/debian/control" - - # rules: remove wxwindows and skins stuff - sed -e '/# Package: wxvlc/,/^ *$/d' \ - -e 's,--enable-wxwindows,--disable-wxwindows,' \ - -e 's,--enable-skins,--disable-skins,' \ - < "$1/debian/rules" > "$1/debian/rules.woody" - mv "$1/debian/rules.woody" "$1/debian/rules" - chmod 0755 "$1/debian/rules" - - # modules/misc/freetype.c: replace the default font - sed -e 's,freefont/FreeSerifBold.ttf,thryomanes/thryb___.ttf,' \ - < "$1/modules/misc/freetype.c" > "$1/modules/misc/freetype.c.woody" - mv "$1/modules/misc/freetype.c.woody" "$1/modules/misc/freetype.c" -fi -