#! /bin/sh
## toolbox for the VLC media player
-## $Id: toolbox,v 1.23 2003/04/14 23:10:20 sam Exp $
+## $Id: toolbox,v 1.36 2003/07/01 19:17:32 sam Exp $
##
## Authors: Samuel Hocevar <sam@zoy.org>
{
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
+ --changelog update the CVS changelog
+ --distclean "make distclean"
EOF
exit 1
}
##
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}/,"
}
###
fi
case "$1" in
- --update-changelog)
+ --changelog|--update-changelog)
action=changelog
;;
--update-vc)
##
if test "${action}" = "changelog"
then
+ set -e
+ set -x
cvs2cl --help >/dev/null 2>&1 || exit 1
- rm -f ChangeLog
- cvs2cl --utc --hide-filenames --no-wrap -w --stdout | \
+ rm -f ChangeLog ChangeLog.tmp
+ cvs2cl --utc --hide-filenames --no-wrap -w --stdout -g -z9 | \
sed -e 's/^[^0-9]/ /' -e 's/^ *$//' | \
- uniq > ChangeLog
+ 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
exit 0
+ # To generate changelog for the year 2001:
+ # sed -ne '/^2001/,/^2000/{/^2000/d;p}'
fi
##
then
echo "generating Visual Studio files..."
+ srcdir="`sed -ne 's/^srcdir *= *//p' < Makefile`"
+
# The evil ^M
- M='\r'
+ M="`printf '\r'`"
- # Variables we get from configure.ac.in
- LIBVLC_VERSION=`sed -ne '/AC_INIT/s/.*,\(.*\))/\1/p' < configure.ac.in`
- LIBVLC_CODENAME=`sed -ne '/CODENAME=/s/.*"\(.*\)"/\1/p' < configure.ac.in`
+ # 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? :)
# 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'`
+ cfiles=`grep -v '[^-_a-zA-Z0-9]*#' ${makefile} | awk 'BEGIN{a=0}{if(!a&&$0~/^SOURCES_'${plugin}'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if($0~/^[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
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
+ #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
##
if test "${action}" = "includes"
then
- set -x
+ #set -x
+ srcdir="`sed -ne 's/^srcdir *= *//p' < Makefile`"
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="${srcdir}/include/vlc_symbols.h"
rm -f ${file}.in
echo '/* DO NOT EDIT THIS FILE! See Makefile.am */' >> ${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 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="${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 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="${srcdir}/src/misc/modules_builtin.h"
rm -f ${file}.tmp && cp ${file}.in ${file}.tmp
- if test "${BUILTINS}" != ""
+ if test -n "${BUILTINS}"
then
for i in `echo ${BUILTINS}`
do
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
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
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
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/' \
find evc -type f -name '*.vcp' -exec rm -f '{}' ';'
#find . -type d -name '.deps' -exec rm -Rf '{}' ';'
# there's some more cruft all around
- rm -f configure.ac config.h config.log config.status
+ rm -f config.h config.log config.status
rm -f vlc vlc-config Makefile Modules.am
rm -Rf autom4te.cache
rm -f mozilla/vlcintf.h mozilla/vlcintf.xpt