X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=toolbox;h=ef377b53915499bafa1205f2b0903031610fa55a;hb=eb8fdde69dda8e59b3befc83efd22da6119bc1ed;hp=6d5252825cc7b74e3f88925c1ddfb4d6fe110a4b;hpb=9340d5f1c779d0c7762cdc52dd66717da480bc7e;p=vlc diff --git a/toolbox b/toolbox index 6d5252825c..ef377b5391 100755 --- a/toolbox +++ b/toolbox @@ -1,13 +1,15 @@ #! /bin/sh ## toolbox for the VLC media player -## $Id: toolbox,v 1.34 2003/07/01 11:58:33 sam Exp $ +## $Id: toolbox,v 1.44 2003/07/31 13:06:05 sam Exp $ ## ## Authors: Samuel Hocevar ### ### Get a sane environment, just in case ### +LC_ALL=C +export LC_ALL LANG=C export LANG CYGWIN=binmode @@ -27,7 +29,8 @@ recognized flags are: --update-glade2 generate and fix Glade 2 code --update-flexml generate and fix flexml and flex code --changelog update the CVS changelog - --distclean "make distclean" + --distclean "make distclean" on steroids + --make-woody change distdir to a woody distdir EOF exit 1 } @@ -37,7 +40,7 @@ EOF ## getfiles() { - nawk 'BEGIN{a=0}{if(!a&&/^'"$1"'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < "${srcdir}/Makefile.am" | \ + awk 'BEGIN{a=0}{if(!a&&$0~/^'"$1"'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if($0~/^[a-zA-Z]/){exit;}print $0}}' < "${srcdir}/Makefile.am" | \ tr '\\ ' '\n\n' | \ sed -ne 's/[^-$()_a-zA-Z0-9][^-$()_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p' | \ sed -e "s,^,${srcdir}/," @@ -77,6 +80,12 @@ case "$1" in --distclean) action=distclean ;; + --make-woody) + action=woody + ;; + --add-include) + action=include + ;; --help) help ;; @@ -87,6 +96,19 @@ case "$1" in esac shift +## +## Add includes to help doxygen +## +if test "${action}" = "include" +then + case "$1" in + */vlc_common.h|*/include/vlc/*);; + */include/*.h) echo "#include " ;; + esac + cat $1 + exit 0 +fi + ## ## Update the CVS changelog ## @@ -102,7 +124,7 @@ then YEAR=`sed -e 's/\(....\)-..-.*/\1/;q' ChangeLog.tmp` LASTYEAR="$((${YEAR} - 1))" sed -ne "/^${YEAR}-..-../,/^${LASTYEAR}-..-../{/^${LASTYEAR}-..-../d;p}" \ - < ChangeLog.tmp > Changelog + < ChangeLog.tmp > ChangeLog rm -f ChangeLog.tmp exit 0 # To generate changelog for the year 2001: @@ -116,10 +138,12 @@ if test "${action}" = "vc" then echo "generating Visual Studio files..." - srcdir="`sed -ne 's/^srcdir *= *//p' < Makefile`" + if test -z "${srcdir}"; then + srcdir="`sed -ne 's/^srcdir *= *//p' < Makefile`" + fi - # The evil ^M - M="`printf '\r'`" + # The evil ^M. printf '\r' does not work in Cygwin. + M=' ' # Variables we get from configure.ac LIBVLC_VERSION=`sed -ne '/AC_INIT/s/.*,\(.*\))/\1/p' < configure.ac` @@ -157,7 +181,7 @@ then do cat >> ${target} << EOF # Begin Source File${M} -SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M} +SOURCE="..\\`echo ${file} | sed -e 's%/%\\\\%g'`"${M} # ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\".\\" /D DATA_PATH=\\"share\\"${M} # End Source File${M} EOF @@ -173,7 +197,7 @@ EOF then cat >> ${target} << EOF # Begin Source File${M} -SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M} +SOURCE="..\\`echo ${file} | sed -e 's%/%\\\\%g'`"${M} # ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\".\\" /D DATA_PATH=\\"share\\"${M} !IF "\$(CFG)" == "libvlc - Win32 (WCE MIPS) Release"${M} # PROP Output_Dir "MIPSRel\\${subdir}"${M} @@ -211,7 +235,7 @@ EOF else cat >> ${target} << EOF # Begin Source File${M} -SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M} +SOURCE="..\\`echo ${file} | sed -e 's%/%\\\\%g'`"${M} # ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\".\\" /D DATA_PATH=\\"share\\"${M} !IF "\$(CFG)" == "libvlc - Win32 Release"${M} # PROP Output_Dir "Release\\${subdir}"${M} @@ -234,7 +258,7 @@ EOF do cat >> ${target} << EOF # Begin Source File${M} -SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M} +SOURCE="..\\`echo ${file} | sed -e 's%/%\\\\%g'`"${M} # End Source File${M} EOF done @@ -245,7 +269,7 @@ EOF do cat >> ${target} << EOF # Begin Source File${M} -SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M} +SOURCE="..\\`echo ${file} | sed -e 's%/%\\\\%g'`"${M} # End Source File${M} EOF done @@ -256,45 +280,47 @@ EOF done # plugins files - grep '^L_[^ ]*_pic =' Modules.am | while read a b c + for dir in `sed -ne 's,modules/\(.*\)/Makefile,\1,p' ${srcdir}/configure.ac` do - makefile="`echo $c | sed -e 's@/[^/]*$@/Modules.am@'`" - plugin="`echo $a | sed 's/L_\(.*\)_pic/\1/'`" - # this is an attempt at getting a list of plugin sources... we take the - # production and remove everything that does not contain "module", which - # means you miss $(NULL), but other variables too. - cfiles=`grep -v '[^-_a-zA-Z0-9]*#' ${makefile} | nawk 'BEGIN{a=0}{if(!a&&/^SOURCES_'${plugin}'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' | tr '\\ ' '\n\n' | sed -ne 's,/,\\\\,g; s/.*modules/modules/p'` - hfiles=`for i in ${cfiles} ; do echo $i ; done | grep '\.h$'` - cfiles=`for i in ${cfiles} ; do echo $i ; done | grep -v '\.h$'` - for dir in evc msvc + mf="${srcdir}/modules/${dir}/Modules.am" + for mod in `sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < ${mf}` do - test "${dir}" = "evc" && suf="vcp" || suf="dsp" - source="${dir}/plugins.${suf}.in" - target="${dir}/plugin_${plugin}.${suf}" - echo "${target}" - perl -pe 'if(/§SOURCES§/){last;} s/§PLUGIN§/'${plugin}'/g' < ${source} > ${target} - for cfile in ${cfiles} + # this is an attempt at getting a list of plugin sources... we take the + # production and remove everything that does not contain "module", which + # means you miss $(NULL), but other variables too. + allfiles=`grep -v '[^-_a-zA-Z0-9]*#' ${mf} | awk 'BEGIN{a=0}{if(!a&&$0~/^SOURCES_'${mod}'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if($0~/^[a-zA-Z]/){exit;}print $0}}' | tr '\\ ' '\n\n' | grep '\.'` + hfiles=`for i in ${allfiles} ; do echo "$i" ; done | grep '\.h$'` + cfiles=`for i in ${allfiles} ; do echo "$i" ; done | grep -v '\.h$'` + for msdir in evc msvc do - cat >> ${target} << EOF + test "${msdir}" = "evc" && suf="vcp" || suf="dsp" + source="${msdir}/plugins.${suf}.in" + target="${msdir}/plugin_${mod}.${suf}" + echo "${target}" + perl -pe 'if(/§SOURCES§/){last;} s/§PLUGIN§/'${mod}'/g' < ${source} > ${target} + for cfile in ${cfiles} + do + cat >> ${target} << EOF # Begin Source File${M} -SOURCE="..\\${cfile}"${M} -# ADD CPP /D "__VLC__" /D "__PLUGIN__" /D "MODULE_NAME=${plugin}" /D "MODULE_NAME_IS_${plugin}" ${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} # End Source File${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} - for hfile in ${hfiles} - do - cat >> ${target} << 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} + for hfile in ${hfiles} + do + cat >> ${target} << EOF # Begin Source File${M} -SOURCE="..\\${hfile}"${M} +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} done - # sed -ne '1,/§HEADERS§/d; p' < ${source} >> ${target} - perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${source} >> ${target} done done @@ -345,10 +371,14 @@ then echo "# automatically created by toolbox --update-po" > po/POTFILES.in echo "" >> po/POTFILES.in echo "# main sources" >> po/POTFILES.in - find include src -name '*.[chm]' -o -name '*.[ch]pp' | sort >> po/POTFILES.in + find include src -name '*.[chm]' -o -name '*.[ch]pp' \ + | grep -v '\(vlc_symbols\|misc/modules_\)' \ + | sort >> po/POTFILES.in echo "" >> po/POTFILES.in echo "# modules" >> po/POTFILES.in - find modules -name '*.[chm]' -o -name '*.[ch]pp' | grep -v 'gui/win32/' | sort >> po/POTFILES.in + find modules -name '*.[chm]' -o -name '*.[ch]pp' \ + | grep -v '\(gui/win32/\)' \ + | sort >> po/POTFILES.in # clean old potfiles cd po rm -f vlc.pot @@ -367,7 +397,9 @@ if test "${action}" = "includes" then #set -x - srcdir="`sed -ne 's/^srcdir *= *//p' < Makefile`" + if test -z "${srcdir}"; then + srcdir="`sed -ne 's/^srcdir *= *//p' < Makefile`" + fi LIBVLC_HEADERS=`getfiles HEADERS_include` BUILTINS=`sed -ne 's/.*builtins *= *" *\([^"]*\)".*/\1/p' vlc-config` @@ -407,7 +439,7 @@ then file="${srcdir}/src/misc/modules_builtin.h" rm -f ${file}.tmp && cp ${file}.in ${file}.tmp - if test "${BUILTINS}" != "" + if test -n "${BUILTINS}" then for i in `echo ${BUILTINS}` do @@ -418,7 +450,7 @@ then echo "#define ALLOCATE_ALL_BUILTINS() \\" >> ${file}.tmp echo " do \\" >> ${file}.tmp echo " { \\" >> ${file}.tmp - if test "${BUILTINS}" != "" + if test -n "${BUILTINS}" then for i in `echo ${BUILTINS}` do @@ -525,7 +557,7 @@ if test "${action}" = "distclean" then set -x # a naive sanity check to make sure we are in a VLC tree - test -f vlc.spec -a -f debian/rules || exit 1 + test -f vlc.spec.mdk -a -f debian/rules || 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 -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]*' -exec rm -f '{}' ';') @@ -541,3 +573,72 @@ then # FIXME: a lot of Makefiles are still there 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 + # remove libwxgtk2.4-dev + # libflac-dev + # libidl0 (workaround for mozilla-dev's bad deps) + # libglib2.0-0 (workaround for mozilla-dev's bad deps) + # libmatroska-dev + # change Source: vlc with Source: vlc-woody + # 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/, libwx[^,]*//' \ + -e '/Package: wxvlc/,/^ *$/d' \ + -e 's/, libflac-dev[^,]*//' \ + -e 's/, libidl0[^,]*//' \ + -e 's/, libglib2.0-0[^,]*//' \ + -e 's/, libmatroska-dev[^,]*//' \ + -e 's/Source: vlc/Source: vlc-woody/' \ + -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 + # remove flac support + # remove matroska support + sed -e '/# Package: wxvlc/,/^ *$/d' \ + -e 's,--enable-wxwindows,--disable-wxwindows,' \ + -e 's,--enable-skins,--disable-skins,' \ + -e 's,--enable-flac,--disable-flac,' \ + -e 's,--enable-mkv,--disable-mkv,' \ + < "$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,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 +