X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=toolbox;h=15260fe5e440aa60f77c504d6e3157342a823c57;hb=22c5fe4ae5640b1f2e7358dccbc720faa84616a2;hp=0b90216ab2bc0917032346191e71866d383a6526;hpb=1e9c5147e15179de3d7a71bbea41fe4e7ee15ab2;p=vlc diff --git a/toolbox b/toolbox index 0b90216ab2..15260fe5e4 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 @@ -30,12 +31,10 @@ recognized flags are: --update-po update translation files --update-includes generate various include files --update-version generate src/misc/version.c - --update-glade generate and fix Glade code --update-glade2 generate and fix Glade 2 code --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 } @@ -82,18 +81,12 @@ case "$1" in --update-flexml) action=flexml ;; - --update-glade|--fix-glade) - action=glade - ;; --update-glade2|--update-glade-2|--fix-glade2) action=glade2 ;; --distclean) action=distclean ;; - --make-woody) - action=woody - ;; --add-include) action=include ;; @@ -130,7 +123,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,14 +171,14 @@ 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 cat >> ${target} << EOF # Begin Source File${M} SOURCE="..\\`echo ${file} | sed -e 's%/%\\\\%g'`"${M} -# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\".\\" /D DATA_PATH=\\"share\\"${M} +# ADD CPP /D "__LIBVLC__" /D PLUGIN_PATH=\\".\\" /D DATA_PATH=\\"share\\"${M} # End Source File${M} EOF done @@ -202,7 +195,7 @@ EOF cat >> ${target} << EOF # Begin Source File${M} SOURCE="..\\`echo ${file} | sed -e 's%/%\\\\%g'`"${M} -# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\".\\" /D DATA_PATH=\\"share\\"${M} +# ADD CPP /D "__LIBVLC__" /D PLUGIN_PATH=\\".\\" /D DATA_PATH=\\"share\\"${M} !IF "\$(CFG)" == "libvlc - Win32 (WCE MIPS) Release"${M} # PROP Output_Dir "MIPSRel\\${subdir}"${M} # PROP Intermediate_Dir "MIPSRel\\${subdir}"${M} @@ -258,7 +251,7 @@ EOF cat >> ${target} << EOF # Begin Source File${M} SOURCE="..\\`echo ${file} | sed -e 's%/%\\\\%g'`"${M} -# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\".\\" /D DATA_PATH=\\"share\\"${M} +# ADD CPP /D "__LIBVLC__" /D PLUGIN_PATH=\\".\\" /D DATA_PATH=\\"share\\"${M} !IF "\$(CFG)" == "libvlc - Win32 Release"${M} # PROP Output_Dir "Release\\${subdir}"${M} # PROP Intermediate_Dir "Release\\${subdir}"${M} @@ -275,7 +268,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 +291,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,13 +312,13 @@ 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 # Begin Source File${M} SOURCE="..\\modules\\`echo ${dir}/${cfile} | sed 's,/,\\\\,g'`"${M} -# ADD CPP /D "__VLC__" /D "__PLUGIN__" /D "MODULE_NAME=${mod}" /D "MODULE_NAME_IS_${mod}" ${M} +# ADD CPP /D "__LIBVLC__" /D "__PLUGIN__" /D "MODULE_NAME=${mod}" /D "MODULE_NAME_IS_${mod}" ${M} !IF "\$(CFG)" == "plugin_${mod} - Win32 Release"${M} # PROP Output_Dir "Release\\modules\\`echo ${dir} | sed 's,/,\\\\,g'`"${M} # PROP Intermediate_Dir "Release\\modules\\`echo ${dir} | sed 's,/,\\\\,g'`"${M} @@ -336,8 +329,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 +339,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 +350,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 +358,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 +408,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 +456,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 +475,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 +495,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 +503,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,11 +545,12 @@ 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" rm -f "${file}.tmp" + mkdir -p -- "${builddir}/src/misc" cat "${srcdir}/src/misc/modules_builtin.h.in" > "${file}.tmp" || exit 1 if test -n "${BUILTINS}" then @@ -612,6 +606,7 @@ then fi rm -f ${file}.tmp + mkdir -p -- "${builddir}/src/misc" cat > ${file}.tmp << EOF /* DO NOT EDIT THIS FILE - IT IS REGENERATED AT EVERY COMPILE - * IT GIVES BETTER TRACKING OF VLC STABLE AND DEVELOPMENT VERSIONS @@ -632,91 +627,35 @@ EOF exit 0 fi -## -## Fix glade-generated files -## -if test "${action}" = "glade" -then - for file in modules/gui/gtk/gnome.glade modules/gui/gtk/gtk.glade modules/gui/familiar/familiar.glade - do - echo "generating code from $file" - glade -w $file || exit 1 - done - - for file in modules/gui/gtk/gnome_interface.c modules/gui/gtk/gtk_interface.c modules/gui/familiar/interface.c - do - echo "fixing $file" - if grep "DO NOT EDIT THIS FILE" $file >/dev/null 2>&1 - then - rm -f $file.$$.bak - cat > $file.$$.bak << EOF -/* This file was created automatically by glade and fixed by bootstrap */ - -#include -EOF - sed -e 1,7d \ - -e 's#_(\(".:..:.."\))#\1#' \ - -e 's#_(\("[a-z0-9]*://[^"]*"\))#\1#' \ - -e 's#_("---")#"---"#' \ - -e 's#_("--")#"--"#' \ - -e 's#_(\("/dev/[^"]*"\))#"\1"#' \ - -e 's#_(\("./."\))#\1#' \ - < $file >> $file.$$.bak - mv -f $file.$$.bak $file - fi - done - - for file in modules/gui/gtk/gtk_support.h modules/gui/familiar/support.h - do - echo "fixing $file" - if grep "DO NOT EDIT THIS FILE" $file >/dev/null 2>&1 - then - rm -f $file.$$.bak - sed -e 's/DO NOT EDIT.*/Created by glade, fixed by bootstrap/' \ - -e 's,,,' \ - -e 's,#if.*ENABLE_NLS.*,#if 0 /* Disabled by bootstrap */,' \ - -e 's,#else,/* & */,' \ - < $file > $file.$$.bak - mv -f $file.$$.bak $file - fi - done - - exit 0 -fi - ## ## Fix glade2-generated files ## if test "${action}" = "glade2" then - for file in modules/gui/gtk2/gnome2.glade modules/gui/gtk2/gtk2.glade modules/gui/pda/pda.glade - do - echo "generating code from $file" - glade-2 -w $file || exit 1 - done + file="modules/gui/pda/pda.glade" + echo "generating code from $file" + glade-2 -w "$file" || exit 1 - for file in modules/gui/pda/pda_interface.c - do - echo "fixing $file" - if grep "DO NOT EDIT THIS FILE" $file >/dev/null 2>&1 - then - rm -f $file.$$.bak - cat > $file.$$.bak << EOF + file="modules/gui/pda/pda_interface.c" + echo "fixing $file" + if grep "DO NOT EDIT THIS FILE" "$file" >/dev/null 2>&1 + then + rm -f -- "$file.$$.bak" + cat > "$file.$$.bak" << EOF /* This file was created automatically by glade2 and fixed by bootstrap */ #include EOF - sed -e 1,7d \ - -e 's#_(\(".:..:.."\))#\1#' \ - -e 's#_(\("[a-z0-9]*://[^"]*"\))#\1#' \ - -e 's#_("---")#"---"#' \ - -e 's#_("--")#"--"#' \ - -e 's#_(\("/dev/[^"]*"\))#\1#' \ - -e 's#_(\("./."\))#\1#' \ - < $file >> $file.$$.bak - mv -f $file.$$.bak $file - fi - done + sed -e 1,7d \ + -e 's#_(\(".:..:.."\))#\1#' \ + -e 's#_(\("[a-z0-9]*://[^"]*"\))#\1#' \ + -e 's#_("---")#"---"#' \ + -e 's#_("--")#"--"#' \ + -e 's#_(\("/dev/[^"]*"\))#\1#' \ + -e 's#_(\("./."\))#\1#' \ + < "$file" >> "$file.$$.bak" + mv -f "$file.$$.bak" "$file" + fi exit 0 fi @@ -728,19 +667,22 @@ 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.mandriva.spec -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 . -false -path './extras/contrib/*' -type f '(' -name '*.[oa]' -o -name '*.l[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 . -maxdepth 1 -name '[a-z]*' -exec rm -f '{}' ';') 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 rm -Rf autom4te.cache rm -f mozilla/vlcintf.h mozilla/vlcintf.xpt + echo "\`toolbox --distclean\' is known to be broken." + echo "Don't complain if it does not work, or better yet, don't use it." + echo "You were warned." # FIXME: a lot of Makefiles are still there fi @@ -775,70 +717,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 -