Mercurial > dwindows
changeset 1160:924c8087a755
Attempt to use the subversion revision number as the sub version number.
| author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
|---|---|
| date | Fri, 16 Sep 2011 06:39:56 +0000 |
| parents | 1e0cd8dafdfb |
| children | e4b13cd7a002 |
| files | Makefile.in configure.in gtk/dw.c gtk3/dw.c mac/dw.m os2/dw.c win/dw.c |
| diffstat | 7 files changed, 28 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Thu Sep 15 21:28:23 2011 +0000 +++ b/Makefile.in Fri Sep 16 06:39:56 2011 +0000 @@ -7,7 +7,7 @@ # Uncomment DEPRECATED line to force use of GTK 3.x support # #DEPRECATED = -DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGDK_DISABLE_SINGLE_INCLUDES -CCFLAGS = $(DEPRECATED) @CFLAGS@ $(PLATCCFLAGS) @ARCH@ -D@DW_DEFINE@ -DBUILD_DLL -DDW_RESOURCES +CCFLAGS = $(DEPRECATED) @CFLAGS@ $(PLATCCFLAGS) @ARCH@ -D@DW_DEFINE@ -DBUILD_DLL -DDW_RESOURCES -DVER_REV=$(VER_REV) LFLAGS = @LIBS@ @ARCH@ ARFLAGS = @ARFLAGS@ INSTALL = @INSTALL@ @@ -26,6 +26,7 @@ TARGETS = @TARGETS@ VER_MAJ = @DW_MAJOR_VERSION@ VER_MIN = @DW_MINOR_VERSION@ +VER_REV = @SVNVERSION@ SOSUFFIX= @SOSUFFIX@ SONAME= @SONAME@ LIBPREFIX = @LIBPREFIX@
--- a/configure.in Thu Sep 15 21:28:23 2011 +0000 +++ b/configure.in Fri Sep 16 06:39:56 2011 +0000 @@ -32,6 +32,12 @@ if test x"$MAKE" = x; then AC_CHECK_PROG(MAKE, make, make) fi +AC_CHECK_PROG(SVNVERSION, svnversion, svnversion) +if test x"$SVNVERSION" = x; then + SVNVERSION=0 +else + SVNVERSION="\` $SVNVERSION -n . | tr -d M \`" +fi AC_PROG_INSTALL
--- a/gtk/dw.c Thu Sep 15 21:28:23 2011 +0000 +++ b/gtk/dw.c Fri Sep 16 06:39:56 2011 +0000 @@ -10824,7 +10824,11 @@ strcpy(env->buildTime, __TIME__); env->DWMajorVersion = DW_MAJOR_VERSION; env->DWMinorVersion = DW_MINOR_VERSION; +#ifdef VER_REV + env->DWSubVersion = VER_REV; +#else env->DWSubVersion = DW_SUB_VERSION; +#endif for(z=1;z<len;z++) {
--- a/gtk3/dw.c Thu Sep 15 21:28:23 2011 +0000 +++ b/gtk3/dw.c Fri Sep 16 06:39:56 2011 +0000 @@ -9583,7 +9583,11 @@ strcpy(env->buildTime, __TIME__); env->DWMajorVersion = DW_MAJOR_VERSION; env->DWMinorVersion = DW_MINOR_VERSION; +#ifdef VER_REV + env->DWSubVersion = atoi(VER_REV); +#else env->DWSubVersion = DW_SUB_VERSION; +#endif for(z=1;z<len;z++) {
--- a/mac/dw.m Thu Sep 15 21:28:23 2011 +0000 +++ b/mac/dw.m Fri Sep 16 06:39:56 2011 +0000 @@ -7916,7 +7916,11 @@ strcpy(env->buildTime, __TIME__); env->DWMajorVersion = DW_MAJOR_VERSION; env->DWMinorVersion = DW_MINOR_VERSION; +#ifdef VER_REV + env->DWSubVersion = VER_REV; +#else env->DWSubVersion = DW_SUB_VERSION; +#endif env->MajorVersion = DWOSMajor; env->MinorVersion = DWOSMinor;
--- a/os2/dw.c Thu Sep 15 21:28:23 2011 +0000 +++ b/os2/dw.c Fri Sep 16 06:39:56 2011 +0000 @@ -9659,7 +9659,11 @@ strcpy(env->buildTime, __TIME__); env->DWMajorVersion = DW_MAJOR_VERSION; env->DWMinorVersion = DW_MINOR_VERSION; +#ifdef VER_REV + env->DWSubVersion = VER_REV; +#else env->DWSubVersion = DW_SUB_VERSION; +#endif } /* The next few functions are support functions for the OS/2 folder browser */
--- a/win/dw.c Thu Sep 15 21:28:23 2011 +0000 +++ b/win/dw.c Fri Sep 16 06:39:56 2011 +0000 @@ -9830,7 +9830,11 @@ strcpy(env->buildTime, __TIME__); env->DWMajorVersion = DW_MAJOR_VERSION; env->DWMinorVersion = DW_MINOR_VERSION; +#ifdef VER_REV + env->DWSubVersion = VER_REV; +#else env->DWSubVersion = DW_SUB_VERSION; +#endif } /*