From a8b5d8a34931816e7f38ab5061c7951b66ef3076 Mon Sep 17 00:00:00 2001
From: Josh Suereth <joshua.suereth@gmail.com>
Date: Wed, 14 Mar 2012 09:12:00 -0400
Subject: Modified build for new versioning scheme.

---
 build.xml                        | 6 ++++++
 src/build/maven/maven-deploy.xml | 6 +++---
 src/build/pack.xml               | 1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index 845a94bfe3..b766e19eb7 100644
--- a/build.xml
+++ b/build.xml
@@ -368,6 +368,7 @@ LOCAL REFERENCE BUILD (LOCKER)
     </scalacfork>
     <propertyfile file="${build-locker.dir}/classes/library/library.properties">
       <entry key="version.number" value="${version.number}"/>
+      <entry key="maven.version.number" value="${maven.version.number}"/>
       <entry key="copyright.string" value="${copyright.string}"/>
     </propertyfile>
     <copy todir="${build-locker.dir}/classes/library">
@@ -407,6 +408,7 @@ LOCAL REFERENCE BUILD (LOCKER)
     </scalacfork>
     <propertyfile file="${build-locker.dir}/classes/compiler/compiler.properties">
       <entry key="version.number" value="${version.number}"/>
+      <entry key="maven.version.number" value="${maven.version.number}"/>
       <entry key="copyright.string" value="${copyright.string}"/>
     </propertyfile>
     <copy todir="${build-locker.dir}/classes/compiler">
@@ -563,6 +565,7 @@ QUICK BUILD (QUICK)
     </scalacfork>
     <propertyfile file="${build-quick.dir}/classes/library/library.properties">
       <entry key="version.number" value="${version.number}"/>
+      <entry key="maven.version.number" value="${maven.version.number}"/>
       <entry key="copyright.string" value="${copyright.string}"/>
     </propertyfile>
     <copy todir="${build-quick.dir}/classes/library">
@@ -622,6 +625,7 @@ QUICK BUILD (QUICK)
     </scalacfork>
     <propertyfile file="${build-quick.dir}/classes/compiler/compiler.properties">
       <entry key="version.number" value="${version.number}"/>
+      <entry key="maven.version.number" value="${maven.version.number}"/>
       <entry key="copyright.string" value="${copyright.string}"/>
     </propertyfile>
     <copy todir="${build-quick.dir}/classes/compiler">
@@ -1096,6 +1100,7 @@ BOOTSTRAPPING BUILD (STRAP)
     </scalacfork>
     <propertyfile file="${build-strap.dir}/classes/library/library.properties">
       <entry key="version.number" value="${version.number}"/>
+      <entry key="maven.version.number" value="${maven.version.number}"/>
       <entry key="copyright.string" value="${copyright.string}"/>
     </propertyfile>
     <copy todir="${build-strap.dir}/classes/library">
@@ -1135,6 +1140,7 @@ BOOTSTRAPPING BUILD (STRAP)
     </scalacfork>
     <propertyfile file="${build-strap.dir}/classes/compiler/compiler.properties">
       <entry key="version.number" value="${version.number}"/>
+      <entry key="maven.version.number" value="${maven.version.number}"/>
       <entry key="copyright.string" value="${copyright.string}"/>
     </propertyfile>
     <copy todir="${build-strap.dir}/classes/compiler">
diff --git a/src/build/maven/maven-deploy.xml b/src/build/maven/maven-deploy.xml
index 2e490163e0..ea9026a766 100644
--- a/src/build/maven/maven-deploy.xml
+++ b/src/build/maven/maven-deploy.xml
@@ -246,7 +246,7 @@
   </target>
 
   <target name="deploy.release.local" depends="deploy.local.init" description="Deploys the bundled files as a release into the local Maven repository">
-    <deploy-local-all version="${version.number}" repository="${local.release.repository}" />
+    <deploy-local-all version="${maven.version.number}" repository="${local.release.repository}" />
   </target>
 
   <!-- Remote Targets -->
@@ -255,7 +255,7 @@
   </target>
 
   <target name="deploy.signed.release" depends="deploy.remote.init" description="Deploys the bundled files as a release into the desired remote Maven repository">
-    <deploy-remote-signed-all version="${version.number}" repository="${remote.release.repository}" />
+    <deploy-remote-signed-all version="${maven.version.number}" repository="${remote.release.repository}" />
   </target>
 
   <target name="deploy.snapshot" depends="deploy.remote.init" description="Deploys the bundled files as a snapshot into the desired remote Maven repository">
@@ -263,6 +263,6 @@
   </target>
 
   <target name="deploy.release" depends="deploy.remote.init" description="Deploys the bundled files as a release into the desired remote Maven repository">
-    <deploy-remote-all version="${version.number}" repository="${remote.release.repository}" />
+    <deploy-remote-all version="${maven.version.number}" repository="${remote.release.repository}" />
   </target>
 </project>
diff --git a/src/build/pack.xml b/src/build/pack.xml
index fe67e3a624..56b1067a32 100644
--- a/src/build/pack.xml
+++ b/src/build/pack.xml
@@ -309,6 +309,7 @@ MAIN DISTRIBUTION SBAZ
     <copy tofile="${dists.dir}/maven/${version.number}/build.xml"
           file="${src.dir}/build/maven/maven-deploy.xml"/>
     <!-- export properties for use when deploying -->
+    <!-- TODO - Fix this setup, now that we have a final maven-version... ->
     <property name="maven.snapshot.version.number"
               value="${version.major}.${version.minor}.${version.patch}-SNAPSHOT"/>
     <echoproperties destfile="${dists.dir}/maven/${version.number}/build.properties"/>
-- 
cgit v1.2.3