commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r1087631 - in /commons/sandbox/runtime/trunk: ./ src/main/java/org/apache/commons/runtime/ src/main/native/ src/main/native/include/acr/ src/main/native/shared/
Date Fri, 01 Apr 2011 09:35:16 GMT
Author: mturk
Date: Fri Apr  1 09:35:16 2011
New Revision: 1087631

URL: http://svn.apache.org/viewvc?rev=1087631&view=rev
Log:
Add patch version component

Modified:
    commons/sandbox/runtime/trunk/build.properties.default
    commons/sandbox/runtime/trunk/build.properties.in
    commons/sandbox/runtime/trunk/build.xml
    commons/sandbox/runtime/trunk/configure
    commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Version.java
    commons/sandbox/runtime/trunk/src/main/native/configure
    commons/sandbox/runtime/trunk/src/main/native/include/acr/version.h
    commons/sandbox/runtime/trunk/src/main/native/shared/version.c

Modified: commons/sandbox/runtime/trunk/build.properties.default
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/build.properties.default?rev=1087631&r1=1087630&r2=1087631&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/build.properties.default (original)
+++ commons/sandbox/runtime/trunk/build.properties.default Fri Apr  1 09:35:16 2011
@@ -27,8 +27,10 @@
 # ----- Vesion Control Flags --------------------------------------------------
 version.major=0
 version.minor=9
-version.patch=4
-version.suffix=-dev
+version.micro=4
+version.patch=0
+version.devel.sfx=-dev
+version.patch.sfx=
 
 # ----- Default Compile options -----------------------------------------------
 compile.source=1.6

Modified: commons/sandbox/runtime/trunk/build.properties.in
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/build.properties.in?rev=1087631&r1=1087630&r2=1087631&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/build.properties.in (original)
+++ commons/sandbox/runtime/trunk/build.properties.in Fri Apr  1 09:35:16 2011
@@ -27,8 +27,10 @@
 # ----- Vesion Control Flags --------------------------------------------------
 version.major=@vmajor@
 version.minor=@vminor@
+version.micro=@vmicro@
 version.patch=@vpatch@
-version.suffix=@devsfx@
+version.devel.sfx=@develsfx@
+version.patch.sfx=@patchsfx@
 
 # ----- Default Compile options -----------------------------------------------
 compile.source=1.@compile_source@

Modified: commons/sandbox/runtime/trunk/build.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/build.xml?rev=1087631&r1=1087630&r2=1087631&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/build.xml (original)
+++ commons/sandbox/runtime/trunk/build.xml Fri Apr  1 09:35:16 2011
@@ -15,11 +15,13 @@
     <property name="title" value="Apache Commons Runtime core library"/>
     <property name="version.major" value="0"/>
     <property name="version.minor" value="0"/>
+    <property name="version.micro" value="0"/>
     <property name="version.patch" value="0"/>
-    <property name="version.suffix" value=""/>
-    <property name="version" value="${version.major}.${version.minor}.${version.patch}"/>
+    <property name="version.patch.sfx" value=""/>
+    <property name="version.devel.sfx" value=""/>
+    <property name="version" value="${version.major}.${version.minor}.${version.micro}"/>
     <property name="implementation" value="${version.major}.${version.minor}"/>
-    <property name="version.number" value="${version.major}${version.minor}${version.patch}"/>
+    <property name="version.number" value="${version.major}${version.minor}${version.micro}"/>
     <property name="project" value="commons-runtime"/>
     <property name="build.top" value="${basedir}"/>
     <property name="build.dir" value="${basedir}/dist"/>
@@ -28,7 +30,7 @@
     <property name="src.base" value="${basedir}/src"/>
     <property name="src.docs" value="${basedir}/xdocs"/>
     <property name="src.native" value="${basedir}/src/main/native"/>
-    <property name="final.name" value="${project}-${version}${version.suffix}"/>
+    <property name="final.name" value="${project}-${version}${version.devel.sfx}"/>
 
     <property name="build.package.path" value="org/apache/commons/runtime"/>
     <property name="build.package.name" value="org.apache.commons.runtime"/>
