Changeset 2960

Timestamp:

Nov 27, 2006, 1:40:06 PM (16 years ago)

Author:

Nicklas Nordborg

Message:

References #412: Fix build.xml to make it more developer-friendly

Get version information from the file (base.version) generated at build time.

Location:

trunk/src/core

Files:

• base.version (added)
• net/sf/basedb/core/Application.java (modified) (5 diffs)
• net/sf/basedb/core/Version.java (added)

trunk/src/core/net/sf/basedb/core/Application.java

@@ -63 +63 @@
 
   /**
-    The major version.
-  */
-  private static final int MAJOR_VERSION = 2;
-  
-  /**
-    The minor version.
-  */
-  private static final int MINOR_VERSION = 1;
-  
-  /**
-    The build number.
-    @base.internal
-    The <code>${base.build}</code> string will be replaced with the
-    current subversion revision by the <code>ant dist</code> command.
-    See <code>svn.revision</code>, <code>dist.init</code> and
-    <code>dist</code> targets in the build file.
-
-  */
-  private static final int BUILD = parseBuildNumber("${base.build}");
-  
-  /**
     If BASE is running or not.
   */
@@ -171 +150 @@
   
   /**
-    Get the major version of Base.
-  */
-  public static int getMajorVersion()
-  {
-    return MAJOR_VERSION;
-  }
-  
-  /**
-    Get the minor version of Base.
-  */
-  public static int getMinorVersion()
-  {
-    return MINOR_VERSION;
-  }
-  
+    Get the major version.
+  */
+  public static String getMajorVersion()
+  {
+    return Version.getMajor();
+  }
+  
+  /**
+    Get the minor version.
+  */
+  public static String getMinorVersion()
+  {
+    return Version.getMinor();
+  }
+  /**
+    Get the maintentance version.
+  */
+  public static String getMaintenanceVersion()
+  {
+    return Version.getMaintenance();
+  }
+  
+  /**
+    Get the build number.
+  */
+  public static int getBuild()
+  {
+    return Version.getBuild();
+  }
+
   /**
     Get the BASE version string
@@ -191 +185 @@
   public static String getVersionString()
   {
-    return ("BASE " + getMajorVersion() + "." + getMinorVersion() +
-            " (build #" + getBuild() + ")");
-  }
-  
-  /**
-    Get the build number.
-  */
-  public static int getBuild()
-  {
-    return BUILD;
+    return "BASE " + getMajorVersion() + "." + getMinorVersion() +
+      "." + getMaintenanceVersion() + " (build #" + getBuild() +
+      "; schema #" + Application.getSchemaVersion()+")";
   }
   
@@ -321 +308 @@
     {
       // Read settings from the configuration file
+      Version.init();
+      log.info("Version: " + Version.getVersion());
+      
       Config.init();
       authenticationDriver = Config.getString("auth.driver");
@@ -847 +837 @@
   }
   
-  
-  /**
-    Find the first digits in a string and return those as the build number.
-  */
-  private static int parseBuildNumber(String buildNumber)
-  {
-    int build = 0;
-    Pattern p = Pattern.compile("(\\d+)");
-    Matcher m = p.matcher(buildNumber);
-    if (m.find())
-    {
-      build = Integer.parseInt(m.group());
-    }
-    return build;
-  }
-  
-  
   private static class SessionControlCacheCleaner
     extends TimerTask