X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=toolbox;h=07ad1707f5a3b47302a923ad0587a5b20861f05a;hb=e3bc8828da21d8742a9a409fc8c1853e6be312c4;hp=c8ca38b9ede3c724a461dc477a7210d57249ec7b;hpb=c2a934c0ffe3b39060ea28bce715d2dff426ca39;p=vlc diff --git a/toolbox b/toolbox index c8ca38b9ed..07ad1707f5 100755 --- a/toolbox +++ b/toolbox @@ -1,7 +1,7 @@ #! /bin/sh ## toolbox for the VLC media player -## $Id: toolbox,v 1.9 2003/02/02 04:01:29 sam Exp $ +## $Id: toolbox,v 1.25 2003/05/24 12:34:31 sam Exp $ ## ## Authors: Samuel Hocevar @@ -20,62 +20,90 @@ help() { cat << EOF recognized flags are: - --update-vc update Microsoft Visual Studio files - --update-po update translation files - --update-glade generate and fix Glade code + --update-changelog update the CVS changelog + --update-vc update Microsoft Visual Studio files + --update-po update translation files + --update-includes [BUILTINS] generate various include files + --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" EOF exit 1 } +## +## Extract stuff from Makefile.am +## +getfiles() +{ + awk 'BEGIN{a=0}{if(!a&&/^'"$1"'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | \ + tr '\\ ' '\n\n' | \ + sed -ne 's/[^-$()_a-zA-Z0-9][^-$()_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p' +} + ### ### argument check ### -do_help=yes -do_po=no -do_vc=no -do_glade=no -while test $# -gt 0; do - case "$1" in - --update-vc) - do_help=no - do_vc=yes - ;; - --update-po) - do_help=no - do_po=yes - ;; - --update-glade|--fix-glade) - do_help=no - do_glade=yes - ;; - *) - echo "$0: unknown option $1" - do_help=yes - help - ;; - esac - shift -done + +if test "$1" = "" +then + help +fi + +case "$1" in + --update-changelog) + action=changelog + ;; + --update-vc) + action=vc + ;; + --update-po) + action=po + ;; + --update-includes) + action=includes + ;; + --update-flexml) + action=flexml + ;; + --update-glade|--fix-glade) + action=glade + ;; + --update-glade2|--update-glade-2|--fix-glade2) + action=glade2 + ;; + --distclean) + action=distclean + ;; + --help) + help + ;; + *) + echo "$0: unknown option $1" + help + ;; +esac +shift ## -## Give help if needed +## Update the CVS changelog ## -if test "$do_help" = "yes" +if test "${action}" = "changelog" then - help + cvs2cl --help >/dev/null 2>&1 || exit 1 + rm -f ChangeLog + cvs2cl --utc --hide-filenames --no-wrap -w --stdout | \ + sed -e 's/^[^0-9]/ /' -e 's/^ *$//' | \ + uniq > ChangeLog + exit 0 fi ## ## Update the MSVC project files ## -if test "$do_vc" = "yes" +if test "${action}" = "vc" then - if test ! -f Makefile - then - echo "no Makefile found, did you run ./configure?" - exit 1 - fi - echo "generating Visual Studio files..." # The evil ^M @@ -87,11 +115,11 @@ then LIBVLC_SYMBOL=`echo $LIBVLC_VERSION | sed -e 'y/.-/__/'` # Sources that get built under Win32 - FIXME: anyone wanna deuglify this? :) - LIBVLC_SOURCES=`awk 'BEGIN{a=0}{if(!a&&/^'SOURCES_libvlc_common'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'; awk 'BEGIN{a=0}{if(!a&&/^'SOURCES_libvlc_win32'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'; awk 'BEGIN{a=0}{if(!a&&/^'SOURCES_libvlc_dirent'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'; awk 'BEGIN{a=0}{if(!a&&/^'SOURCES_libvlc_getopt'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'; awk 'BEGIN{a=0}{if(!a&&/^'SOURCES_libvlc_libc'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'` + LIBVLC_SOURCES=`getfiles SOURCES_libvlc_common; getfiles SOURCES_libvlc_win32; getfiles SOURCES_libvlc_dirent; getfiles SOURCES_libvlc_getopt; getfiles SOURCES_libvlc_libc` - LIBVLC_HEADERS=`awk 'BEGIN{a=0}{if(!a&&/^'HEADERS_include'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'; awk 'BEGIN{a=0}{if(!a&&/^'HEADERS_include_built'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'` + LIBVLC_HEADERS=`getfiles HEADERS_include; getfiles HEADERS_include_built` - LIBVLC_PKG_HEADERS=`awk 'BEGIN{a=0}{if(!a&&/^'dist_pkginclude_HEADERS'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'` + LIBVLC_PKG_HEADERS=`getfiles dist_pkginclude_HEADERS` # Clean up rm -f evc/*.vcp msvc/*.dsp @@ -118,7 +146,7 @@ then cat >> ${target} << EOF # Begin Source File${M} SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M} -# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\"plugins\\" /D DATA_PATH=\\"share\\"${M} +# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\".\\" /D DATA_PATH=\\"share\\"${M} # End Source File${M} EOF done @@ -134,7 +162,7 @@ EOF cat >> ${target} << EOF # Begin Source File${M} SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M} -# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\"plugins\\" /D DATA_PATH=\\"share\\"${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} # PROP Intermediate_Dir "MIPSRel\\${subdir}"${M} @@ -172,7 +200,7 @@ EOF cat >> ${target} << EOF # Begin Source File${M} SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M} -# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\"plugins\\" /D DATA_PATH=\\"share\\"${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} # PROP Intermediate_Dir "Release\\${subdir}"${M} @@ -238,6 +266,7 @@ EOF 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} # End Source File${M} EOF done @@ -289,16 +318,25 @@ fi ## ## Update the potfiles because no one ever does it ## -if test "$do_po" = "yes" +if test "${action}" = "po" then # create a fake file containing win32 strings rm -f modules/gui/win32/strings.cpp - printf "/* Automatically generated by 'toolbox --update-po', please don't compile */\n" > modules/gui/win32/strings.cpp - find modules/gui/win32 -name '*.dfm' | while read file - do - printf "\n/*\n * from $file:\n */\n\n" >> modules/gui/win32/strings.cpp - perl -ne 'chop; chop; if( / (Caption|Text|Hint) / || $buffer =~ /[+=] *$/ ) { $buffer =~ s/\+ *$//; $buffer .= $_; } if( $buffer =~ /'"'"' *$/) { $buffer =~ s/'"'"'/"/g; $buffer =~ s/\\/\\\\/g; $buffer =~ s/=/= _(/; print $buffer." );\n"; $buffer = "";}' < $file | grep -v '"-*"' | grep -v '"http://' | grep -v '"vlcs"' >> modules/gui/win32/strings.cpp || exit 1 - done + #printf "/* Automatically generated by 'toolbox --update-po', please don't compile */\n" > modules/gui/win32/strings.cpp + #find modules/gui/win32 -name '*.dfm' | while read file + #do + # printf "\n/*\n * from $file:\n */\n\n" >> modules/gui/win32/strings.cpp + # perl -ne 'chop; chop; if( / (Caption|Text|Hint) / || $buffer =~ /[+=] *$/ ) { $buffer =~ s/\+ *$//; $buffer .= $_; } if( $buffer =~ /'"'"' *$/) { $buffer =~ s/'"'"'/"/g; $buffer =~ s/\\/\\\\/g; $buffer =~ s/=/= _(/; print $buffer." );\n"; $buffer = "";}' < $file | grep -v '"-*"' | grep -v '"http://' | grep -v '"vlcs"' >> modules/gui/win32/strings.cpp || exit 1 + #done + # find out the source files + rm -f po/POTFILES.in + 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 '*.[hc]pp' | sort >> po/POTFILES.in + echo "" >> po/POTFILES.in + echo "# modules" >> po/POTFILES.in + find modules -name '*.[chm]' -o -name '*.[hc]pp' | grep -v 'gui/win32/' | sort >> po/POTFILES.in # clean old potfiles cd po rm -f vlc.pot @@ -310,10 +348,84 @@ then exit 0 fi +## +## Create include files +## +if test "${action}" = "includes" +then + set -x + + LIBVLC_HEADERS=`getfiles HEADERS_include` + BUILTINS=`while test $# -gt 0; do echo $1; shift; done` + + file=include/vlc_symbols.h + + rm -f ${file}.in + echo '/* DO NOT EDIT THIS FILE! See Makefile.am */' >> ${file}.in + echo 'struct module_symbols_t {' >> ${file}.in + cat ${LIBVLC_HEADERS} | grep '^ *VLC_EXPORT.*;' | sed -e 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/ \1 (* \2_inner) \3;/' >> ${file}.in + echo '};' >> ${file}.in + echo '#ifdef __PLUGIN__' >> ${file}.in + cat ${LIBVLC_HEADERS} | grep '^ *VLC_EXPORT.*;' | sed -e 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/# define \2 p_symbols->\2_inner/' >> ${file}.in + echo '#endif /* __PLUGIN__ */' >> ${file}.in + if diff 2>&1 >/dev/null ${file} ${file}.in + then + rm -f ${file}.in + else + mv -f ${file}.in ${file} + fi + + file=src/misc/modules_plugin.h + + rm -f ${file}.tmp && cp ${file}.in ${file}.tmp + sed -e 's#.*\$[I][d]:.*# * Automatically generated from '${file}'.in by bootstrap#' < ${file}.in > ${file}.tmp + echo '#define STORE_SYMBOLS( p_symbols ) \' >> ${file}.tmp + cat ${LIBVLC_HEADERS} | grep '^ *VLC_EXPORT.*;' | sed -e 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/ (p_symbols)->\2_inner = \2; \\/' >> ${file}.tmp + echo '' >> ${file}.tmp + if diff 2>&1 >/dev/null ${file} ${file}.tmp + then + rm -f ${file}.tmp + else + mv -f ${file}.tmp ${file} + fi + + file=src/misc/modules_builtin.h + + rm -f ${file}.tmp && cp ${file}.in ${file}.tmp + if test "${BUILTINS}" != "" + then + for i in `echo ${BUILTINS}` + do + echo "int vlc_entry__`echo $i | sed -e 'y@/@_@' -e 's@\..*@@'`( module_t* );" >>${file}.tmp + done + echo "" >> ${file}.tmp + fi + echo "#define ALLOCATE_ALL_BUILTINS() \\" >> ${file}.tmp + echo " do \\" >> ${file}.tmp + echo " { \\" >> ${file}.tmp + if test "${BUILTINS}" != "" + then + for i in `echo ${BUILTINS}` + do + echo " ALLOCATE_BUILTIN(`echo $i | sed -e 'y@/@_@' -e 's@\..*@@'`); \\" >> ${file}.tmp + done + fi + echo " } while( 0 );" >> ${file}.tmp + echo "" >> ${file}.tmp + if diff 2>&1 >/dev/null ${file} ${file}.tmp + then + rm -f ${file}.tmp + else + mv -f ${file}.tmp ${file} + fi + + exit 0 +fi + ## ## Fix glade-generated files ## -if test "$do_glade" = "yes" +if test "${action}" = "glade" then for file in modules/gui/gtk/gnome.glade modules/gui/gtk/gtk.glade modules/gui/familiar/familiar.glade do @@ -362,3 +474,54 @@ EOF 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 + do + echo "generating code from $file" + glade-2 -w $file || exit 1 + done + + exit 0 +fi + +## +## 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 +fi + +## +## Make distclean +## +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 + # 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 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 '{}' ';' + #find . -type d -name '.deps' -exec rm -Rf '{}' ';' + # there's some more cruft all around + rm -f configure.ac 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 + # FIXME: a lot of Makefiles are still there +fi +