X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=toolbox;h=1228819b2ea5262ec04c223feeaaa2ae17cf9e12;hb=e53452fb6e2ce9d842c8ebc70b98852049dc797c;hp=ef6379fb637a3ef96b24ddd3e35c717b2dcf1c5d;hpb=05edb16cfd225b9bdeec8cf7f5acdc2c06217b30;p=vlc
diff --git a/toolbox b/toolbox
index ef6379fb63..1228819b2e 100755
--- a/toolbox
+++ b/toolbox
@@ -26,8 +26,10 @@ 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
@@ -65,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
;;
@@ -364,33 +372,171 @@ EOF
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
+
##
## Update the potfiles because no one ever does it
##
if test "${action}" = "po"
then
# 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' \
- | 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 '*.[ch]pp' \
- | grep -v '\(\.moc\.\|gui/gtk2/\)' \
- | 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
##
@@ -442,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
##
@@ -545,7 +734,7 @@ then
(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