[Mulgara-svn] r287 - trunk

[pag at mulgara.org]

Author: pag
Date: 2007-06-22 20:02:38 -0500 (Fri, 22 Jun 2007)
New Revision: 287

Modified:
   trunk/common.properties
   trunk/common.xml
   trunk/version
   trunk/version.solaris
   trunk/version.windows
   trunk/version.x86-64
Log:
Added versioning, and moving to version 1.1

Modified: trunk/common.properties
===================================================================
--- trunk/common.properties	2007-06-22 20:27:43 UTC (rev 286)
+++ trunk/common.properties	2007-06-23 01:02:38 UTC (rev 287)
@@ -7,8 +7,7 @@
 # Product properties
 project        =mulgara
 description    =Mulgara Semantic Store
-point-version  =1.0
-mulgara-version =${point-version}.0
+mulgara-version=1.1.0
 year           =2001-2006
 default.build.label=${description} Version ${mulgara-version} (Build @@build@@)
 

Modified: trunk/common.xml
===================================================================
--- trunk/common.xml	2007-06-22 20:27:43 UTC (rev 286)
+++ trunk/common.xml	2007-06-23 01:02:38 UTC (rev 287)
@@ -160,7 +160,7 @@
   <!-- Prepares the build environment                                      -->
   <!-- =================================================================== -->
   <target name="-prepare-build"
-          depends="log4j-conf.xml">
+          depends="log4j-conf.xml, svnversion">
 
     <mkdir dir="${bin.dir}"/>
     <mkdir dir="${dist.dir}"/>
@@ -169,25 +169,12 @@
     <mkdir dir="${obj.dir}"/>
     <mkdir dir="${core.dir}"/>
 
-    <!-- obtain the current version number generated by Anthill -->
+    <property name="full-version" value="${mulgara-version}.${svn-version}"/>
     <script language="javascript">
       <![CDATA[
-      try {
-        // read the first line of the version file
-        var versionFilename = project.getProperty("basedir") + "/version";
-        var bufferedReader = new java.io.BufferedReader(new java.io.FileReader(versionFilename));
-        var version = bufferedReader.readLine();
-        bufferedReader.close();
-
-        // update the Mulgara build labels with the current build number
-        java.lang.System.out.println("Obtained build tag : "+version);
-
-        Mulgara.setProperty("default.build.label",
-          Mulgara.getProperty("default.build.label").replaceAll("@@build@@",version));
-
-      } catch (ex) {
-        java.lang.System.out.println("Unable to read version file for build label "+ ex);
-      }
+      Mulgara.setProperty("default.build.label",
+          Mulgara.getProperty("default.build.label")
+                 .replaceAll("@@build@@", Mulgara.getProperty("full-version")));
       ]]>
     </script>
 
@@ -199,6 +186,22 @@
     <taskdef classpathref="project-classpath" resource="axis-tasks.properties"/>
   </target>
 
+  <target name="get-svnext">
+    <condition property="svnext" value="">
+      <os family="unix"/>
+    </condition>
+    <condition property="svnext" value=".exe">
+      <os family="windows"/>
+    </condition>
+    <property name="svnext" value=""/>
+  </target>
+
+  <target name="svnversion" depends="get-svnext">
+    <exec executable="svnversion${svnext}" outputproperty="svn-version">
+      <arg line="."/>
+    </exec>
+  </target>
+
   <!-- =================================================================== -->
   <!-- Changes Mulgara Config files Database Class depending on Resolvers   -->
   <!-- =================================================================== -->
@@ -433,7 +436,6 @@
     <filter token="baseuri" value="${baseuri}"/>
     <filter token="server" value="rmi://${host.name}/server1"/>
     <filter token="server2" value="rmi://${host.name}/server2"/>
-    <filter token="point-version" value="${point-version}"/>
     <filter token="mulgara.jar" value="${mulgara.jar}"/>
 
     <copy todir="${jxtest.dir}" filtering="yes">
@@ -449,7 +451,6 @@
       <os family="windows"/>
     </condition>
 
-    <ant target="-rename-jxu-files"/>
     <ant target="-fixcrlf"/>
     <ant target="resolver-filesystem-test-data"/>
   </target>
@@ -462,20 +463,6 @@
     </uptodate>
   </target>
 
-  <!-- rename test-1.1.jxu to test.jxu -->
-  <target name="-rename-jxu-files" if="rename-jxu">
-
-    <echo message="Renaming test-${point-version} files to test.jxu"/>
-
-    <move todir="${jxtest.dir}" overwrite="true" verbose="true">
-      <fileset dir="${jxtest.dir}">
-        <include name="**/test-${point-version}.jxu"/>
-      </fileset>
-      <mapper type="glob" from="*test-${point-version}.jxu" to="*test.jxu"/>
-    </move>
-
-  </target>
-
   <!-- Fix CR LF in test data results -->
   <target name="-fixcrlf" if="isWindows">
 

Modified: trunk/version
===================================================================
--- trunk/version	2007-06-22 20:27:43 UTC (rev 286)
+++ trunk/version	2007-06-23 01:02:38 UTC (rev 287)
@@ -1 +0,0 @@
-v1.0.0.206

Modified: trunk/version.solaris
===================================================================
--- trunk/version.solaris	2007-06-22 20:27:43 UTC (rev 286)
+++ trunk/version.solaris	2007-06-23 01:02:38 UTC (rev 287)
@@ -1 +0,0 @@
-v1.0.0.1

Modified: trunk/version.windows
===================================================================
--- trunk/version.windows	2007-06-22 20:27:43 UTC (rev 286)
+++ trunk/version.windows	2007-06-23 01:02:38 UTC (rev 287)
@@ -1 +0,0 @@
-v1.0.0.1

Modified: trunk/version.x86-64
===================================================================
--- trunk/version.x86-64	2007-06-22 20:27:43 UTC (rev 286)
+++ trunk/version.x86-64	2007-06-23 01:02:38 UTC (rev 287)
@@ -1 +0,0 @@
-v1.0.0.1