X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=toolbox;h=44b4c4c3dbdf88b1a985d457b3194d34f9de4721;hb=fe17002d429a3d681e191a1af4f6495bb317d5d6;hp=7a55c96dff1b7ffe5f6e79a502a190cc1f00b5e2;hpb=a64501fd25cd7d18913de63ecd500c5bec10669d;p=vlc diff --git a/toolbox b/toolbox index 7a55c96dff..44b4c4c3db 100755 --- a/toolbox +++ b/toolbox @@ -1,7 +1,7 @@ #! /bin/sh ## toolbox for the VLC media player -## $Id: toolbox,v 1.18 2003/03/18 02:21:47 ipkiss Exp $ +## $Id: toolbox,v 1.28 2003/06/27 13:50:07 sam Exp $ ## ## Authors: Samuel Hocevar @@ -20,13 +20,14 @@ help() { cat << EOF recognized flags are: - --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 + --update-changelog update the CVS changelog + --update-vc update Microsoft Visual Studio files + --update-po update translation files + --update-includes 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 } @@ -38,7 +39,7 @@ 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' + sed -ne 's/[^-$()_a-zA-Z0-9][^-$()_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p' } ### @@ -72,6 +73,9 @@ case "$1" in --update-glade2|--update-glade-2|--fix-glade2) action=glade2 ;; + --distclean) + action=distclean + ;; --help) help ;; @@ -89,7 +93,7 @@ if test "${action}" = "changelog" then cvs2cl --help >/dev/null 2>&1 || exit 1 rm -f ChangeLog - cvs2cl --hide-filenames --no-wrap -w --stdout | \ + cvs2cl --utc --hide-filenames --no-wrap -w --stdout | \ sed -e 's/^[^0-9]/ /' -e 's/^ *$//' | \ uniq > ChangeLog exit 0 @@ -105,9 +109,9 @@ then # The evil ^M M=' ' - # Variables we get from configure.ac.in - LIBVLC_VERSION=`sed -ne '/AC_INIT/s/.*,\(.*\))/\1/p' < configure.ac.in` - LIBVLC_CODENAME=`sed -ne '/CODENAME=/s/.*"\(.*\)"/\1/p' < configure.ac.in` + # Variables we get from configure.ac + LIBVLC_VERSION=`sed -ne '/AC_INIT/s/.*,\(.*\))/\1/p' < configure.ac` + LIBVLC_CODENAME=`sed -ne '/CODENAME=/s/.*"\(.*\)"/\1/p' < configure.ac` LIBVLC_SYMBOL=`echo $LIBVLC_VERSION | sed -e 'y/.-/__/'` # Sources that get built under Win32 - FIXME: anyone wanna deuglify this? :) @@ -318,12 +322,21 @@ 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 '*.[ch]pp' | 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 # clean old potfiles cd po rm -f vlc.pot @@ -340,10 +353,10 @@ fi ## if test "${action}" = "includes" then - set -x + #set -x LIBVLC_HEADERS=`getfiles HEADERS_include` - BUILTINS=`while test $# -gt 0; do echo $1; shift; done` + BUILTINS=`sed -ne 's/.*builtins *= *" *\([^"]*\)".*/\1/p' vlc-config` file=include/vlc_symbols.h @@ -355,11 +368,12 @@ then 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 -q ${file} ${file}.in + if diff >/dev/null 2>&1 ${file} ${file}.in then - mv -f ${file}.in ${file} - else rm -f ${file}.in + else + echo "creating new ${file}" + mv -f ${file}.in ${file} fi file=src/misc/modules_plugin.h @@ -369,11 +383,12 @@ then 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 -q ${file} ${file}.tmp + if diff >/dev/null 2>&1 ${file} ${file}.tmp then - mv -f ${file}.tmp ${file} - else rm -f ${file}.tmp + else + echo "creating new ${file}" + mv -f ${file}.tmp ${file} fi file=src/misc/modules_builtin.h @@ -399,11 +414,12 @@ then fi echo " } while( 0 );" >> ${file}.tmp echo "" >> ${file}.tmp - if ! diff -q ${file} ${file}.tmp + if diff >/dev/null 2>&1 ${file} ${file}.tmp then - mv -f ${file}.tmp ${file} - else rm -f ${file}.tmp + else + echo "creating new ${file}" + mv -f ${file}.tmp ${file} fi exit 0 @@ -423,7 +439,7 @@ then 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 2>&1 > /dev/null + if grep "DO NOT EDIT THIS FILE" $file >/dev/null 2>&1 then rm -f $file.$$.bak cat > $file.$$.bak << EOF @@ -446,7 +462,7 @@ EOF 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 2>&1 > /dev/null + 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/' \ @@ -489,3 +505,26 @@ then 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 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 +