Changeset 575c056a1c46f037ab33366b4999eb8eb1a96cd5

Timestamp:

06/02/05 14:47:30 (3 years ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1117716450 +0000

git-parent:

[cab6549141c59cb40ff9ec9e3c03ec72c65c60e9]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1117716450 +0000

Message:

Complete rewrite of vlc_symbols.h generation (closes #155)

New VLC_EXPORTs are now added at the end of module_symbols_t so that
offsets of other function pointers are preserved.

Deleted VLC_EXPORTs are replaced with dummy pointers for padding.

Of course, it doesn't solve the problem with changing shared structures
format :/ and it may cause SVN conflicts when multiple people changes
VLC_EXPORT. I doubt it can be avoided though.

Files:

• Makefile.am (modified) (7 diffs)
• include/vlc_symbols.h (added)
• src/Makefile.am (modified) (1 diff)
• src/misc/modules.c (modified) (1 diff)
• src/misc/modules_plugin.h.in (deleted)
• toolbox (modified) (1 diff)
• vlc-api.pl (added)
• vlc-config.in.in (modified) (1 diff)

Makefile.am

@@ -24 +24 @@
-    src/extras/COPYING \
-    toolbox \
+    vlc-api.pl \
-    vlc-config.in.in \
-    vlc.spec \
@@ -46 +47 @@
-BUILT_SOURCES += \
-    stamp-api \
-    include/vlc_symbols.h \
-    src/misc/modules_builtin.h \
-    src/misc/modules_plugin.h \
-    $(NULL)
-
@@ -64 +63 @@
-    $(NULL)
-
- $(HEADERS_include_built)
+
-
-HEADERS_include = \
@@ -115 +114 @@
-    include/vlc_spu.h \
-    include/vlc_stream.h \
+    include/vlc_symbols.h \
-    include/vlc_threads_funcs.h \
-    include/vlc_threads.h \
@@ -125 +125 @@
-    $(NULL)
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    srcdir=$(srcdir) $(srcdir)/toolbox --update-includes
-
-
-
-
-
-
-
-
-
+
-
-# These dependencies are mandatory
-
-
+
-
-###############################################################################
@@ -286 +266 @@
-
-lib_libvlc_a_SOURCES = $(SOURCES_libvlc)
-dist_lib_libvlc_a_SOURCES = src/misc/modules_plugin.h
-lib_libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
-lib_libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc`
@@ -940 +919 @@
-    @if test ! -f $@; then printf "" > $@; fi
-
- $(HEADERS_include) vlc-config src/misc/modules_plugin.h.in
-srcdir=$(srcdir) $(srcdir)/toolbox --update-includes
+.in $(HEADERS_include) vlc-config vlc-api.pl
+cd $(srcdir) && cat $(HEADERS_include) | perl ./vlc-api.pl
-    touch stamp-api
-

src/Makefile.am

@@ -1 +1 @@
-DIST_SUBDIRS = interface playlist input audio_output video_output stream_output misc
- misc/modules_plugin.h.in
+

src/misc/modules.c

@@ -108 +108 @@
-#include "vlc_image.h"
-
-#ifdef HAVE_DYNAMIC_PLUGINS
-#   include "modules_plugin.h"
-#endif
-
-#if defined( _MSC_VER ) && defined( UNDER_CE )
-#    include "modules_builtin_evc.h"

toolbox

@@ -405 +405 @@
-    builddir="`sed -ne 's/^top_builddir *= *//p' < Makefile`"
-  fi
-  mkdir -p "${builddir}/include"
-
-  LIBVLC_HEADERS=`getfiles HEADERS_include`
-  BUILTINS=`sed -ne 's/.*builtins *= *" *\([^"]*\)".*/\1/p' vlc-config`
-
-  file="${builddir}/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}
-  fi
-
-  file="${builddir}/src/misc/modules_plugin.h"
-
-  rm -f ${file}.tmp
-  sed -e 's#.*\$[I][d]:.*# * Automatically generated from '${file}'.in by bootstrap#' < ${srcdir}/src/misc/modules_plugin.h.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}
-  fi
-
-  file="${builddir}/src/misc/modules_builtin.h"

vlc-config.in.in

@@ -86 +86 @@
-  top_builddir="${TOP_BUILDDIR}/"
-fi
- -I${top_builddir}include
+
-cppflags="${includes}"
-libs="-L@libdir@"