Permalink
Browse files

fix hudson build, hopefully

  • Loading branch information...
1 parent d7141f1 commit d400f87c59bfebcdb55c6923521b2c6d161285a9 @stuarthalloway stuarthalloway committed Sep 23, 2010
Showing with 16 additions and 13 deletions.
  1. +14 −11 build.xml
  2. +2 −2 release.sh
View
25 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}"/>
View
4 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."
+echo "Build is complete. git push if you are satisfied with the result."

0 comments on commit d400f87

Please sign in to comment.