X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=toolbox;h=9adb9a83e32121bc281aed6295592667d948c86f;hb=84d47f6f3d53715b7bd53e69b16fb6d9a043e328;hp=dc75194a78f3fda429558aa68dfc109707ebe34b;hpb=9542cc88a8e24d615d9461ab33c89470f508a14a;p=vlc diff --git a/toolbox b/toolbox index dc75194a78..9adb9a83e3 100755 --- a/toolbox +++ b/toolbox @@ -1,13 +1,15 @@ #! /bin/sh ## toolbox for the VLC media player -## $Id: toolbox,v 1.26 2003/06/21 17:04:20 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 @@ -20,14 +22,15 @@ 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 - --distclean "make distclean" + --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" on steroids + --dist-contrib add the contrib dir to MAKE_DIST + --make-woody change distdir to a woody distdir EOF exit 1 } @@ -37,9 +40,10 @@ 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}}' < 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 -ne 's/[^-$()_a-zA-Z0-9][^-$()_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p' | \ + sed -e "s,^,${srcdir}/," } ### @@ -52,7 +56,7 @@ then fi case "$1" in - --update-changelog) + --changelog|--update-changelog) action=changelog ;; --update-vc) @@ -76,6 +80,15 @@ case "$1" in --distclean) action=distclean ;; + --make-woody) + action=woody + ;; + --add-include) + action=include + ;; + --dist-contrib) + action=contrib + ;; --help) help ;; @@ -86,16 +99,27 @@ 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 - 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 + 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 fi @@ -104,9 +128,13 @@ fi ## if test "${action}" = "vc" then - echo "generating Visual Studio files..." + echo "generating Visual Studio files" - # The evil ^M + if test -z "${srcdir}"; then + srcdir="`sed -ne 's/^srcdir *= *//p' < Makefile`" + fi + + # The evil ^M. printf '\r' does not work in Cygwin. M=' ' # Variables we get from configure.ac @@ -122,12 +150,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}/" \ @@ -137,7 +165,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 @@ -145,7 +173,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 @@ -157,11 +185,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} @@ -187,19 +216,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} @@ -222,7 +269,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 @@ -233,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 @@ -244,74 +291,73 @@ 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 @@ -320,23 +366,19 @@ 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 '*.[hc]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 '*.[hc]pp' | grep -v 'gui/win32/' | sort >> po/POTFILES.in + find modules -name '*.[chm]' -o -name '*.[ch]pp' \ + | grep -v '\(\.moc\.\|gui/gtk2/\)' \ + | sort >> po/POTFILES.in # clean old potfiles cd po rm -f vlc.pot @@ -353,12 +395,20 @@ fi ## if test "${action}" = "includes" then - set -x + #set -x + + 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 + mkdir -p "${builddir}/include" 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 + file="${builddir}/include/vlc_symbols.h" rm -f ${file}.in echo '/* DO NOT EDIT THIS FILE! See Makefile.am */' >> ${file}.in @@ -368,31 +418,33 @@ 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 2>&1 >/dev/null ${file} ${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} fi - file=src/misc/modules_plugin.h + file="${builddir}/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 + rm -f ${file}.tmp + sed -e 's#.*\$[I][d]:.*# * Automatically generated from '${file}'.in by bootstrap#' < ${srcdir}/src/misc/modules_plugin.h.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 + 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 - file=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 @@ -403,7 +455,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 @@ -412,10 +464,11 @@ then fi echo " } while( 0 );" >> ${file}.tmp echo "" >> ${file}.tmp - if diff 2>&1 >/dev/null ${file} ${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} fi @@ -436,7 +489,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 @@ -449,7 +502,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 @@ -459,7 +512,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/' \ @@ -479,27 +532,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 ## @@ -509,10 +571,10 @@ 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 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 '{}' ';' @@ -525,3 +587,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 +