Changeset 2851705c32f14a69dcf115859481f0e4267d9ac2

Timestamp:

08/17/05 16:39:07 (3 years ago)

Author:

Christophe Massiot <massiot@videolan.org>

git-committer:

Christophe Massiot <massiot@videolan.org> 1124289547 +0000

git-parent:

[606657480ad9bf46664eea80f2a8e49aabc02d37]

git-author:

Christophe Massiot <massiot@videolan.org> 1124289547 +0000

Message:

• Makefile.am: New file version.c, generated at each 'make' command.
  
• toolbox: New --update-version switch, which builds the version.c file
  from current date, user/hostname/domainname, compiler version and
  svn changeset.
  
• src/libvlc.c: Exported API to access data from version.c.
  
• modules/control/http.c: New variables vlc_compile_time, vlc_compile_by,
  vlc_compile_host, vlc_compile_domain, vlc_compiler and vlc_changeset.
  

Files:

• Makefile.am (modified) (3 diffs)
• include/vlc/vlc.h (modified) (3 diffs)
• include/vlc_common.h (modified) (1 diff)
• include/vlc_symbols.h (modified) (3 diffs)
• modules/control/http.c (modified) (1 diff)
• src/libvlc.c (modified) (2 diffs)
• toolbox (modified) (3 diffs)

Makefile.am

@@ -49 +49 @@
-    stamp-api \
-    src/misc/modules_builtin.h \
+    src/misc/version.c \
-    $(NULL)
-
@@ -131 +132 @@
-    srcdir=$(srcdir) $(srcdir)/toolbox --update-includes
-    touch $@
+
+src/misc/version.c: FORCE
+    srcdir=$(srcdir) $(srcdir)/toolbox --update-version
-
-# These dependencies are mandatory
@@ -413 +417 @@
-    src/misc/vlm.c \
-    src/misc/xml.c \
+    src/misc/version.c \
-    src/extras/libc.c \
-    src/control/core.c \

include/vlc/vlc.h

@@ -153 +153 @@
- * Exported libvlc API
- *****************************************************************************/
-
+
+
-/**
- * Retrieve libvlc version
@@ -160 +161 @@
- */
-char const * VLC_Version ( void );
+
+/**
+ * Retrieve libvlc compile time
+ *
+ * \return a string containing the libvlc compile time
+ */
+char const * VLC_CompileTime ( void );
+
+/**
+ * Retrieve the username of the libvlc builder
+ *
+ * \return a string containing the username of the libvlc builder
+ */
+char const * VLC_CompileBy ( void );
+
+/**
+ * Retrieve the host of the libvlc builder
+ *
+ * \return a string containing the host of the libvlc builder
+ */
+char const * VLC_CompileHost ( void );
+
+/**
+ * Retrieve the domain name of the host of the libvlc builder
+ *
+ * \return a string containing the domain name of the host of the libvlc builder
+ */
+char const * VLC_CompileDomain ( void );
+
+/**
+ * Retrieve libvlc compiler version
+ *
+ * \return a string containing the libvlc compiler version
+ */
+char const * VLC_Compiler ( void );
+
+/**
+ * Retrieve libvlc changeset
+ *
+ * \return a string containing the libvlc subversion changeset
+ */
+char const * VLC_Changeset ( void );
-
-/**
@@ -168 +211 @@
- */
-char const * VLC_Error ( int i_err );
+
+#endif /* __VLC__ */
-
-/**

include/vlc_common.h

@@ -1088 +1088 @@
-
-/*****************************************************************************
+ * libvlc features
+ *****************************************************************************/
+VLC_EXPORT( const char *, VLC_Version, ( void ) );
+VLC_EXPORT( const char *, VLC_CompileTime, ( void ) );
+VLC_EXPORT( const char *, VLC_CompileBy, ( void ) );
+VLC_EXPORT( const char *, VLC_CompileHost, ( void ) );
+VLC_EXPORT( const char *, VLC_CompileDomain, ( void ) );
+VLC_EXPORT( const char *, VLC_Compiler, ( void ) );
+VLC_EXPORT( const char *, VLC_Changeset, ( void ) );
+VLC_EXPORT( const char *, VLC_Error, ( int ) );
+
+/*****************************************************************************
- * Additional vlc stuff
- *****************************************************************************/

include/vlc_symbols.h

@@ -409 +409 @@
-    void (*__osd_MenuActivate_inner) (vlc_object_t *);
-    void (*__osd_Volume_inner) (vlc_object_t *);
+    const char * (*VLC_Compiler_inner) (void);
+    const char * (*VLC_Error_inner) (int);
+    const char * (*VLC_Changeset_inner) (void);
+    const char * (*VLC_CompileBy_inner) (void);
+    const char * (*VLC_CompileDomain_inner) (void);
+    const char * (*VLC_CompileHost_inner) (void);
+    const char * (*VLC_Version_inner) (void);
+    const char * (*VLC_CompileTime_inner) (void);
-};
-# if defined (__PLUGIN__)
@@ -799 +807 @@
-#  define __osd_MenuActivate (p_symbols)->__osd_MenuActivate_inner
-#  define __osd_Volume (p_symbols)->__osd_Volume_inner
+#  define VLC_Compiler (p_symbols)->VLC_Compiler_inner
+#  define VLC_Error (p_symbols)->VLC_Error_inner
+#  define VLC_Changeset (p_symbols)->VLC_Changeset_inner
+#  define VLC_CompileBy (p_symbols)->VLC_CompileBy_inner
+#  define VLC_CompileDomain (p_symbols)->VLC_CompileDomain_inner
+#  define VLC_CompileHost (p_symbols)->VLC_CompileHost_inner
+#  define VLC_Version (p_symbols)->VLC_Version_inner
+#  define VLC_CompileTime (p_symbols)->VLC_CompileTime_inner
-# elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
-/******************************************************************
@@ -1192 +1208 @@
-    ((p_symbols)->__osd_MenuActivate_inner) = __osd_MenuActivate; \
-    ((p_symbols)->__osd_Volume_inner) = __osd_Volume; \
+    ((p_symbols)->VLC_Compiler_inner) = VLC_Compiler; \
+    ((p_symbols)->VLC_Error_inner) = VLC_Error; \
+    ((p_symbols)->VLC_Changeset_inner) = VLC_Changeset; \
+    ((p_symbols)->VLC_CompileBy_inner) = VLC_CompileBy; \
+    ((p_symbols)->VLC_CompileDomain_inner) = VLC_CompileDomain; \
+    ((p_symbols)->VLC_CompileHost_inner) = VLC_CompileHost; \
+    ((p_symbols)->VLC_Version_inner) = VLC_Version; \
+    ((p_symbols)->VLC_CompileTime_inner) = VLC_CompileTime; \
-    (p_symbols)->net_ConvertIPv4_deprecated = NULL; \
-    (p_symbols)->vlc_fix_readdir_charset_deprecated = NULL; \

modules/control/http.c

@@ -3044 +3044 @@
-
-        p_args->vars = mvar_New( "variables", "" );
-
+
+
-        mvar_AppendNewVar( p_args->vars, "url_value", p_request );
-  VERSION_MESSAGE
+VLC_Version()
-        mvar_AppendNewVar( p_args->vars, "copyright", COPYRIGHT_MESSAGE );
+        mvar_AppendNewVar( p_args->vars, "vlc_compile_time",
+                           VLC_CompileTime() );
+        mvar_AppendNewVar( p_args->vars, "vlc_compile_by", VLC_CompileBy() );
+        mvar_AppendNewVar( p_args->vars, "vlc_compile_host",
+                           VLC_CompileHost() );
+        mvar_AppendNewVar( p_args->vars, "vlc_compile_domain",
+                           VLC_CompileDomain() );
+        mvar_AppendNewVar( p_args->vars, "vlc_compiler", VLC_Compiler() );
+        mvar_AppendNewVar( p_args->vars, "vlc_changeset", VLC_Changeset() );
-        mvar_AppendNewVar( p_args->vars, "stream_position", position );
-        mvar_AppendNewVar( p_args->vars, "stream_time", time );

src/libvlc.c

@@ -138 +138 @@
-    return VERSION_MESSAGE;
-}
+
+/*****************************************************************************
+ * VLC_CompileTime, VLC_CompileBy, VLC_CompileHost, VLC_CompileDomain,
+ * VLC_Compiler, VLC_Changeset
+ *****************************************************************************/
+#define DECLARE_VLC_VERSION( func, var )                                    \
+extern const char psz_vlc_##var [];                                         \
+char const * VLC_##func ( void )                                            \
+{                                                                           \
+    return psz_vlc_##var ;                                                  \
+}
+
+DECLARE_VLC_VERSION( CompileTime, compile_time );
+DECLARE_VLC_VERSION( CompileBy, compile_by );
+DECLARE_VLC_VERSION( CompileHost, compile_host );
+DECLARE_VLC_VERSION( CompileDomain, compile_domain );
+DECLARE_VLC_VERSION( Compiler, compiler );
+DECLARE_VLC_VERSION( Changeset, changeset );
-
-/*****************************************************************************
@@ -2361 +2379 @@
-#endif
-
-
+
+
+
+
+
+
+
-    fprintf( stdout,
-      _("This program comes with NO WARRANTY, to the extent permitted by "

toolbox

@@ -29 +29 @@
-  --update-po             update translation files
-  --update-includes       generate various include files
+  --update-version        generate src/misc/version.c
-  --update-glade          generate and fix Glade code
-  --update-glade2         generate and fix Glade 2 code
@@ -71 +72 @@
-  --update-includes)
-    action=includes
+    ;;
+  --update-version)
+    action=version
-    ;;
-  --update-flexml)
@@ -427 +431 @@
-
-##
+##  Create version file
+##
+if test "${action}" = "version"
+then
+  if test -z "${srcdir}"; then
+    srcdir="`sed -ne 's/^srcdir *= *//p' < Makefile`"
+  fi
+  if test -z "${builddir}"; then
+    builddir="`sed -ne 's/^top_builddir *= *//p' < Makefile`"
+  fi
+  if test -z "${CC}"; then
+    CC="`sed -ne 's/^CC *= *//p' < Makefile`"
+  fi
+
+  VLC_COMPILE_TIME=`LC_ALL=C LANG=C date`
+  VLC_COMPILE_BY=`whoami`
+  VLC_COMPILE_HOST=`hostname`
+  if which dnsdomainname 2>&1 >/dev/null; then
+    VLC_COMPILE_DOMAIN=`dnsdomainname`
+  elif which domainname 2>&1 >/dev/null; then
+    VLC_COMPILE_DOMAIN=`domainname`
+  else
+    VLC_COMPILE_DOMAIN=unknown
+  fi
+  VLC_COMPILER=`$CC -v 2>&1 | tail -n 1`
+  if which svnversion 2>&1 >/dev/null; then
+    VLC_CHANGESET=`svnversion $srcdir`
+  else
+    VLC_CHANGESET=''
+  fi
+
+  cat >| src/misc/version.c << EOF
+const char psz_vlc_compile_time[] = "${VLC_COMPILE_TIME}";
+const char psz_vlc_compile_by[] = "${VLC_COMPILE_BY}";
+const char psz_vlc_compile_host[] = "${VLC_COMPILE_HOST}";
+const char psz_vlc_compile_domain[] = "${VLC_COMPILE_DOMAIN}";
+const char psz_vlc_compiler[] = "${VLC_COMPILER}";
+const char psz_vlc_changeset[] = "${VLC_CHANGESET}";
+EOF
+fi
+
+##
-##  Fix glade-generated files
-##