Changeset 2923

Timestamp:

Nov 15, 2006, 6:49:38 PM (16 years ago)

Author:

Jari Häkkinen

Message:

Version info in Application,java is now pushed from build.xml using ant.

Location:

branches/2.1

Files:

• build.xml (modified) (3 diffs)
• src/core/net/sf/basedb/core/Application.java (modified) (3 diffs)

branches/2.1/build.xml

@@ -53 +53 @@
   <!-- set global properties for this build -->
   <property name="compilerarg" value="-Xlint:unchecked" />
-  <property name="base.version" value="2.1.1" />
   <property environment="env" />
+
+  <!-- set BASE version
+  Use numerical versions for bugix (maintenance) releases starting
+  with "1". Use "0" for the first release of a new trunk version.  Add
+  "pre" to unreleased versions.  Examples: 2.1.1pre, 2.1.1,
+  2.1.2pre, 2.2.2, 2.2.0pre, 2.2.0, 2.2.1pre, 2.2.1 -->
+  <property name="base.majorversion" value="2" />
+  <property name="base.minorversion" value="1" />
+  <property name="base.maintenanceversion" value="1pre" />
+  <property name="base.version" value="${base.majorversion}.${base.minorversion}.${base.maintenanceversion}" />
   
   <property name="src" location="src" />
@@ -266 +275 @@
     <replace
       file="${core.src}/net/sf/basedb/core/Application.java"
+      token="@MAJOR@"
+      value="${base.majorversion}"
+    />
+    <replace
+      file="${core.src}/net/sf/basedb/core/Application.java"
+      token="@MINOR@"
+      value="${base.minorversion}"
+    />
+    <replace
+      file="${core.src}/net/sf/basedb/core/Application.java"
+      token="@MAINTENANCE@"
+      value="${base.maintenanceversion}"
+    />
+    <replace
+      file="${core.src}/net/sf/basedb/core/Application.java"
       token="@BUILD@"
       value="${base.build}"
@@ -775 +799 @@
       <export srcPath="." destPath="base-${base.version}-src" />
     </svn>
+    <replace
+      file="base-${base.version}-src/src/core/net/sf/basedb/core/Application.java"
+      token="@MAJOR@"
+      value="${base.majorversion}"
+    />
+    <replace
+      file="base-${base.version}-src/src/core/net/sf/basedb/core/Application.java"
+      token="@MINOR@"
+      value="${base.minorversion}"
+    />
+    <replace
+      file="base-${base.version}-src/src/core/net/sf/basedb/core/Application.java"
+      token="@MAINTENANCE@"
+      value="${base.maintenanceversion}"
+    />
     <replace
       file="base-${base.version}-src/src/core/net/sf/basedb/core/Application.java"

branches/2.1/src/core/net/sf/basedb/core/Application.java

@@ -61 +61 @@
 
   /**
-    The major version.
-  */
-  private static final int MAJOR_VERSION = 2;
-  
-  /**
-    The minor version.
-  */
-  private static final int MINOR_VERSION = 1;
-  
-  /**
-    The maintenance version. Use numerical versions for bugix releases
-    starting with "1". Use "0" for the first release of a new trunk version. 
-    Add "beta" to unreleased versions.
-    Examples:
-    2.1.1beta, 2.1.1, 2.1.2beta, 2.2.2, 2.2.0beta, 2.2.0, 2.2.1beta, 2.2.1
-  */
-  private static final String MAINTENANCE_VERSION = "1beta";
+    The major version. Set from 'ant'.
+  */
+  private static final String MAJOR_VERSION = "@MAJOR@";
+  
+  /**
+    The minor version. Set from 'ant'.
+  */
+  private static final String MINOR_VERSION = "@MINOR@";
+  
+  /**
+    The maintenance version. Set from 'ant'.
+  */
+  private static final String MAINTENANCE_VERSION = "@MAINTENANCE@";
   
   /**
@@ -180 +176 @@
     Get the major version of Base.
   */
-  public static int getMajorVersion()
+  public static String getMajorVersion()
   {
     return MAJOR_VERSION;
@@ -188 +184 @@
     Get the minor version of Base.
   */
-  public static int getMinorVersion()
+  public static String getMinorVersion()
   {
     return MINOR_VERSION;