X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=toolbox;h=fe1272c47712e055d0773dd0cf20ca20a3fadb96;hb=548753b8d4ff0587b8d9256c4a28be46b0edc0bb;hp=29f225ce402ff9fe51f680dda159b57392cc9215;hpb=e10b64a458adbedb5374c99f50675b3c60581d5d;p=vlc diff --git a/toolbox b/toolbox index 29f225ce40..fe1272c477 100755 --- a/toolbox +++ b/toolbox @@ -1,13 +1,15 @@ #! /bin/sh ## toolbox for the VLC media player -## $Id: toolbox,v 1.39 2003/07/08 13:09:30 sam Exp $ +## $Id$ ## ## Authors: Samuel Hocevar ### ### Get a sane environment, just in case ### +LC_ALL=C +export LC_ALL LANG=C export LANG CYGWIN=binmode @@ -26,7 +28,6 @@ recognized flags are: --update-glade generate and fix Glade code --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" on steroids --make-woody change distdir to a woody distdir EOF @@ -81,6 +82,9 @@ case "$1" in --make-woody) action=woody ;; + --add-include) + action=include + ;; --help) help ;; @@ -91,26 +95,28 @@ 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 ## if test "${action}" = "changelog" then - set -e - set -x - cvs2cl --help >/dev/null 2>&1 || exit 1 - rm -f ChangeLog ChangeLog.tmp - cvs2cl --utc --hide-filenames --no-wrap -w --stdout -g -z9 | \ - sed -e 's/^[^0-9]/ /' -e 's/^ *$//' | \ - uniq > ChangeLog.tmp - YEAR=`sed -e 's/\(....\)-..-.*/\1/;q' ChangeLog.tmp` - LASTYEAR="$((${YEAR} - 1))" - sed -ne "/^${YEAR}-..-../,/^${LASTYEAR}-..-../{/^${LASTYEAR}-..-../d;p}" \ - < ChangeLog.tmp > Changelog - rm -f ChangeLog.tmp + YEAR="`date +%Y`" + echo "toolbox --changelog no longer required. use this instead:" + echo " svn log -v -r '{$YEAR-01-01}:{$YEAR-12-31}' > ChangeLog" exit 0 - # To generate changelog for the year 2001: - # sed -ne '/^2001/,/^2000/{/^2000/d;p}' fi ## @@ -118,14 +124,14 @@ fi ## if test "${action}" = "vc" then - echo "generating Visual Studio files..." + echo "generating Visual Studio files" 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` @@ -140,12 +146,12 @@ then LIBVLC_PKG_HEADERS=`getfiles dist_pkginclude_HEADERS` # Clean up - rm -f evc/*.vcp msvc/*.dsp + rm -f evc/*.vcp msvc/*.dsp msvc/*.vcproj msvc/*.sln msvc/*.ncb # config files for target in evc/config.h msvc/config.h do - echo "${target}" + printf "." rm -f ${target} sed -e "s/@CODENAME@/${LIBVLC_CODENAME}/" \ -e "s/@VERSION@/${LIBVLC_VERSION}/" \ @@ -155,7 +161,7 @@ then # libvlc files for target in evc/libvlc.vcp msvc/libvlc.dsp do - echo "${target}" + printf "." # Top of the project file perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target} # The source files @@ -163,7 +169,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 @@ -175,11 +181,12 @@ EOF EOF for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep "/${subdir}/"` do + subdir="`echo ${file} | sed -e 's%/[^/]*$%/%' | sed -e 's%/%\\\\%g'`" if test "${target}" = "evc/libvlc.vcp" 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} @@ -217,7 +224,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} @@ -240,7 +247,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 @@ -251,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 @@ -273,12 +280,12 @@ EOF 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 dir in evc msvc + for msdir in evc msvc do - test "${dir}" = "evc" && suf="vcp" || suf="dsp" - source="${dir}/plugins.${suf}.in" - target="${dir}/plugin_${mod}.${suf}" - echo "${target}" + test "${msdir}" = "evc" && suf="vcp" || suf="dsp" + source="${msdir}/plugins.${suf}.in" + target="${msdir}/plugin_${mod}.${suf}" + printf "." perl -pe 'if(/§SOURCES§/){last;} s/§PLUGIN§/'${mod}'/g' < ${source} > ${target} for cfile in ${cfiles} do @@ -286,6 +293,12 @@ 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} +!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} +!ELSEIF "\$(CFG)" == "plugin_${mod} - Win32 Debug"${M} +# PROP Output_Dir "Debug\\modules\\`echo ${dir} | sed 's,/,\\\\,g'`"${M} +# PROP Intermediate_Dir "Debug\\modules\\`echo ${dir} | sed 's,/,\\\\,g'`"${M} # End Source File${M} EOF done @@ -309,7 +322,7 @@ EOF # vlc files for target in evc/vlc.vcp msvc/vlc.dsp do - echo "${target}" + printf "." # Top of the project file perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target} # The source files @@ -331,7 +344,7 @@ EOF perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){print $_}' < ${target}.in >> ${target} done - echo "done." + echo " done." exit 0 fi @@ -353,11 +366,13 @@ 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/\|\.moc\.\)' \ + | grep -v '\(gui/wxwindows/wizard\|\.moc\.\|gui/gtk2/\)' \ | sort >> po/POTFILES.in # clean old potfiles cd po @@ -477,7 +492,7 @@ EOF -e 's#_(\("[a-z0-9]*://[^"]*"\))#\1#' \ -e 's#_("---")#"---"#' \ -e 's#_("--")#"--"#' \ - -e 's#_("/dev/dvd")#"/dev/dvd"#' \ + -e 's#_(\("/dev/[^"]*"\))#"\1"#' \ -e 's#_(\("./."\))#\1#' \ < $file >> $file.$$.bak mv -f $file.$$.bak $file @@ -507,27 +522,36 @@ fi ## if test "${action}" = "glade2" then - for file in modules/gui/gtk2/gnome2.glade modules/gui/gtk2/gtk2.glade + 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 - exit 0 -fi + 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 +/* This file was created automatically by glade2 and fixed by bootstrap */ -## -## Fix flexml-generated files -## -if test "${action}" = "flexml" -then - cd modules/gui/skins/parser - flexml -SH -a skin.act skin.dtd - # comment the dummy main function - file=skin.c - sed 's@int main@//int main@' < $file > $file.$$.bak - mv -f $file.$$.bak $file - flex -oflex.c -BLs skin.l +#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 + + exit 0 fi ## @@ -540,7 +564,7 @@ then 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 '{}' ';') + (cd autotools && find . -name '[a-z]*' -maxdepth 1 -exec rm -f '{}' ';') (cd debian && find . -type d -name '[a-z]*' -maxdepth 1 -exec rm -Rf '{}' ';') find msvc -type f -name '*.dsp' -exec rm -f '{}' ';' find evc -type f -name '*.vcp' -exec rm -f '{}' ';' @@ -553,6 +577,9 @@ then # FIXME: a lot of Makefiles are still there fi +## +## Build a woody-friendly package +## if test "${action}" = "woody" then set -ex @@ -571,13 +598,14 @@ then # 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 - # 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 + # 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)/' \ @@ -588,13 +616,14 @@ then -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/, libflac-dev[^,]*//' \ -e 's/, libidl0[^,]*//' \ -e 's/, libglib2.0-0[^,]*//' \ - -e 's/, libmatroska-dev[^,]*//' \ - -e 's/Source: vlc/Source: vlc-woody/' \ + -e 's/, gcc-3.2[^,]*//' \ -e 's/Section: gnome/Section: graphics/' \ -e 's/Section: kde/Section: graphics/' \ -e 's/Section: libdevel/Section: devel/' \ @@ -602,15 +631,16 @@ then 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,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