summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Halloway <stu@thinkrelevance.com>2010-09-23 11:26:22 -0400
committerStuart Halloway <stu@thinkrelevance.com>2010-09-23 11:26:22 -0400
commit68837c0ebf957663487bc9d604f7ec557d320ac0 (patch)
treef1cce9ec822b0b9715daf86b021e45cf68a502fe
parent2b133f8198741589cd0792f5b4865694dd9ca8e1 (diff)
fix hudson build, hopefully
-rw-r--r--build.xml25
-rwxr-xr-xrelease.sh4
2 files changed, 16 insertions, 13 deletions
diff --git a/build.xml b/build.xml
index 7193ae07..f58d8da5 100644
--- a/build.xml
+++ b/build.xml
@@ -213,7 +213,20 @@
<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant"/>
</target>
- <target name="deploy" depends="ci-build,dist" description="Build and deploy to remote stable repository.">
+ <target name="nightly-build" depends="ci-build"
+ description="Build and deploy to nightly (snapshot) repository.">
+ <sequential>
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant"/>
+ <mvn:deploy file="${clojure_jar}">
+ <pom file="pom.xml"/>
+ <attach file="${src_jar}" classifier="sources"/>
+ <attach file="${slim_jar}" classifier="slim"/>
+ <remoteRepository url="file:@{snapshot.repo.dir}"/>
+ </mvn:deploy>
+ </sequential>
+ </target>
+
+ <target name="release" depends="ci-build,dist" description="Build and deploy to remote stable repository.">
<sequential>
<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant"/>
<mvn:install-provider artifactId="wagon-ssh" version="1.0-beta-2"/>
@@ -238,16 +251,6 @@
</mvn:install>
</target>
- <target name="nightly-build" depends="ci-build"
- description="Build and deploy to nightly (snapshot) repository.">
- <deploy target-dir="${snapshot.repo.dir}"/>
- </target>
-
-
- <target name="stable-build" depends="ci-build" description="Build and deploy to stable repository.">
- <deploy target-dir="${stable.repo.dir}"/>
- </target>
-
<target name="dist" depends="clean,clojure-jar"
description="Build distribution ZIP file">
<property name="distdir" value="${dist}/clojure-${clojure.version.label}"/>
diff --git a/release.sh b/release.sh
index bb0bc6fb..1ff8b9cd 100755
--- a/release.sh
+++ b/release.sh
@@ -32,6 +32,6 @@ git tag -a -m "$VERSION" $VERSION
if [ -z $CLOJURE_DEPLOY_URL ]; then
CLOJURE_DEPLOY_URL=scp://build.clojure.org/srv/www/releases
fi
-ant deploy -Ddeployment.url=$CLOJURE_DEPLOY_URL
+ant release -Ddeployment.url=$CLOJURE_DEPLOY_URL
-echo "Build is complete. git push if you are satisfied with the result." \ No newline at end of file
+echo "Build is complete. git push if you are satisfied with the result."