X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=toolbox;h=32519a19ad478d1be46ae1de055b460bd1507a1c;hb=0601ce56ed422cc56a63da6d8f3b0123dad340e0;hp=01945e4f69a7efc91cd2103188730de255057494;hpb=c262bd272894498e7a14160437c58aa0d753a587;p=vlc diff --git a/toolbox b/toolbox index 01945e4f69..32519a19ad 100755 --- a/toolbox +++ b/toolbox @@ -26,8 +26,6 @@ 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-glade2 generate and fix Glade 2 code @@ -62,12 +60,6 @@ case "$1" in --changelog|--update-changelog) action=changelog ;; - --update-vc) - action=vc - ;; - --update-vc7) - action=vc7 - ;; --update-po) action=po ;; @@ -123,400 +115,6 @@ then exit 0 fi -## -## Update the MSVC project files -## -if test "${action}" = "vc" -then - echo "generating Visual Studio files" - - 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 - 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 evc/*.vcp msvc/*.dsp msvc/*.vcproj msvc/*.sln msvc/*.ncb - - # config files - for target in evc/config.h 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 - - # libvlc files - for target in evc/libvlc.vcp msvc/libvlc.dsp - do - printf "." - # Top of the project file - perl -pe 'if(/ZSOURCESZ/){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 "__LIBVLC__" /D PLUGIN_PATH=\\".\\" /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 - 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} -# ADD CPP /D "__LIBVLC__" /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} -!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 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} -# ADD CPP /D "__LIBVLC__" /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} -!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(/ZSOURCESZ/){last;}}while(<>){if(/ZHEADERSZ/){last;}print $_}' < ${target}.in >> ${target} - for file in ${LIBVLC_HEADERS} - do - cat >> ${target} << EOF -# Begin Source File${M} -SOURCE="..\\`echo ${file} | sed -e 's%/%\\\\%g'`"${M} -# End Source File${M} -EOF - done - cat >> ${target} << EOF -# Begin Group "vlc"${M} -EOF - for file in ${LIBVLC_PKG_HEADERS} - do - cat >> ${target} << EOF -# Begin Source File${M} -SOURCE="..\\`echo ${file} | sed -e 's%/%\\\\%g'`"${M} -# End Source File${M} -EOF - done - cat >> ${target} << EOF -# End Group${M} -EOF - perl -e 'while(<>){if(/ZHEADERSZ/){last;}}while(<>){print $_}' < ${target}.in >> ${target} - done - - # 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 evc msvc - do - test "${msdir}" = "evc" && suf="vcp" || suf="dsp" - source="${msdir}/plugins.${suf}.in" - target="${msdir}/plugin_${mod}.${suf}" - printf "." - perl -pe 'if(/ZSOURCESZ/){last;} s/ZPLUGINZ/'${mod}'/g' < ${source} > ${target} - for cfile in ${cfiles} - do - cat >> ${target} << EOF -# Begin Source File${M} -SOURCE="..\\modules\\`echo ${dir}/${cfile} | sed 's,/,\\\\,g'`"${M} -# ADD CPP /D "__LIBVLC__" /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,/ZSOURCESZ/d; /ZHEADERSZ/,$d; p' < ${source} >> ${target} - perl -e 'while(<>){if(/ZSOURCESZ/){last;}}while(<>){if(/ZHEADERSZ/){last;}print $_}' < ${source} >> ${target} - for hfile in ${hfiles} - do - cat >> ${target} << EOF -# Begin Source File${M} -SOURCE="..\\modules\\`echo ${dir}/${hfile} | sed 's,/,\\\\,g'`"${M} -# End Source File${M} -EOF - done - # sed -ne '1,/ZHEADERSZ/d; p' < ${source} >> ${target} - perl -e 'while(<>){if(/ZHEADERSZ/){last;}}while(<>){print $_}' < ${source} >> ${target} - done - done - done - - # vlc files - for target in evc/vlc.vcp msvc/vlc.dsp - do - printf "." - # Top of the project file - perl -pe 'if(/ZSOURCESZ/){last;}' < ${target}.in > ${target} - # The source files - cat >> ${target} << EOF -# Begin Source File${M} -SOURCE="..\\src\\vlc.c"${M} -# End Source File${M} -EOF - # Bottom of the project file - handles resource files too - perl -e 'while(<>){if(/ZSOURCESZ/){last;}}while(<>){print $_}' < ${target}.in >> ${target} - 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(/ZSOURCESZ/){last;} s/ZGUIDZ/'${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(/ZSOURCESZ/){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(/ZSOURCESZ/){last;} s/ZGUIDZ/'${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(/ZSOURCESZ/){last;}}while(<>){if(/ZHEADERSZ/){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(/ZHEADERSZ/){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(/ZSOURCESZ/){last;} s/ZPLUGINZ/'${mod}'/g' < ${source} | sed 's,ZGUIDZ,'${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,/ZSOURCESZ/d; /ZHEADERSZ/,$d; p' < ${source} >> ${target} - perl -e 'while(<>){if(/ZSOURCESZ/){last;}}while(<>){if(/ZHEADERSZ/){last;}print $_}' < ${source} >> ${target} - for hfile in ${hfiles} - do - cat >> ${target} << EOF -${M} -EOF - done - # sed -ne '1,/ZHEADERSZ/d; p' < ${source} >> ${target} - perl -e 'while(<>){if(/ZHEADERSZ/){last;}}while(<>){print $_}' < ${source} >> ${target} - done - done - done - - echo " done." - exit 0 -fi - ## ## Update the potfiles because no one ever does it ## @@ -596,6 +194,10 @@ then 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 sed -e 1,7d \ @@ -619,12 +221,10 @@ if test "${action}" = "distclean" then set -x # a naive sanity check to make sure we are in a VLC tree - test -f vlc.mandriva.spec -a -f vlc.win32.nsi.in || exit 1 + 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]*' -exec rm -f '{}' ';') - find msvc -type f -name '*.dsp' -exec rm -f '{}' ';' - find evc -type f -name '*.vcp' -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 @@ -666,5 +266,10 @@ 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