## toolbox for the VLC media player
## $Id$
##
-## Copyright (C) 2005 the VideoLAN team
+## Copyright (C) 2002-2006 the VideoLAN team
##
## Authors: Samuel Hocevar <sam@zoy.org>
-## Rémi Denis-Courmont <rem # videolan.org>
+## Rémi Denis-Courmont <rem # videolan.org>
###
### Get a sane environment, just in case
--update-flexml generate and fix flexml and flex code
--distclean "make distclean" on steroids
--dist-contrib add the contrib dir to MAKE_DIST
- --make-woody <dir> change distdir <dir> to a woody distdir
EOF
exit 1
}
--distclean)
action=distclean
;;
- --make-woody)
- action=woody
- ;;
--add-include)
action=include
;;
do
printf "."
# Top of the project file
- perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target}
+ 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
EOF
done
# The headers
- perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){if(/§HEADERS§/){last;}print $_}' < ${target}.in >> ${target}
+ perl -e 'while(<>){if(/ZSOURCESZ/){last;}}while(<>){if(/ZHEADERSZ/){last;}print $_}' < ${target}.in >> ${target}
for file in ${LIBVLC_HEADERS}
do
cat >> ${target} << EOF
cat >> ${target} << EOF
# End Group${M}
EOF
- perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
+ perl -e 'while(<>){if(/ZHEADERSZ/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
done
# plugins files
source="${msdir}/plugins.${suf}.in"
target="${msdir}/plugin_${mod}.${suf}"
printf "."
- perl -pe 'if(/§SOURCES§/){last;} s/§PLUGIN§/'${mod}'/g' < ${source} > ${target}
+ perl -pe 'if(/ZSOURCESZ/){last;} s/ZPLUGINZ/'${mod}'/g' < ${source} > ${target}
for cfile in ${cfiles}
do
cat >> ${target} << EOF
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}
+ # 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
# End Source File${M}
EOF
done
- # sed -ne '1,/§HEADERS§/d; p' < ${source} >> ${target}
- perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${source} >> ${target}
+ # sed -ne '1,/ZHEADERSZ/d; p' < ${source} >> ${target}
+ perl -e 'while(<>){if(/ZHEADERSZ/){last;}}while(<>){print $_}' < ${source} >> ${target}
done
done
done
do
printf "."
# Top of the project file
- perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target}
+ perl -pe 'if(/ZSOURCESZ/){last;}' < ${target}.in > ${target}
# The source files
cat >> ${target} << EOF
# Begin Source File${M}
# End Source File${M}
EOF
# Bottom of the project file - handles resource files too
- perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
+ perl -e 'while(<>){if(/ZSOURCESZ/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
done
echo " done."
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}
+ perl -pe 'if(/ZSOURCESZ/){last;} s/ZGUIDZ/'${guid}'/g' < ${target}.in > ${target}
# The source files
cat >> ${target} << EOF
<File RelativePath="..\\src\\vlc.c"></File>${M}
EOF
# Bottom of the project file - handles resource files too
- perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
+ 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(/§SOURCES§/){last;} s/§GUID§/'${guid}'/g' < ${target}.in > ${target}
+ 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
EOF
done
# The headers
- perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){if(/§HEADERS§/){last;}print $_}' < ${target}.in >> ${target}
+ perl -e 'while(<>){if(/ZSOURCESZ/){last;}}while(<>){if(/ZHEADERSZ/){last;}print $_}' < ${target}.in >> ${target}
for file in ${LIBVLC_HEADERS}
do
cat >> ${target} << EOF
cat >> ${target} << EOF
</Filter>${M}
EOF
- perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
+ 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`
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}
+ perl -pe 'if(/ZSOURCESZ/){last;} s/ZPLUGINZ/'${mod}'/g' < ${source} | sed 's,ZGUIDZ,'${guid}',' > ${target}
for cfile in ${cfiles}
do
cat >> ${target} << EOF
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}
+ # 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
<File RelativePath="..\\modules\\`echo ${dir}/${hfile} | sed 's,/,\\\\,g'`"></File>${M}
EOF
done
- # sed -ne '1,/§HEADERS§/d; p' < ${source} >> ${target}
- perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${source} >> ${target}
+ # sed -ne '1,/ZHEADERSZ/d; p' < ${source} >> ${target}
+ perl -e 'while(<>){if(/ZHEADERSZ/){last;}}while(<>){print $_}' < ${source} >> ${target}
done
done
done
if test -z "${builddir}"; then
builddir="`sed -ne 's/^top_builddir *= *//p' < Makefile`"
fi
- BUILTINS=`sed -ne 's/.*builtins *= *" *\([^"]*\)".*/\1/p' vlc-config`
+ BUILTINS=`sed -ne 's/.*builtins *= *" *\([^"]*\)".*/\1/p' ${builddir}/vlc-config`
file="${builddir}/src/misc/modules_builtin.h"
- rm -f ${file}.tmp && cp ${srcdir}/src/misc/modules_builtin.h.in ${file}.tmp
+ rm -f "${file}.tmp"
+ mkdir -p -- "${builddir}/src/misc"
+ cat "${srcdir}/src/misc/modules_builtin.h.in" > "${file}.tmp" || exit 1
if test -n "${BUILTINS}"
then
for i in `echo ${BUILTINS}`
do
- echo "int vlc_entry__`echo $i | sed -e 'y@/@_@' -e 's@\..*@@'`( module_t* );" >>${file}.tmp
+ echo "int vlc_entry__`echo $i | sed -e 'y@/@_@' -e 's@\..*@@'`( module_t* );" >> "${file}.tmp"
done
- echo "" >> ${file}.tmp
+ echo "" >> "${file}.tmp"
fi
echo "#define ALLOCATE_ALL_BUILTINS() \\" >> ${file}.tmp
- echo " do \\" >> ${file}.tmp
- echo " { \\" >> ${file}.tmp
+ echo " do \\" >> "${file}.tmp"
+ echo " { \\" >> "${file}.tmp"
if test -n "${BUILTINS}"
then
for i in `echo ${BUILTINS}`
do
- echo " ALLOCATE_BUILTIN(`echo $i | sed -e 'y@/@_@' -e 's@\..*@@'`); \\" >> ${file}.tmp
+ echo " ALLOCATE_BUILTIN(`echo $i | sed -e 'y@/@_@' -e 's@\..*@@'`); \\" >> "${file}.tmp"
done
fi
- echo " } while( 0 );" >> ${file}.tmp
- echo "" >> ${file}.tmp
- if diff >/dev/null 2>&1 ${file} ${file}.tmp
+ echo " } while( 0 );" >> "${file}.tmp"
+ echo "" >> "${file}.tmp" || exit 1
+ if diff >/dev/null 2>&1 "${file}" "${file}.tmp"
then
- rm -f ${file}.tmp
+ rm -f "${file}.tmp"
else
echo "creating new ${file}"
- mv -f ${file}.tmp ${file}
+ mv -f "${file}.tmp" "${file}"
fi
exit 0
fi
rm -f ${file}.tmp
+ mkdir -p -- "${builddir}/src/misc"
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
then
set -x
# a naive sanity check to make sure we are in a VLC tree
- test -f vlc.spec.mdk -a -f debian/rules || exit 1
+ test -f vlc.spec.mdk -a -f vlc.win32.nsi.in || 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 '(' '(' ! -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 . -name '[a-z]*' -maxdepth 1 -exec rm -f '{}' ';')
- (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 '.libs' -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
cp ${srcdir}/extras/contrib/src/Patches/* "${distdir}/extras/contrib/src/Patches/"
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
- # 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
- # libidl0 (workaround for mozilla-dev's bad deps)
- # libglib2.0-0 (workaround for mozilla-dev's bad deps)
- # 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/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/, 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/, libidl0[^,]*//' \
- -e 's/, libglib2.0-0[^,]*//' \
- -e 's/, gcc-3.2[^,]*//' \
- -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
- sed -e '/# Package: wxvlc/,/^ *$/d' \
- -e 's,--enable-wxwindows,--disable-wxwindows,' \
- -e 's,--enable-skins,--disable-skins,' \
- < "$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
-