@@ -189,6 +191,7 @@ The Apache Software Foundation (http://w
         <filter token="VERSION" value="${version}"/>
         <filter token="VERSION_MAJOR"  value="${version.major}"/>
         <filter token="VERSION_MINOR"  value="${version.minor}"/>
+        <filter token="VERSION_MICRO"  value="${version.micro}"/>
         <filter token="VERSION_PATCH"  value="${version.patch}"/>
         <filter token="VERSION_NUMBER" value="${version.number}"/>
         <filter token="VERSION_PNAME"  value="${final.name}"/>
@@ -238,6 +241,7 @@ The Apache Software Foundation (http://w
         <filter token="VERSION" value="${version}"/>
         <filter token="VERSION_MAJOR" value="${version.major}"/>
         <filter token="VERSION_MINOR" value="${version.minor}"/>
+        <filter token="VERSION_MICRO" value="${version.micro}"/>
         <filter token="VERSION_PATCH" value="${version.patch}"/>
         <filter token="VERSION_NUMBER" value="${version.number}"/>
         <filter token="VERSION_PNAME" value="${final.name}"/>

Modified: commons/sandbox/runtime/trunk/configure
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/configure?rev=1087631&r1=1087630&r2=1087631&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/configure (original)
+++ commons/sandbox/runtime/trunk/configure Fri Apr  1 09:35:16 2011
@@ -147,18 +147,26 @@ tolower()
 
 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'
+micro_sed='/#define.*ACR_MICRO_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p'
 patch_sed='/#define.*ACR_PATCH_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p'
 devel_sed='/#define.*ACR_ISDEV_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p'
 vmajor="`sed -n $major_sed $topdir/src/main/native/include/acr/version.h`"
 vminor="`sed -n $minor_sed $topdir/src/main/native/include/acr/version.h`"
+vmicro="`sed -n $micro_sed $topdir/src/main/native/include/acr/version.h`"
 vpatch="`sed -n $patch_sed $topdir/src/main/native/include/acr/version.h`"
 vdevel="`sed -n $devel_sed $topdir/src/main/native/include/acr/version.h`"
 
 
-if [ "$vdelel" = ".0" ]; then
-    devsfx=""
+if [ ".$vdevel" = ".0" ]; then
+    develsfx=""
 else
-    devsfx="-dev"
+    develsfx="-dev"
+fi
+
+if [ ".$vpatch" = ".0" ]; then
+    patchsfx=""
+else
+    patchsfx="_$vpatch"
 fi
 
 if [ ".$mach" = . ]; then
@@ -211,8 +219,10 @@ esac
 sed -e "s;=@name@;=$name;g" \
     -e "s;=@vmajor@;=$vmajor;g" \
     -e "s;=@vminor@;=$vminor;g" \
+    -e "s;=@vmicro@;=$vmicro;g" \
     -e "s;=@vpatch@;=$vpatch;g" \
-    -e "s;=@devsfx@;=$devsfx;g" \
+    -e "s;=@develsfx@;=$develsfx;g" \
+    -e "s;=@patchsfx@;=$patchsfx;g" \
     -e "s;@compile_source@;$compile_source;g" \
     -e "s;@compile_target@;$compile_target;g" \
     -e "s;=@debug@;=$has_debug;g" \

Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Version.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Version.java?rev=1087631&r1=1087630&r2=1087631&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Version.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Version.java Fri
Apr  1 09:35:16 2011
@@ -51,13 +51,19 @@ public final class Version
      * <br />
      * Patch level designates only bug fixing release.
      */
-    public static final int     PATCH = get0(2);
+    public static final int     MICRO = get0(2);
+
+    /** Patch level
+     * <br />
+     * Patch level designates only bug fixing release.
+     */
+    public static final int     PATCH = get0(3);
 
     /**
      *  This symbol is defined for internal, "development" copies of ACR.
      *  This symbol will be false for releases.
      */
-    public static final boolean IS_DEVELOPMENT = get1();
+    public static final boolean DEVEL = get1();
 
     /**
      * String representing the build mark of the time at which

Modified: commons/sandbox/runtime/trunk/src/main/native/configure
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/configure?rev=1087631&r1=1087630&r2=1087631&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure Fri Apr  1 09:35:16 2011
@@ -416,11 +416,13 @@ test ".$strip" = . && strip=`getgnutool 
 varadds includes "-I??(TOPDIR)/include -I??(TOPDIR)/srclib"
 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'
+micro_sed='/#define.*ACR_MICRO_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`"
+vmicro="`sed -n $micro_sed $topdir/include/acr/version.h`"
 vpatch="`sed -n $patch_sed $topdir/include/acr/version.h`"
-vdotted=$vmajor.$vminor.$vpatch
+vdotted=$vmajor.$vminor.$vmicro
 test ".$libdir" = . && libdir="lib"
 test ".$incdir" = . && incdir="include/$name-$vmajor.$vminor"
 test ".$shrdir" = . && incdir="share/$name-$vmajor.$vminor"
@@ -1467,6 +1469,7 @@ SHFLAGS=$shflags
 SSLFLAGS=$ssllibs
 VERSION_MAJOR=$vmajor
 VERSION_MINOR=$vminor
+VERSION_MICRO=$vmicro
 VERSION_PATCH=$vpatch
 VERSION=$vdotted
 

Modified: commons/sandbox/runtime/trunk/src/main/native/include/acr/version.h
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/acr/version.h?rev=1087631&r1=1087630&r2=1087631&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/acr/version.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/acr/version.h Fri Apr  1 09:35:16
2011
@@ -54,8 +54,11 @@
  */
 #define ACR_MINOR_VERSION       9
 
+/** Micro version */
+#define ACR_MICRO_VERSION       4
+
 /** patch level */
-#define ACR_PATCH_VERSION       4
+#define ACR_PATCH_VERSION       0
 
 /**
  *  This symbol is defined for internal, "development" copies of ACR.
@@ -74,19 +77,27 @@
 #define ACR_VERSION_STRING \
      ACR_STRINGIFY(ACR_MAJOR_VERSION) "."   \
      ACR_STRINGIFY(ACR_MINOR_VERSION) "."   \
-     ACR_STRINGIFY(ACR_PATCH_VERSION)       \
-     ACR_IS_DEV_STRING
+     ACR_STRINGIFY(ACR_MICRO_VERSION)       \
+     ACR_PATCH_STRING                       \
+     ACR_DEVEL_STRING
 
 /** Internal: string form of the "is dev" flag */
 #if ACR_ISDEV_VERSION
-#define ACR_ISDEV_STRING        "-dev"
+#define ACR_DEVEL_STRING        "-dev"
+#else
+#define ACR_DEVEL_STRING        ""
+#endif
+
+#if ACR_PATCH_VERSION
+#define ACR_PATCH_STRING        "_" ACR_STRINGIFY(ACR_PATCH_VERSION)
 #else
-#define ACR_ISDEV_STRING        ""
+#define ACR_PATCH_STRING        ""
 #endif
 
 /** Macro for Win32 .rc files using numeric csv representation */
 #define ACR_VERSION_STRING_CSV ACR_MAJOR_VERSION ##, \
                              ##ACR_MINOR_VERSION ##, \
+                             ##ACR_MICRO_VERSION ##, \
                              ##ACR_PATCH_VERSION
 
 #endif /* _ACR_VERSION_H */

Modified: commons/sandbox/runtime/trunk/src/main/native/shared/version.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/version.c?rev=1087631&r1=1087630&r2=1087631&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/shared/version.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/shared/version.c Fri Apr  1 09:35:16 2011
@@ -29,6 +29,9 @@ ACR_JNI_EXPORT(jint, Version, get0)(JNI_
             return ACR_MINOR_VERSION;
         break;
         case 2:
+            return ACR_MICRO_VERSION;
+        break;
+        case 3:
             return ACR_PATCH_VERSION;
         break;
         default:



Mime
View raw message