#! /bin/sh
## toolbox for the VLC media player
-## $Id: toolbox,v 1.41 2003/07/14 20:36:55 sigmunau Exp $
+## $Id: toolbox,v 1.56 2004/02/10 14:33:17 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
cvs2cl --help >/dev/null 2>&1 || exit 1
rm -f ChangeLog ChangeLog.tmp
cvs2cl --utc --hide-filenames --no-wrap -w --stdout -g -z9 | \
- sed -e 's/^[^0-9]/ /' -e 's/^ *$//' | \
- uniq > ChangeLog.tmp
+ sed -e 's/^[^0-9]/ /' -e 's/^ *$//' -e 's/^ \* / /g' | \
+ grep -v '^ \*$' | uniq > ChangeLog.tmp # ^-- tab
YEAR=`sed -e 's/\(....\)-..-.*/\1/;q' ChangeLog.tmp`
LASTYEAR="$((${YEAR} - 1))"
sed -ne "/^${YEAR}-..-../,/^${LASTYEAR}-..-../{/^${LASTYEAR}-..-../d;p}" \
- < ChangeLog.tmp > Changelog
+ < ChangeLog.tmp > ChangeLog
rm -f ChangeLog.tmp
exit 0
# To generate changelog for the year 2001:
##
if test "${action}" = "vc"
then
- echo "generating Visual Studio files..."
+ echo "generating Visual Studio files"
if test -z "${srcdir}"; then
srcdir="`sed -ne 's/^srcdir *= *//p' < Makefile`"
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}/" \
# 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
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
test "${msdir}" = "evc" && suf="vcp" || suf="dsp"
source="${msdir}/plugins.${suf}.in"
target="${msdir}/plugin_${mod}.${suf}"
- echo "${target}"
+ printf "."
perl -pe 'if(/§SOURCES§/){last;} s/§PLUGIN§/'${mod}'/g' < ${source} > ${target}
for cfile in ${cfiles}
do
# Begin Source File${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
# 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
perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
done
- echo "done."
+ echo " done."
exit 0
fi
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
+ 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/\|\.moc\.\)' \
+ | grep -v '\(gui/win32/\|\.moc\.\|gui/gtk2/\)' \
| sort >> po/POTFILES.in
# clean old potfiles
cd po
-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
##
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
+ 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 */
+
+#include <vlc/vlc.h>
+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
# FIXME: a lot of Makefiles are still there
fi
+##
+## Build a woody-friendly package
+##
if test "${action}" = "woody"
then
set -ex
# 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
- # 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
+ # 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/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/, libflac-dev[^,]*//' \
-e 's/, libidl0[^,]*//' \
-e 's/, libglib2.0-0[^,]*//' \
- -e 's/, libmatroska-dev[^,]*//' \
- -e 's/Source: vlc/Source: vlc-woody/' \
+ -e 's/, gcc-3.2[^,]*//' \
-e 's/Section: gnome/Section: graphics/' \
-e 's/Section: kde/Section: graphics/' \
-e 's/Section: libdevel/Section: devel/' \
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,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
projects / vlc / blobdiff