Skip to content

V
vlc
Commit a5abccd4 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

* ./Makefile.am: moved generation of .h files to the toolbox so that we 

    can call "toolbox --update-includes" without running configure.
  * ./toolbox: de-uglified some shell code.
parent 0eaf6315
Show whitespace changes
Inline Side-by-side
Showing with 124 additions and 83 deletions
Makefile.am
View file @ a5abccd4
...@@ -200,51 +200,13 @@ HEADERS_include_built = \ ...@@ -200,51 +200,13 @@ HEADERS_include_built = \
$(NULL) $(NULL)
include/vlc_symbols.h: Makefile $(HEADERS_include) include/vlc_symbols.h: Makefile $(HEADERS_include)
rm -f $@.in ./toolbox --update-includes $(BUILTINS)
echo '/* DO NOT EDIT THIS FILE! See Makefile.am */' >> $@.in
echo 'struct module_symbols_t {' >> $@.in
cat $(HEADERS_include) | grep '^ *VLC_EXPORT.*;' | sed -e 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/ \1 (* \2_inner) \3;/' >> $@.in
echo '};' >> $@.in
echo '#ifdef __PLUGIN__' >> $@.in
cat $(HEADERS_include) | grep '^ *VLC_EXPORT.*;' | sed -e 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/# define \2 p_symbols->\2_inner/' >> $@.in
echo '#endif /* __PLUGIN__ */' >> $@.in
if ! diff -q $@ $@.in; then \
mv -f $@.in $@ ; \
else \
rm -f $@.in ; \
fi
src/misc/modules_plugin.h: Makefile src/misc/modules_plugin.h.in $(HEADERS_include) src/misc/modules_plugin.h: Makefile src/misc/modules_plugin.h.in $(HEADERS_include)
rm -f $@.tmp && cp $@.in $@.tmp ./toolbox --update-includes $(BUILTINS)
sed -e 's#.*\$[I][d]:.*# * Automatically generated from '$@'.in by bootstrap#' < $@.in > $@.tmp
echo '#define STORE_SYMBOLS( p_symbols ) \' >> $@.tmp
cat $(HEADERS_include) | grep '^ *VLC_EXPORT.*;' | sed -e 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/ (p_symbols)->\2_inner = \2; \\/' >> $@.tmp
echo '' >> $@.tmp
if ! diff -q $@ $@.tmp; then \
mv -f $@.tmp $@ ; \
else \
rm -f $@.tmp ; \
fi
src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in
rm -f $@.tmp && cp $@.in $@.tmp ./toolbox --update-includes $(BUILTINS)
if HAVE_BUILTINS
for i in $(BUILTINS) ; do echo "int vlc_entry__"`echo $$i | sed -e 'y@/@_@' -e 's@\..*@@'`"( module_t* );" >>$@.tmp; done
echo "" >> $@.tmp
endif
echo "#define ALLOCATE_ALL_BUILTINS() \\" >> $@.tmp
echo " do \\" >> $@.tmp
echo " { \\" >> $@.tmp
if HAVE_BUILTINS
for i in $(BUILTINS) ; do echo " ALLOCATE_BUILTIN("`echo $$i | sed -e 'y@/@_@' -e 's@\..*@@'`"); \\" >> $@.tmp ; done
endif
echo " } while( 0 );" >> $@.tmp
echo "" >> $@.tmp
if ! diff -q $@ $@.tmp; then \
mv -f $@.tmp $@ ; \
else \
rm -f $@.tmp ; \
fi
# These dependencies are mandatory # These dependencies are mandatory
$(SOURCES): include/vlc_symbols.h $(SOURCES): include/vlc_symbols.h
......
toolbox
View file @ a5abccd4
#! /bin/sh #! /bin/sh
## toolbox for the VLC media player ## toolbox for the VLC media player
## $Id: toolbox,v 1.13 2003/03/12 04:16:02 sam Exp $ ## $Id: toolbox,v 1.14 2003/03/12 05:12:05 sam Exp $
## ##
## Authors: Samuel Hocevar <sam@zoy.org> ## Authors: Samuel Hocevar <sam@zoy.org>
...@@ -23,27 +23,37 @@ recognized flags are: ...@@ -23,27 +23,37 @@ recognized flags are:
--update-changelog update the CVS changelog --update-changelog update the CVS changelog
--update-vc update Microsoft Visual Studio files --update-vc update Microsoft Visual Studio files
--update-po update translation files --update-po update translation files
--update-includes [BUILTINS] generate various include files
--update-glade generate and fix Glade code --update-glade generate and fix Glade code
EOF EOF
exit 1 exit 1
} }
##
## Extract stuff from Makefile.am
##
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 | \
tr '\\ ' '\n\n' | \
sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'
}
### ###
### argument check ### argument check
### ###
do_help=no
do_changelog=no do_changelog=no
do_po=no do_po=no
do_vc=no do_vc=no
do_includes=no
do_glade=no do_glade=no
if test "$1" = "" if test "$1" = ""
then then
do_help=yes help
fi fi
while test $# -gt 0; do case "$1" in
case "$1" in
--update-changelog) --update-changelog)
do_changelog=yes do_changelog=yes
;; ;;
...@@ -53,27 +63,21 @@ while test $# -gt 0; do ...@@ -53,27 +63,21 @@ while test $# -gt 0; do
--update-po) --update-po)
do_po=yes do_po=yes
;; ;;
--update-includes)
do_includes=yes
;;
--update-glade|--fix-glade) --update-glade|--fix-glade)
do_glade=yes do_glade=yes
;; ;;
--help) --help)
do_help=yes help
;; ;;
*) *)
echo "$0: unknown option $1" echo "$0: unknown option $1"
do_help=yes
;;
esac
shift
done
##
## Give help if needed
##
if test "$do_help" = "yes"
then
help help
fi ;;
esac
shift
## ##
## Update the CVS changelog ## Update the CVS changelog
...@@ -85,6 +89,7 @@ then ...@@ -85,6 +89,7 @@ then
cvs2cl --hide-filenames --no-wrap -w --stdout | \ cvs2cl --hide-filenames --no-wrap -w --stdout | \
sed -e 's/^[^0-9]/ /' -e 's/^ *$//' | \ sed -e 's/^[^0-9]/ /' -e 's/^ *$//' | \
uniq > ChangeLog uniq > ChangeLog
exit 0
fi fi
## ##
...@@ -103,11 +108,11 @@ then ...@@ -103,11 +108,11 @@ then
LIBVLC_SYMBOL=`echo $LIBVLC_VERSION | sed -e 'y/.-/__/'` LIBVLC_SYMBOL=`echo $LIBVLC_VERSION | sed -e 'y/.-/__/'`
# Sources that get built under Win32 - FIXME: anyone wanna deuglify this? :) # Sources that get built under Win32 - FIXME: anyone wanna deuglify this? :)
LIBVLC_SOURCES=`awk 'BEGIN{a=0}{if(!a&&/^'SOURCES_libvlc_common'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'; awk 'BEGIN{a=0}{if(!a&&/^'SOURCES_libvlc_win32'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'; awk 'BEGIN{a=0}{if(!a&&/^'SOURCES_libvlc_dirent'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'; awk 'BEGIN{a=0}{if(!a&&/^'SOURCES_libvlc_getopt'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'; awk 'BEGIN{a=0}{if(!a&&/^'SOURCES_libvlc_libc'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'` LIBVLC_SOURCES=`getfiles SOURCES_libvlc_common; getfiles SOURCES_libvlc_win32; getfiles SOURCES_libvlc_dirent; getfiles SOURCES_libvlc_getopt; getfiles SOURCES_libvlc_libc`
LIBVLC_HEADERS=`awk 'BEGIN{a=0}{if(!a&&/^'HEADERS_include'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'; awk 'BEGIN{a=0}{if(!a&&/^'HEADERS_include_built'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'` LIBVLC_HEADERS=`getfiles HEADERS_include; getfiles HEADERS_include_built`
LIBVLC_PKG_HEADERS=`awk 'BEGIN{a=0}{if(!a&&/^'dist_pkginclude_HEADERS'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'` LIBVLC_PKG_HEADERS=`getfiles dist_pkginclude_HEADERS`
# Clean up # Clean up
rm -f evc/*.vcp msvc/*.dsp rm -f evc/*.vcp msvc/*.dsp
...@@ -327,6 +332,80 @@ then ...@@ -327,6 +332,80 @@ then
exit 0 exit 0
fi fi
##
## Create include files
##
if test "$do_includes" = "yes"
then
set -x
LIBVLC_HEADERS=`getfiles HEADERS_include`
BUILTINS=`while test $# -gt 0; do echo $1; shift; done`
file=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 -q ${file} ${file}.in
then
mv -f ${file}.in ${file}
else
rm -f ${file}.in
fi
file=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 -q ${file} ${file}.tmp
then
mv -f ${file}.tmp ${file}
else
rm -f ${file}.tmp
fi
file=src/misc/modules_builtin.h
rm -f ${file}.tmp && cp ${file}.in ${file}.tmp
if test "${BUILTINS}" != ""
then
for i in `echo ${BUILTINS}`
do
echo "int vlc_entry__`echo $i | sed -e 'y@/@_@' -e 's@\..*@@'`( module_t* );" >>${file}.tmp
done
echo "" >> ${file}.tmp
fi
echo "#define ALLOCATE_ALL_BUILTINS() \\" >> ${file}.tmp
echo " do \\" >> ${file}.tmp
echo " { \\" >> ${file}.tmp
if test "${BUILTINS}" != ""
then
for i in `echo ${BUILTINS}`
do
echo " ALLOCATE_BUILTIN(`echo $i | sed -e 'y@/@_@' -e 's@\..*@@'`); \\" >> ${file}.tmp
done
fi
echo " } while( 0 );" >> ${file}.tmp
echo "" >> ${file}.tmp
if ! diff -q ${file} ${file}.tmp
then
mv -f ${file}.tmp ${file}
else
rm -f ${file}.tmp
fi
exit 0
fi
## ##
## Fix glade-generated files ## Fix glade-generated files
## ##
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment