videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

* ./evc/config.h, ./msvc/config.h: proper generation of these files using 

information from configure.ac.in. Thanks to Stephane van Hardeveld for
    spotting this.
This commit is contained in:
Sam Hocevar 2003-01-16 12:49:28 +00:00
parent b25e0c1894
commit c3cbe1767e
6 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac.in
View File

@ -2763,10 +2763,10 @@ dnl
dnl Stuff used by the program dnl Stuff used by the program
dnl dnl
AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "${VERSION} ${CODENAME}", [Simple version string]) AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "${VERSION} ${CODENAME}", [Simple version string])
AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VideoLAN Client - version ${VERSION} ${CODENAME} - (c) 1996-2002 VideoLAN", [Copyright string]) AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VideoLAN Client - version ${VERSION} ${CODENAME} - (c) 1996-2003 VideoLAN", [Copyright string])
AC_DEFINE_UNQUOTED(CONFIGURE_LINE, "${CONFIGURE_LINE}", [The ./configure command line]) AC_DEFINE_UNQUOTED(CONFIGURE_LINE, "${CONFIGURE_LINE}", [The ./configure command line])
VLC_SYMBOL="`echo ${VERSION} | tr .- __`" VLC_SYMBOL="`echo ${VERSION} | sed -e 'y/.-/__/'`"
AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${VLC_SYMBOL}", [String suffix for module functions]) AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${VLC_SYMBOL}", [String suffix for module functions])
AC_DEFINE_UNQUOTED(MODULE_SYMBOL, ${VLC_SYMBOL}, [Symbol suffix for module functions]) AC_DEFINE_UNQUOTED(MODULE_SYMBOL, ${VLC_SYMBOL}, [Symbol suffix for module functions])
AC_DEFINE_UNQUOTED(LIBEXT, "${LIBEXT}", [Dynamic object extension]) AC_DEFINE_UNQUOTED(LIBEXT, "${LIBEXT}", [Dynamic object extension])

1
evc/.cvsignore
View File

@ -8,6 +8,7 @@ SH4Dbg
SH4Rel SH4Rel
X86EMDbg X86EMDbg
X86EMRel X86EMRel
config.h
*.vcp *.vcp
*.vcl *.vcl
*.vcb *.vcb

19
evc/config.h → evc/config.h.in
View File

@ -1,5 +1,4 @@
/* config.h. Generated by configure. */ /* config.h.in. Generated by hand. */
/* config.h.in. Generated from configure.ac by autoheader. */
/* Maximum supported data alignment */ /* Maximum supported data alignment */
#define ATTRIBUTE_ALIGNED_MAX 16 #define ATTRIBUTE_ALIGNED_MAX 16
@ -18,10 +17,10 @@
#define CAN_COMPILE_SSE 1 #define CAN_COMPILE_SSE 1
/* The ./configure command line */ /* The ./configure command line */
#define CONFIGURE_LINE "./configure --disable-dvd" #define CONFIGURE_LINE "eMbedded Visual C++"
/* Copyright string */ /* Copyright string */
#define COPYRIGHT_MESSAGE "VideoLAN Client - version 0.5.0-cvs-am Natalya - (c) 1996-2002 VideoLAN" #define COPYRIGHT_MESSAGE "VideoLAN Client - version @VERSION@ @CODENAME@ - (c) 1996-2003 VideoLAN"
/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
systems. This function is required for `alloca.c' support on those systems. systems. This function is required for `alloca.c' support on those systems.
@ -415,10 +414,10 @@
#define LIBEXT ".dll" #define LIBEXT ".dll"
/* String suffix for module functions */ /* String suffix for module functions */
#define MODULE_SUFFIX "__0_5_0_cvs_am" #define MODULE_SUFFIX "__@SYMBOL@"
/* Symbol suffix for module functions */ /* Symbol suffix for module functions */
#define MODULE_SYMBOL 0_5_0_cvs_am #define MODULE_SYMBOL @SYMBOL@
/* Define to 1 if your C compiler doesn't accept -c and -o together. */ /* Define to 1 if your C compiler doesn't accept -c and -o together. */
/* #undef NO_MINUS_C_MINUS_O */ /* #undef NO_MINUS_C_MINUS_O */
@ -436,13 +435,13 @@
#define PACKAGE_NAME "vlc" #define PACKAGE_NAME "vlc"
/* Define to the full name and version of this package. */ /* Define to the full name and version of this package. */
#define PACKAGE_STRING "vlc 0.5.0-cvs-am" #define PACKAGE_STRING "vlc @VERSION@"
/* Define to the one symbol short name of this package. */ /* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "vlc" #define PACKAGE_TARNAME "vlc"
/* Define to the version of this package. */ /* Define to the version of this package. */
#define PACKAGE_VERSION "0.5.0-cvs-am" #define PACKAGE_VERSION "@VERSION@"
/* Define if <pthread.h> defines pthread_cond_t. */ /* Define if <pthread.h> defines pthread_cond_t. */
#define PTHREAD_COND_T_IN_PTHREAD_H 1 #define PTHREAD_COND_T_IN_PTHREAD_H 1
@ -480,10 +479,10 @@
#define TIME_WITH_SYS_TIME 1 #define TIME_WITH_SYS_TIME 1
/* Version number of package */ /* Version number of package */
#define VERSION "0.5.0-cvs-am" #define VERSION "@VERSION@"
/* Simple version string */ /* Simple version string */
#define VERSION_MESSAGE "0.5.0-cvs-am Natalya" #define VERSION_MESSAGE "@VERSION@ @CODENAME@"
/* big endian system */ /* big endian system */
/* #undef WORDS_BIGENDIAN */ /* #undef WORDS_BIGENDIAN */

1
msvc/.cvsignore
View File

@ -1,5 +1,6 @@
Debug Debug
Release Release
config.h
*.dsp *.dsp
*.ncb *.ncb
*.opt *.opt

19
msvc/config.h → msvc/config.h.in
View File

@ -1,5 +1,4 @@
/* config.h. Generated by configure. */ /* config.h.in. Generated by hand. */
/* config.h.in. Generated from configure.ac by autoheader. */
/* Maximum supported data alignment */ /* Maximum supported data alignment */
#define ATTRIBUTE_ALIGNED_MAX 16 #define ATTRIBUTE_ALIGNED_MAX 16
@ -17,10 +16,10 @@
#define CAN_COMPILE_SSE 1 #define CAN_COMPILE_SSE 1
/* The ./configure command line */ /* The ./configure command line */
#define CONFIGURE_LINE "./configure --disable-dvd" #define CONFIGURE_LINE "Visual C++"
/* Copyright string */ /* Copyright string */
#define COPYRIGHT_MESSAGE "VideoLAN Client - version 0.5.0-cvs-am Natalya - (c) 1996-2002 VideoLAN" #define COPYRIGHT_MESSAGE "VideoLAN Client - version @VERSION@ @CODENAME@ - (c) 1996-2003 VideoLAN"
/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
systems. This function is required for `alloca.c' support on those systems. systems. This function is required for `alloca.c' support on those systems.
@ -414,10 +413,10 @@
#define LIBEXT ".dll" #define LIBEXT ".dll"
/* String suffix for module functions */ /* String suffix for module functions */
#define MODULE_SUFFIX "__0_5_0_cvs_am" #define MODULE_SUFFIX "__@SYMBOL@"
/* Symbol suffix for module functions */ /* Symbol suffix for module functions */
#define MODULE_SYMBOL 0_5_0_cvs_am #define MODULE_SYMBOL @SYMBOL@
/* Define to 1 if your C compiler doesn't accept -c and -o together. */ /* Define to 1 if your C compiler doesn't accept -c and -o together. */
/* #undef NO_MINUS_C_MINUS_O */ /* #undef NO_MINUS_C_MINUS_O */
@ -435,13 +434,13 @@
#define PACKAGE_NAME "vlc" #define PACKAGE_NAME "vlc"
/* Define to the full name and version of this package. */ /* Define to the full name and version of this package. */
#define PACKAGE_STRING "vlc 0.5.0-cvs-am" #define PACKAGE_STRING "vlc @VERSION@"
/* Define to the one symbol short name of this package. */ /* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "vlc" #define PACKAGE_TARNAME "vlc"
/* Define to the version of this package. */ /* Define to the version of this package. */
#define PACKAGE_VERSION "0.5.0-cvs-am" #define PACKAGE_VERSION "@VERSION@"
/* Define if <pthread.h> defines pthread_cond_t. */ /* Define if <pthread.h> defines pthread_cond_t. */
#define PTHREAD_COND_T_IN_PTHREAD_H 1 #define PTHREAD_COND_T_IN_PTHREAD_H 1
@ -479,10 +478,10 @@
#define TIME_WITH_SYS_TIME 1 #define TIME_WITH_SYS_TIME 1
/* Version number of package */ /* Version number of package */
#define VERSION "0.5.0-cvs-am" #define VERSION "@VERSION@"
/* Simple version string */ /* Simple version string */
#define VERSION_MESSAGE "0.5.0-cvs-am Natalya" #define VERSION_MESSAGE "@VERSION@ @CODENAME@"
/* big endian system */ /* big endian system */
/* #undef WORDS_BIGENDIAN */ /* #undef WORDS_BIGENDIAN */

17
toolbox
View File

@ -1,7 +1,7 @@
#! /bin/sh #! /bin/sh
## toolbox for vlc, the VideoLAN Client ## toolbox for vlc, the VideoLAN Client
## $Id: toolbox,v 1.4 2003/01/16 09:00:32 sam Exp $ ## $Id: toolbox,v 1.5 2003/01/16 12:49:28 sam Exp $
## ##
## Authors: Samuel Hocevar <sam@zoy.org> ## Authors: Samuel Hocevar <sam@zoy.org>
@ -75,6 +75,11 @@ then
# The evil ^M # The evil ^M
M=' ' M=' '
# Variables we get from configure.ac.in
LIBVLC_VERSION=`sed -ne '/AC_INIT/s/.*,\(.*\))/\1/p' < configure.ac.in`
LIBVLC_CODENAME=`sed -ne '/CODENAME=/s/.*"\(.*\)"/\1/p' < configure.ac.in`
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=`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'`
@ -85,6 +90,16 @@ then
# Clean up # Clean up
rm -f evc/*.vcp msvc/*.dsp 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 # libvlc files
for target in evc/libvlc.vcp msvc/libvlc.dsp for target in evc/libvlc.vcp msvc/libvlc.dsp
do do