diff options
| author | Josh Suereth <joshua.suereth@gmail.com> | 2012-03-14 09:12:00 -0400 |
|---|---|---|
| committer | Josh Suereth <joshua.suereth@gmail.com> | 2012-03-16 12:07:29 -0400 |
| commit | 08778f747d18a98b6fd80738ad87613be946e142 (patch) | |
| tree | 1f41c8c321baf6184a81bf0f16cc10c4c3a474f2 | |
| parent | 0574a3fa71b62eca54e6bf63c8d2cd19afb4c336 (diff) | |
| download | scala-08778f747d18a98b6fd80738ad87613be946e142.tar.gz scala-08778f747d18a98b6fd80738ad87613be946e142.tar.bz2 scala-08778f747d18a98b6fd80738ad87613be946e142.zip | |
Modified build for new versioning scheme.
| -rw-r--r-- | build.xml | 6 | ||||
| -rw-r--r-- | src/build/maven/maven-deploy.xml | 6 | ||||
| -rw-r--r-- | src/build/pack.xml | 1 |
3 files changed, 10 insertions, 3 deletions
@@ -401,6 +401,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"> @@ -440,6 +441,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"> @@ -671,6 +673,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"> @@ -730,6 +733,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"> @@ -1212,6 +1216,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"> @@ -1251,6 +1256,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 1b0cf19151..0b3cee563a 100644 --- a/src/build/pack.xml +++ b/src/build/pack.xml @@ -315,6 +315,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"/> |