X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=toolbox;h=1228819b2ea5262ec04c223feeaaa2ae17cf9e12;hb=6dba9be2dded487422af7708ca1281ed0bb6c23b;hp=012f87d6efbd7339636c35324a7ca3d5c0267dcd;hpb=5793781308febaa53ca656cb7a080ec35abe61b5;p=vlc diff --git a/toolbox b/toolbox index 012f87d6ef..1228819b2e 100755 --- a/toolbox +++ b/toolbox @@ -1,13 +1,18 @@ #! /bin/sh ## toolbox for the VLC media player -## $Id: toolbox,v 1.31 2003/06/28 21:03:26 hartman Exp $ +## $Id$ +## +## Copyright (C) 2005 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 @@ -21,13 +26,16 @@ help() cat << EOF recognized flags are: --update-vc update Microsoft Visual Studio files + --update-vc7 update Microsoft Visual .NET files --update-po update translation files --update-includes generate various include files + --update-version generate src/misc/version.c --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" + --distclean "make distclean" on steroids + --dist-contrib add the contrib dir to MAKE_DIST + --make-woody change distdir to a woody distdir EOF exit 1 } @@ -37,7 +45,7 @@ EOF ## 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}}' < "${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}/," @@ -59,12 +67,18 @@ case "$1" in --update-vc) action=vc ;; + --update-vc7) + action=vc7 + ;; --update-po) action=po ;; --update-includes) action=includes ;; + --update-version) + action=version + ;; --update-flexml) action=flexml ;; @@ -77,6 +91,15 @@ case "$1" in --distclean) action=distclean ;; + --make-woody) + action=woody + ;; + --add-include) + action=include + ;; + --dist-contrib) + action=contrib + ;; --help) help ;; @@ -87,26 +110,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-12-31}:{$YEAR-01-01}' > ChangeLog" exit 0 - # To generate changelog for the year 2001: - # sed -ne '/^2001/,/^2000/{/^2000/d;p}' fi ## @@ -114,12 +139,14 @@ fi ## if test "${action}" = "vc" then - echo "generating Visual Studio files..." + echo "generating Visual Studio files" - srcdir="`sed -ne 's/^srcdir *= *//p;D;q' < 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` @@ -134,12 +161,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}/" \ @@ -149,7 +176,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 @@ -157,7 +184,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 @@ -169,11 +196,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} @@ -199,19 +227,37 @@ SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${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 ARMV4) Release"${M} +# PROP Output_Dir "ARMV4Rel\\${subdir}"${M} +# PROP Intermediate_Dir "ARMV4Rel\\${subdir}"${M} +!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE ARMV4) Debug"${M} +# PROP Output_Dir "ARMV4Dbg\\${subdir}"${M} +# PROP Intermediate_Dir "ARMV4Dbg\\${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} +!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE emulator) Debug"${M} +# PROP Output_Dir "emulatorDbg\\${subdir}"${M} +# PROP Intermediate_Dir "emulatorDbg\\${subdir}"${M} +!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE emulator) Release"${M} +# PROP Output_Dir "emulatorRel\\${subdir}"${M} +# PROP Intermediate_Dir "emulatorRel\\${subdir}"${M} +!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE x86) Debug"${M} +# PROP Output_Dir "X86Dbg\\${subdir}"${M} +# PROP Intermediate_Dir "X86Dbg\\${subdir}"${M} +!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE x86) Release"${M} +# PROP Output_Dir "X86Rel\\${subdir}"${M} +# PROP Intermediate_Dir "X86Rel\\${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} +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 +280,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 +291,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,74 +302,229 @@ 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} | 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 + 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}" + printf "." + 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} +!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 - # 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 # 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 - 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} EOF - fi # Bottom of the project file - handles resource files too perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){print $_}' < ${target}.in >> ${target} done - echo "done." + echo " done." + exit 0 +fi + +## +## Update the MSVC (.NET) project files +## +if test "${action}" = "vc7" +then + echo "generating Visual .NET files" + + srcdir=. + + # 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` + 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? :) + LIBVLC_SOURCES=`getfiles SOURCES_libvlc_common; getfiles SOURCES_libvlc_win32; getfiles SOURCES_libvlc_dirent; getfiles SOURCES_libvlc_getopt; getfiles SOURCES_libvlc_libc` + + LIBVLC_HEADERS=`getfiles HEADERS_include; getfiles HEADERS_include_built` + + LIBVLC_PKG_HEADERS=`getfiles dist_pkginclude_HEADERS` + + # Clean up + rm -f msvc/*.vcproj + + # config files + for target in msvc/config.h + do + printf "." + rm -f ${target} + sed -e "s/@CODENAME@/${LIBVLC_CODENAME}/" \ + -e "s/@VERSION@/${LIBVLC_VERSION}/" \ + -e "s/@SYMBOL@/${LIBVLC_SYMBOL}/" < ${target}.in > ${target} + done + + # vlc files + target="msvc/vlc.vcproj" + printf "." + # Top of the project file + guid=`perl -e 'sub r {return sprintf("%X", int rand(65536))} print r.r."-".r."-".r."-".r."-".r.r.r'` + perl -pe 'if(/§SOURCES§/){last;} s/§GUID§/'${guid}'/g' < ${target}.in > ${target} + # The source files + cat >> ${target} << EOF +${M} +EOF + # Bottom of the project file - handles resource files too + perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){print $_}' < ${target}.in >> ${target} + + # libvlc files + target=msvc/libvlc.vcproj + printf "." + # Top of the project file + guid=`perl -e 'sub r {return sprintf("%X", int rand(65536))} print r.r."-".r."-".r."-".r."-".r.r.r'` + perl -pe 'if(/§SOURCES§/){last;} s/§GUID§/'${guid}'/g' < ${target}.in > ${target} + # The source files + for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep -v "/.*/"` + do + cat >> ${target} << EOF +${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 +${M} +EOF + for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep "/${subdir}/"` + do + cat >> ${target} << EOF +${M} +EOF + if echo ${file} | grep -q '.c$' + then + cat >> ${target} << EOF + ${M} + ${M} + ${M} +EOF + fi + cat >> ${target} << EOF +${M} +EOF + done + cat >> ${target} << EOF +${M} +EOF + done + # The headers + perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){if(/§HEADERS§/){last;}print $_}' < ${target}.in >> ${target} + for file in ${LIBVLC_HEADERS} + do + cat >> ${target} << EOF +${M} +EOF + done + cat >> ${target} << EOF +${M} +EOF + for file in ${LIBVLC_PKG_HEADERS} + do + cat >> ${target} << EOF +${M} +EOF + done + cat >> ${target} << EOF +${M} +EOF + perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${target}.in >> ${target} + + # plugins files + for dir in `sed -ne 's,modules/\(.*\)/Makefile,\1,p' ${srcdir}/configure.ac` + do + mf="${srcdir}/modules/${dir}/Modules.am" + for mod in `sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < ${mf}` + do + # 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 msvc + do + source="${msdir}/plugins.vcproj.in" + target="${msdir}/plugin_${mod}.vcproj" + printf "." + guid=`perl -e 'sub r {return sprintf("%X", int rand(65536))} print r.r."-".r."-".r."-".r."-".r.r.r'` + perl -pe 'if(/§SOURCES§/){last;} s/§PLUGIN§/'${mod}'/g' < ${source} | sed 's,§GUID§,'${guid}',' > ${target} + for cfile in ${cfiles} + do + cat >> ${target} << EOF +${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 +${M} +EOF + done + # sed -ne '1,/§HEADERS§/d; p' < ${source} >> ${target} + perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${source} >> ${target} + done + done + done + + echo " done." exit 0 fi @@ -332,32 +533,10 @@ fi ## 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 # 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 - # update - make vlc.pot || exit 1 - make update-po || exit 1 - cd .. - - exit 0 + echo "WARNING: you should run \"make update-po\" instead!" >&2 + make update-po + exit $? fi ## @@ -367,47 +546,18 @@ if test "${action}" = "includes" then #set -x - srcdir="`sed -ne 's/^srcdir *= *//p;D;q' < Makefile`" - LIBVLC_HEADERS=`getfiles HEADERS_include` - BUILTINS=`sed -ne 's/.*builtins *= *" *\([^"]*\)".*/\1/p' vlc-config` - - file="${srcdir}/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 >/dev/null 2>&1 ${file} ${file}.in - then - rm -f ${file}.in - else - echo "creating new ${file}" - mv -f ${file}.in ${file} + if test -z "${srcdir}"; then + srcdir="`sed -ne 's/^srcdir *= *//p' < Makefile`" fi - - file="${srcdir}/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 >/dev/null 2>&1 ${file} ${file}.tmp - then - rm -f ${file}.tmp - else - echo "creating new ${file}" - mv -f ${file}.tmp ${file} + if test -z "${builddir}"; then + builddir="`sed -ne 's/^top_builddir *= *//p' < Makefile`" fi + BUILTINS=`sed -ne 's/.*builtins *= *" *\([^"]*\)".*/\1/p' vlc-config` - file="${srcdir}/src/misc/modules_builtin.h" + file="${builddir}/src/misc/modules_builtin.h" - rm -f ${file}.tmp && cp ${file}.in ${file}.tmp - if test "${BUILTINS}" != "" + rm -f ${file}.tmp && cp ${srcdir}/src/misc/modules_builtin.h.in ${file}.tmp + if test -n "${BUILTINS}" then for i in `echo ${BUILTINS}` do @@ -418,7 +568,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 @@ -438,6 +588,49 @@ then exit 0 fi +## +## Create version file +## +if test "${action}" = "version" +then + 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 + if test -z "${CC}"; then + CC="`sed -ne 's/^CC *= *//p' < Makefile`" + fi + + file="${builddir}/src/misc/version.c" + if which svnversion 2>&1 >/dev/null; then + VLC_CHANGESET=`svnversion $srcdir` + else + VLC_CHANGESET='exported' + fi + + rm -f ${file}.tmp + cat > ${file}.tmp << EOF +/* DO NOT EDIT THIS FILE - IT IS REGENERATED AT EVERY COMPILE - + * IT GIVES BETTER TRACKING OF VLC STABLE AND DEVELOPMENT VERSIONS + * WHETHER THEY ARE BUILT BY OTHERS OR DURING DEVELOPMENT OR FOR THE + * OFFICIAL VLC STABLE RELEASES. + */ +const char psz_vlc_changeset[] = "${VLC_CHANGESET}"; + +EOF + 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 + + exit 0 +fi + ## ## Fix glade-generated files ## @@ -465,7 +658,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 @@ -495,27 +688,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 ## @@ -525,14 +727,14 @@ 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 '{}' ';') - (cd debian && find . -type d -name '[a-z]*' -maxdepth 1 -exec rm -Rf '{}' ';') + find . -type f '(' -name '*.[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 . -name '[a-z]*' -maxdepth 1 -exec rm -f '{}' ';') + (cd debian && find . -type d '(' -name '[a-z]*' ! -name 'patches' ')' -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 '{}' ';' + 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 @@ -541,3 +743,101 @@ then # FIXME: a lot of Makefiles are still there fi +## +## 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/" +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 + # 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 + # libidl0 (workaround for mozilla-dev's bad deps) + # libglib2.0-0 (workaround for mozilla-dev's bad deps) + # 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)/' \ + -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/, 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/, libidl0[^,]*//' \ + -e 's/, libglib2.0-0[^,]*//' \ + -e 's/, gcc-3.2[^,]*//' \ + -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 + sed -e '/# Package: wxvlc/,/^ *$/d' \ + -e 's,--enable-wxwindows,--disable-wxwindows,' \ + -e 's,--enable-skins,--disable-skins,' \ + < "$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 +