You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mt...@apache.org on 2009/06/18 14:24:32 UTC
svn commit: r786033 - in /commons/sandbox/runtime/trunk/src/main/native: Makefile.in Makefile.msc.in configure

Author: mturk
Date: Thu Jun 18 12:24:31 2009
New Revision: 786033

URL: http://svn.apache.org/viewvc?rev=786033&view=rev
Log:
Detect version info from acr_version.h

Modified:
    commons/sandbox/runtime/trunk/src/main/native/Makefile.in
    commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in
    commons/sandbox/runtime/trunk/src/main/native/configure

Modified: commons/sandbox/runtime/trunk/src/main/native/Makefile.in
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/Makefile.in?rev=786033&r1=786032&r2=786033&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/Makefile.in (original)
+++ commons/sandbox/runtime/trunk/src/main/native/Makefile.in Thu Jun 18 12:24:31 2009
@@ -48,6 +48,9 @@
 SHFLAGS=@shflags@
 INCLUDES=@includes@
 SSLFLAGS=@sslflags@
+VERSION_MAJOR=@vmajor@
+VERSION_MINOR=@vminor@
+VERSION_PATCH=@vpatch@
 
 DESTDIR=$(PREFIX)
 SONAME=lib$(NAME)$(SO)

Modified: commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in?rev=786033&r1=786032&r2=786033&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in (original)
+++ commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in Thu Jun 18 12:24:31 2009
@@ -45,6 +45,9 @@
 SHFLAGS=@shflags@
 INCLUDES=@includes@
 SSLFLAGS=@sslflags@
+VERSION_MAJOR=@vmajor@
+VERSION_MINOR=@vminor@
+VERSION_PATCH=@vpatch@
 
 LINK=link.exe
 RC=rc.exe

Modified: commons/sandbox/runtime/trunk/src/main/native/configure
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/configure?rev=786033&r1=786032&r2=786033&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure Thu Jun 18 12:24:31 2009
@@ -254,6 +254,13 @@
     echo "\`$java_home' is not valid JAVA_HOME directory"
 fi
 
+major_sed="/#define.*ACR_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p"
+minor_sed="/#define.*ACR_MINOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p"
+patch_sed="/#define.*ACR_PATCH_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p"
+vmajor="`sed -n $major_sed $topdir/include/acr_version.h`"
+vminor="`sed -n $minor_sed $topdir/include/acr_version.h`"
+vpatch="`sed -n $patch_sed $topdir/include/acr_version.h`"
+
 mach=`(uname -m) 2>/dev/null` || mach="unknown"
 host=`(uname -s) 2>/dev/null` || host="unknown"
 host=`tolower "$host"`
@@ -799,6 +806,9 @@
     -e "s;=@rcflags@;=$rcflags;g" \
     -e "s;=@includes@;=$includes;g" \
     -e "s;=@name@;=$name;g" \
+    -e "s;=@vmajor@;$vmajor;g" \
+    -e "s;=@vminor@;$vminor;g" \
+    -e "s;=@vpatch@;$vpatch;g" \
     -e "s;@platform@;$platform;g" \
     -e "s;@testobjs@;$testobjs;g" \
     -e "s;@modules@;$modules;g" \