X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=toolbox;h=32519a19ad478d1be46ae1de055b460bd1507a1c;hb=d4c7ef27dd409c192fcfec571921bd7f892eb5af;hp=5503a213e88a7d75c194aab09b5d45fe331e0a5e;hpb=d95a9919e414af6eb38c951b20e0e736357025f2;p=vlc diff --git a/toolbox b/toolbox index 5503a213e8..32519a19ad 100755 --- a/toolbox +++ b/toolbox @@ -1,13 +1,19 @@ #! /bin/sh -## toolbox for vlc, the VideoLAN Client -## $Id: toolbox,v 1.3 2003/01/15 13:16:39 sam Exp $ + +## toolbox for the VLC media player +## $Id$ +## +## Copyright (C) 2002-2006 the VideoLAN team ## ## Authors: Samuel Hocevar +## Rémi Denis-Courmont ### ### Get a sane environment, just in case ### +LC_ALL=C +export LC_ALL LANG=C export LANG CYGWIN=binmode @@ -20,272 +26,250 @@ help() { cat << EOF recognized flags are: - --update-vc update Microsoft Visual Studio files - --update-po update translation files + --update-po update translation files + --update-includes generate various include files + --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 EOF exit 1 } +## +## Extract stuff from Makefile.am +## +getfiles() +{ + 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}/," +} + ### ### argument check ### -do_help=yes -do_po=no -do_vc=no -while test $# -gt 0; do + +if test "$1" = "" +then + help +fi + +case "$1" in + --changelog|--update-changelog) + action=changelog + ;; + --update-po) + action=po + ;; + --update-includes) + action=includes + ;; + --update-flexml) + action=flexml + ;; + --update-glade2|--update-glade-2|--fix-glade2) + action=glade2 + ;; + --distclean) + action=distclean + ;; + --add-include) + action=include + ;; + --dist-contrib) + action=contrib + ;; + --help) + help + ;; + *) + echo "$0: unknown option $1" + help + ;; +esac +shift + +## +## Add includes to help doxygen +## +if test "${action}" = "include" +then case "$1" in - --update-vc) - do_help=no - do_vc=yes - ;; - --update-po) - do_help=no - do_po=yes - ;; - *) - echo "$0: unknown option $1" - do_help=yes - help - ;; + */vlc_common.h|*/include/vlc/*);; + */include/*.h) echo "#include " ;; esac - shift -done + cat $1 + exit 0 +fi ## -## Give help if needed +## Update the CVS changelog ## -if test "$do_help" = "yes" +if test "${action}" = "changelog" then - help + YEAR="`date +%Y`" + echo "toolbox --changelog no longer required. use this instead:" + echo " LANG=C svn log -v -r '{$YEAR-12-31}:{$YEAR-01-01}' > ChangeLog" + exit 0 fi ## -## Update the MSVC project files +## Update the potfiles because no one ever does it ## -if test "$do_vc" = "yes" +if test "${action}" = "po" 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 - M=' ' - - # 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'` + # find out the source files + echo "WARNING: you should run \"make update-po\" instead!" >&2 + make update-po + exit $? +fi - 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'` +## +## Create include files +## +if test "${action}" = "includes" +then + #set -x - 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'` + if test -z "${srcdir}"; then + srcdir="`sed -ne 's/^srcdir *= *//p' < Makefile`" + fi + if test -z "${builddir}"; then + builddir="`sed -ne 's/^top_builddir *= *//p' < Makefile`" + fi + BUILTINS=`sed -ne 's/.*builtins *= *" *\([^"]*\)".*/\1/p' ${builddir}/vlc-config` - # Clean up - rm -f evc/*.vcp msvc/*.dsp + file="${builddir}/src/modules/builtin.h" - # libvlc files - for target in evc/libvlc.vcp msvc/libvlc.dsp - do - echo "${target}" - # Top of the project file - perl -pe 'if(/§SOURCES§/){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=\\"plugins\\" /D DATA_PATH=\\"share\\"${M} -# End Source File${M} -EOF - done - for subdir in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep "/.*/" | cut -f2 -d/ | sort | uniq` - do - cat >> ${target} << EOF -# Begin Group "${subdir}"${M} -EOF - for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep "/${subdir}/"` - do - if test "${target}" = "evc/libvlc.vcp" - 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} -!IF "\$(CFG)" == "libvlc - Win32 (WCE MIPS) Release"${M} -# PROP Output_Dir "MIPSRel\\${subdir}"${M} -# PROP Intermediate_Dir "MIPSRel\\${subdir}"${M} -!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE MIPS) Debug"${M} -# PROP Output_Dir "MIPSDbg\\${subdir}"${M} -# PROP Intermediate_Dir "MIPSDbg\\${subdir}"${M} -!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE SH4) Release"${M} -# PROP Output_Dir "SH4Rel\\${subdir}"${M} -# PROP Intermediate_Dir "SH4Rel\\${subdir}"${M} -!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE SH4) Debug"${M} -# PROP Output_Dir "SH4Dbg\\${subdir}"${M} -# PROP Intermediate_Dir "SH4Dbg\\${subdir}"${M} -!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE SH3) Release"${M} -# PROP Output_Dir "SH3Rel\\${subdir}"${M} -# PROP Intermediate_Dir "SH3Rel\\${subdir}"${M} -!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE SH3) Debug"${M} -# PROP Output_Dir "SH3Dbg\\${subdir}"${M} -# PROP Intermediate_Dir "SH3Dbg\\${subdir}"${M} -!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE ARM) Release"${M} -# PROP Output_Dir "ARMRel\\${subdir}"${M} -# PROP Intermediate_Dir "ARMRel\\${subdir}"${M} -!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE ARM) Debug"${M} -# PROP Output_Dir "ARMDbg\\${subdir}"${M} -# PROP Intermediate_Dir "ARMDbg\\${subdir}"${M} -!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE x86em) Release"${M} -# PROP Output_Dir "X86EMRel\\${subdir}"${M} -# PROP Intermediate_Dir "X86EMRel\\${subdir}"${M} -!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE x86em) Debug"${M} -# PROP Output_Dir "X86EMDbg\\${subdir}"${M} -# PROP Intermediate_Dir "X86EMDbg\\${subdir}"${M} -!ENDIF${M} -# End Source File${M} -EOF - else - 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} -!IF "\$(CFG)" == "libvlc - Win32 Release"${M} -# PROP Output_Dir "Release\\${subdir}"${M} -# PROP Intermediate_Dir "Release\\${subdir}"${M} -!ELSEIF "\$(CFG)" == "libvlc - Win32 Debug"${M} -# PROP Output_Dir "Debug\\${subdir}"${M} -# PROP Intermediate_Dir "Debug\\${subdir}"${M} -!ENDIF${M} -# End Source File${M} -EOF - fi - done - cat >> ${target} << EOF -# End Group${M} -EOF - done - # The headers - perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){if(/§HEADERS§/){last;}print $_}' < ${target}.in >> ${target} - for file in ${LIBVLC_HEADERS} + rm -f "${file}.tmp" + mkdir -p -- "${builddir}/src/modules" + cat "${srcdir}/src/modules/builtin.h.in" > "${file}.tmp" || exit 1 + if test -n "${BUILTINS}" + then + for i in `echo ${BUILTINS}` do - cat >> ${target} << EOF -# Begin Source File${M} -SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M} -# End Source File${M} -EOF + echo "int vlc_entry__`echo $i | sed -e 'y@/@_@' -e 's@\..*@@'`( module_t* );" >> "${file}.tmp" done - cat >> ${target} << EOF -# Begin Group "vlc"${M} -EOF - for file in ${LIBVLC_PKG_HEADERS} + echo "" >> "${file}.tmp" + fi + echo "#define ALLOCATE_ALL_BUILTINS() \\" >> ${file}.tmp + echo " do \\" >> "${file}.tmp" + echo " { \\" >> "${file}.tmp" + if test -n "${BUILTINS}" + then + for i in `echo ${BUILTINS}` do - cat >> ${target} << EOF -# Begin Source File${M} -SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M} -# End Source File${M} -EOF + echo " ALLOCATE_BUILTIN(`echo $i | sed -e 'y@/@_@' -e 's@\..*@@'`); \\" >> "${file}.tmp" done - cat >> ${target} << EOF -# End Group${M} -EOF - perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${target}.in >> ${target} - done + fi + echo " } while( 0 );" >> "${file}.tmp" + echo "" >> "${file}.tmp" || exit 1 + if diff >/dev/null 2>&1 "${file}" "${file}.tmp" + then + rm -f "${file}.tmp" + else + echo "creating new ${file}" + mv -f "${file}.tmp" "${file}" + fi - # plugins files - grep '^L_[^ ]*_pic =' Modules.am | while read a b c - 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} | awk '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 - 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} - do - cat >> ${target} << EOF -# Begin Source File${M} -SOURCE="..\\${cfile}"${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 -# Begin Source File${M} -SOURCE="..\\${hfile}"${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 - done + exit 0 +fi - # vlc files - for target in evc/vlc.vcp msvc/vlc.dsp - do - echo "${target}" - # Top of the project file - perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target} - # The source files - if test "${target}" = "evc/vlc.vcp" - then - cat >> ${target} << EOF -# Begin Source File${M} -SOURCE="..\\evc\\vlc.c"${M} -# End Source File${M} -EOF - else - cat >> ${target} << EOF -# Begin Source File${M} -SOURCE="..\\src\\vlc.c"${M} -# End Source File${M} +## +## Fix glade2-generated files +## +if test "${action}" = "glade2" +then + file="modules/gui/pda/pda.glade" + echo "generating code from $file" + glade-2 -w "$file" || exit 1 + + 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 */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include EOF - fi - # Bottom of the project file - handles resource files too - perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){print $_}' < ${target}.in >> ${target} - 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 - echo "done." exit 0 fi ## -## Update the potfiles because no one ever does it +## Make distclean ## -if test "$do_po" = "yes" +if test "${action}" = "distclean" 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/* from $file: */\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 '"-*"' >> modules/gui/win32/strings.cpp || exit 1 - done - # clean old potfiles - cd po - rm -f vlc.pot - # update - make vlc.pot || exit 1 - make update-po || exit 1 - cd .. + set -x + # a naive sanity check to make sure we are in a VLC tree + test -f vlc-config.in.in -a -f src/libvlc.c || exit 1 + # let's rock! + 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]*' -not -name 'config.rpath' -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 + 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 - exit 0 +## +## Add the extras/contrib dir to the distribution +## +if test "${action}" = "contrib" +then + set -x + if test ! -d "${distdir}/extras" + then + mkdir "${distdir}/extras" + fi + if test ! -d "${distdir}/extras/contrib" + then + mkdir "${distdir}/extras/contrib" + fi + cp "${srcdir}/extras/contrib/Makefile" "${distdir}/extras/contrib/Makefile" + cp "${srcdir}/extras/contrib/README" "${distdir}/extras/contrib/README" + cp "${srcdir}/extras/contrib/bootstrap" "${distdir}/extras/contrib/bootstrap" + cp "${srcdir}/extras/contrib/change_prefix.sh" "${distdir}/extras/contrib/change_prefix.sh" + if test ! -d "${distdir}/extras/contrib/src" + then + mkdir "${distdir}/extras/contrib/src" + fi + cp "${srcdir}/extras/contrib/src/Makefile" "${distdir}/extras/contrib/src/Makefile" + cp "${srcdir}/extras/contrib/src/packages.mak" "${distdir}/extras/contrib/src/packages.mak" + if test ! -d "${distdir}/extras/contrib/src/Patches" + then + mkdir "${distdir}/extras/contrib/src/Patches" + fi + cp ${srcdir}/extras/contrib/src/Patches/* "${distdir}/extras/contrib/src/Patches/" + if test ! -d "${distdir}/extras/contrib/src/Distributions" + then + mkdir "${distdir}/extras/contrib/src/Distributions" + fi + cp ${srcdir}/extras/contrib/src/Distributions/* "${distdir}/extras/contrib/src/Distributions/" fi