#! /bin/sh
+
## toolbox for the VLC media player
-## $Id: toolbox,v 1.33 2003/06/29 20:15:35 sam Exp $
+## $Id$
+##
+## Copyright (C) 2002-2006 the VideoLAN team
##
## Authors: Samuel Hocevar <sam@zoy.org>
+## Rémi Denis-Courmont <rem # videolan.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-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"
+ --distclean "make distclean" on steroids
+ --dist-contrib add the contrib dir to MAKE_DIST
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}}' < "${srcdir}/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 -e "s,^,${srcdir}/,"
--changelog|--update-changelog)
action=changelog
;;
- --update-vc)
- action=vc
- ;;
--update-po)
action=po
;;
--update-flexml)
action=flexml
;;
- --update-glade|--fix-glade)
- action=glade
- ;;
--update-glade2|--update-glade-2|--fix-glade2)
action=glade2
;;
--distclean)
action=distclean
;;
+ --add-include)
+ action=include
+ ;;
+ --dist-contrib)
+ action=contrib
+ ;;
--help)
help
;;
shift
##
-## Update the CVS changelog
+## Add includes to help doxygen
##
-if test "${action}" = "changelog"
+if test "${action}" = "include"
then
- set -e
- set -x
- 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
- 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
+ case "$1" in
+ */vlc_common.h|*/include/vlc/*);;
+ */include/*.h) echo "#include <vlc_common.h>" ;;
+ esac
+ cat $1
exit 0
- # To generate changelog for the year 2001:
- # sed -ne '/^2001/,/^2000/{/^2000/d;p}'
fi
##
-## Update the MSVC project files
+## Update the CVS changelog
##
-if test "${action}" = "vc"
+if test "${action}" = "changelog"
then
- echo "generating Visual Studio files..."
-
- srcdir="`sed -ne 's/^srcdir *= *//p' < Makefile`"
-
- # The evil ^M
- M="`printf '\r'`"
-
- # 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 evc/*.vcp msvc/*.dsp
-
- # config files
- for target in evc/config.h msvc/config.h
- do
- echo "${target}"
- rm -f ${target}
- sed -e "s/@CODENAME@/${LIBVLC_CODENAME}/" \
- -e "s/@VERSION@/${LIBVLC_VERSION}/" \
- -e "s/@SYMBOL@/${LIBVLC_SYMBOL}/" < ${target}.in > ${target}
- done
-
- # libvlc files
- for target in evc/libvlc.vcp msvc/libvlc.dsp
- do
- echo "${target}"
- # Top of the project file
- perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target}
- # The source files
- for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep -v "/.*/"`
- do
- cat >> ${target} << EOF
-# Begin Source File${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
- done
- for subdir in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep "/.*/" | cut -f2 -d/ | sort | uniq`
- do
- cat >> ${target} << EOF
-# Begin Group "${subdir}"${M}
-EOF
- for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep "/${subdir}/"`
- do
- if test "${target}" = "evc/libvlc.vcp"
- then
- cat >> ${target} << EOF
-# Begin Source File${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}
-# PROP Intermediate_Dir "MIPSRel\\${subdir}"${M}
-!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE MIPS) Debug"${M}
-# PROP Output_Dir "MIPSDbg\\${subdir}"${M}
-# PROP Intermediate_Dir "MIPSDbg\\${subdir}"${M}
-!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE SH4) Release"${M}
-# PROP Output_Dir "SH4Rel\\${subdir}"${M}
-# PROP Intermediate_Dir "SH4Rel\\${subdir}"${M}
-!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE SH4) Debug"${M}
-# PROP Output_Dir "SH4Dbg\\${subdir}"${M}
-# PROP Intermediate_Dir "SH4Dbg\\${subdir}"${M}
-!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE SH3) Release"${M}
-# PROP Output_Dir "SH3Rel\\${subdir}"${M}
-# PROP Intermediate_Dir "SH3Rel\\${subdir}"${M}
-!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE SH3) Debug"${M}
-# PROP Output_Dir "SH3Dbg\\${subdir}"${M}
-# PROP Intermediate_Dir "SH3Dbg\\${subdir}"${M}
-!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE ARM) Release"${M}
-# PROP Output_Dir "ARMRel\\${subdir}"${M}
-# PROP Intermediate_Dir "ARMRel\\${subdir}"${M}
-!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE ARM) Debug"${M}
-# PROP Output_Dir "ARMDbg\\${subdir}"${M}
-# PROP Intermediate_Dir "ARMDbg\\${subdir}"${M}
-!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE x86em) Release"${M}
-# PROP Output_Dir "X86EMRel\\${subdir}"${M}
-# PROP Intermediate_Dir "X86EMRel\\${subdir}"${M}
-!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE x86em) Debug"${M}
-# PROP Output_Dir "X86EMDbg\\${subdir}"${M}
-# PROP Intermediate_Dir "X86EMDbg\\${subdir}"${M}
-!ENDIF${M}
-# End Source File${M}
-EOF
- else
- cat >> ${target} << EOF
-# Begin Source File${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}
-# PROP Intermediate_Dir "Release\\${subdir}"${M}
-!ELSEIF "\$(CFG)" == "libvlc - Win32 Debug"${M}
-# PROP Output_Dir "Debug\\${subdir}"${M}
-# PROP Intermediate_Dir "Debug\\${subdir}"${M}
-!ENDIF${M}
-# End Source File${M}
-EOF
- fi
- done
- cat >> ${target} << EOF
-# End Group${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
-# Begin Source File${M}
-SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M}
-# End Source File${M}
-EOF
- done
- cat >> ${target} << EOF
-# Begin Group "vlc"${M}
-EOF
- for file in ${LIBVLC_PKG_HEADERS}
- do
- cat >> ${target} << EOF
-# Begin Source File${M}
-SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M}
-# End Source File${M}
-EOF
- done
- cat >> ${target} << EOF
-# End Group${M}
-EOF
- perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
- done
-
- # plugins files
- grep '^L_[^ ]*_pic =' Modules.am | while read a b c
- 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
- 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}
- 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}
-# 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
-# Begin Source File${M}
-SOURCE="..\\${hfile}"${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
- done
-
- # vlc files
- for target in evc/vlc.vcp msvc/vlc.dsp
- do
- echo "${target}"
- # Top of the project file
- perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target}
- # The source files
- if test "${target}" = "evc/vlc.vcp"
- then
- cat >> ${target} << EOF
-# Begin Source File${M}
-SOURCE="..\\evc\\vlc.c"${M}
-# End Source File${M}
-EOF
- else
- cat >> ${target} << EOF
-# Begin Source File${M}
-SOURCE="..\\src\\vlc.c"${M}
-# End Source File${M}
-EOF
- fi
- # Bottom of the project file - handles resource files too
- perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
- done
-
- echo "done."
+ YEAR="`date +%Y`"
+ echo "toolbox --changelog no longer required. use this instead:"
+ echo " LANG=C svn log -v -r '{$YEAR-12-31}:{$YEAR-01-01}' > ChangeLog"
exit 0
fi
##
if test "${action}" = "po"
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
# 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
- # 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
##
then
#set -x
- srcdir="`sed -ne 's/^srcdir *= *//p' < Makefile`"
- LIBVLC_HEADERS=`getfiles HEADERS_include`
- BUILTINS=`sed -ne 's/.*builtins *= *" *\([^"]*\)".*/\1/p' vlc-config`
-
- file="${srcdir}/include/vlc_symbols.h"
-
- rm -f ${file}.in
- echo '/* DO NOT EDIT THIS FILE! See Makefile.am */' >> ${file}.in
- echo 'struct module_symbols_t {' >> ${file}.in
- cat ${LIBVLC_HEADERS} | grep '^ *VLC_EXPORT.*;' | sed -e 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/ \1 (* \2_inner) \3;/' >> ${file}.in
- echo '};' >> ${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 >/dev/null 2>&1 ${file} ${file}.in
- then
- rm -f ${file}.in
- else
- echo "creating new ${file}"
- mv -f ${file}.in ${file}
+ if test -z "${srcdir}"; then
+ srcdir="`sed -ne 's/^srcdir *= *//p' < Makefile`"
fi
-
- 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 >/dev/null 2>&1 ${file} ${file}.tmp
- then
- rm -f ${file}.tmp
- else
- echo "creating new ${file}"
- mv -f ${file}.tmp ${file}
+ if test -z "${builddir}"; then
+ builddir="`sed -ne 's/^top_builddir *= *//p' < Makefile`"
fi
+ BUILTINS=`sed -ne 's/.*builtins *= *" *\([^"]*\)".*/\1/p' ${builddir}/vlc-config`
- file="${srcdir}/src/misc/modules_builtin.h"
+ file="${builddir}/src/modules/builtin.h"
- rm -f ${file}.tmp && cp ${file}.in ${file}.tmp
- if test "${BUILTINS}" != ""
+ rm -f "${file}.tmp"
+ mkdir -p -- "${builddir}/src/modules"
+ cat "${srcdir}/src/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
- if test "${BUILTINS}" != ""
+ 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
##
-## Fix glade-generated files
+## Fix glade2-generated files
##
-if test "${action}" = "glade"
+if test "${action}" = "glade2"
then
- for file in modules/gui/gtk/gnome.glade modules/gui/gtk/gtk.glade modules/gui/familiar/familiar.glade
- do
- echo "generating code from $file"
- glade -w $file || exit 1
- done
+ file="modules/gui/pda/pda.glade"
+ echo "generating code from $file"
+ glade-2 -w "$file" || exit 1
+
+ file="modules/gui/pda/pda_interface.c"
+ 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 */
- 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 >/dev/null 2>&1
- then
- rm -f $file.$$.bak
- cat > $file.$$.bak << EOF
-/* This file was created automatically by glade and fixed by bootstrap */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#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/dvd")#"/dev/dvd"#' \
- -e 's#_(\("./."\))#\1#' \
- < $file >> $file.$$.bak
- mv -f $file.$$.bak $file
- fi
- done
-
- 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 >/dev/null 2>&1
- then
- rm -f $file.$$.bak
- sed -e 's/DO NOT EDIT.*/Created by glade, fixed by bootstrap/' \
- -e 's,<config.h>,<vlc/vlc.h>,' \
- -e 's,#if.*ENABLE_NLS.*,#if 0 /* Disabled by bootstrap */,' \
- -e 's,#else,/* & */,' \
- < $file > $file.$$.bak
- mv -f $file.$$.bak $file
- fi
- done
-
- exit 0
-fi
-
-##
-## Fix glade2-generated files
-##
-if test "${action}" = "glade2"
-then
- for file in modules/gui/gtk2/gnome2.glade modules/gui/gtk2/gtk2.glade
- do
- echo "generating code from $file"
- glade-2 -w $file || exit 1
- done
+ 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
exit 0
fi
-##
-## Fix flexml-generated files
-##
-if test "${action}" = "flexml"
-then
- cd modules/gui/skins/parser
- flexml -SH -a skin.act skin.dtd
- # comment the dummy main function
- file=skin.c
- sed 's@int main@//int main@' < $file > $file.$$.bak
- mv -f $file.$$.bak $file
- flex -oflex.c -BLs skin.l
-fi
-
##
## Make distclean
##
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-config.in.in -a -f src/libvlc.c || 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 '{}' ';')
- (cd debian && find . -type d -name '[a-z]*' -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 . -false -path './extras/contrib/*' -type f '(' -name '*.[oa]' -o -name '*.l[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 . -maxdepth 1 -name '[a-z]*' -not -name 'config.rpath' -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
rm -Rf autom4te.cache
- rm -f mozilla/vlcintf.h mozilla/vlcintf.xpt
+ echo "\`toolbox --distclean\' is known to be broken."
+ echo "Don't complain if it does not work, or better yet, don't use it."
+ echo "You were warned."
# FIXME: a lot of Makefiles are still there
fi
+##
+## Add the extras/contrib dir to the distribution
+##
+if test "${action}" = "contrib"
+then
+ set -x
+ if test ! -d "${distdir}/extras"
+ then
+ mkdir "${distdir}/extras"
+ fi
+ if test ! -d "${distdir}/extras/contrib"
+ then
+ mkdir "${distdir}/extras/contrib"
+ fi
+ cp "${srcdir}/extras/contrib/Makefile" "${distdir}/extras/contrib/Makefile"
+ cp "${srcdir}/extras/contrib/README" "${distdir}/extras/contrib/README"
+ cp "${srcdir}/extras/contrib/bootstrap" "${distdir}/extras/contrib/bootstrap"
+ cp "${srcdir}/extras/contrib/change_prefix.sh" "${distdir}/extras/contrib/change_prefix.sh"
+ if test ! -d "${distdir}/extras/contrib/src"
+ then
+ mkdir "${distdir}/extras/contrib/src"
+ fi
+ cp "${srcdir}/extras/contrib/src/Makefile" "${distdir}/extras/contrib/src/Makefile"
+ cp "${srcdir}/extras/contrib/src/packages.mak" "${distdir}/extras/contrib/src/packages.mak"
+ if test ! -d "${distdir}/extras/contrib/src/Patches"
+ then
+ mkdir "${distdir}/extras/contrib/src/Patches"
+ fi
+ cp ${srcdir}/extras/contrib/src/Patches/* "${distdir}/extras/contrib/src/Patches/"
+ if test ! -d "${distdir}/extras/contrib/src/Distributions"
+ then
+ mkdir "${distdir}/extras/contrib/src/Distributions"
+ fi
+ cp ${srcdir}/extras/contrib/src/Distributions/* "${distdir}/extras/contrib/src/Distributions/"
+fi
+