summaryrefslogtreecommitdiff
path: root/src/build
diff options
context:
space:
mode:
authorJosh Suereth <joshua.suereth@gmail.com>2012-03-14 09:12:00 -0400
committerJosh Suereth <joshua.suereth@gmail.com>2012-03-16 12:07:29 -0400
commit08778f747d18a98b6fd80738ad87613be946e142 (patch)
tree1f41c8c321baf6184a81bf0f16cc10c4c3a474f2 /src/build
parent0574a3fa71b62eca54e6bf63c8d2cd19afb4c336 (diff)
downloadscala-08778f747d18a98b6fd80738ad87613be946e142.tar.gz
scala-08778f747d18a98b6fd80738ad87613be946e142.tar.bz2
scala-08778f747d18a98b6fd80738ad87613be946e142.zip
Modified build for new versioning scheme.
Diffstat (limited to 'src/build')
-rw-r--r--src/build/maven/maven-deploy.xml6
-rw-r--r--src/build/pack.xml1
2 files changed, 4 insertions, 3 deletions
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"/>