#! /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.44 2003/07/31 13:06:05 sam Exp $
##
## Authors: Samuel Hocevar <sam@zoy.org>
###
### Get a sane environment, just in case
###
+LC_ALL=C
+export LC_ALL
LANG=C
export LANG
CYGWIN=binmode
{
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" on steroids
+ --make-woody <dir> change distdir <dir> to a woody distdir
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)
--distclean)
action=distclean
;;
+ --make-woody)
+ action=woody
+ ;;
+ --add-include)
+ action=include
+ ;;
--help)
help
;;
esac
shift
+##
+## Add includes to help doxygen
+##
+if test "${action}" = "include"
+then
+ case "$1" in
+ */vlc_common.h|*/include/vlc/*);;
+ */include/*.h) echo "#include <vlc_common.h>" ;;
+ 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
- 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..."
- # 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='\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? :)
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
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}
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}
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
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
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}"
+ echo "${target}"
+ 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}
# 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
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' \
+ | 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 '\(gui/win32/\)' \
+ | sort >> po/POTFILES.in
# clean old potfiles
cd po
rm -f vlc.pot
##
if test "${action}" = "includes"
then
- set -x
+ #set -x
+ if test -z "${srcdir}"; then
+ srcdir="`sed -ne 's/^srcdir *= *//p' < Makefile`"
+ fi
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/' \
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 '{}' ';')
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
# FIXME: a lot of Makefiles are still there
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
+ # remove libwxgtk2.4-dev
+ # libflac-dev
+ # libidl0 (workaround for mozilla-dev's bad deps)
+ # libglib2.0-0 (workaround for mozilla-dev's bad deps)
+ # libmatroska-dev
+ # change Source: vlc with Source: vlc-woody
+ # 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/, libwx[^,]*//' \
+ -e '/Package: wxvlc/,/^ *$/d' \
+ -e 's/, libflac-dev[^,]*//' \
+ -e 's/, libidl0[^,]*//' \
+ -e 's/, libglib2.0-0[^,]*//' \
+ -e 's/, libmatroska-dev[^,]*//' \
+ -e 's/Source: vlc/Source: vlc-woody/' \
+ -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
+ # remove flac support
+ # remove matroska support
+ sed -e '/# Package: wxvlc/,/^ *$/d' \
+ -e 's,--enable-wxwindows,--disable-wxwindows,' \
+ -e 's,--enable-skins,--disable-skins,' \
+ -e 's,--enable-flac,--disable-flac,' \
+ -e 's,--enable-mkv,--disable-mkv,' \
+ < "$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,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
+