Permalink
Browse files

Take 3 at a continuous integration script

  • Loading branch information...
1 parent d0faa4a commit 2de445d5bb43aca94238047208de2ca365bf0aa5 @joewalnes joewalnes committed Jan 30, 2005
Showing with 43 additions and 34 deletions.
  1. +31 −0 continuous-integration.xml
  2. +0 −30 continuous-integration/build.xml
  3. +12 −4 testsuite/build.xml
View
@@ -0,0 +1,31 @@
+<!-- Ant build for continuous integration server to auto deploy snapshot -->
+<project name="continuous-integration" default="publish">
+
+ <!-- Note: This are temporary paths used by the BeetleJuice server on
+ beaver.codehaus.org. These should switch over to the
+ opensymphony.com server when it's ready. -->
+
+ <!-- http://www.codehaus.org/~joe/sitemesh-SNAPSHOT.zip -->
+ <property name="dist.path" value="/home/users/joe/public_html"/>
+
+ <!-- http://www.codehaus.org/~joe/sitemesh-SNAPSHOT.jar -->
+ <property name="jar.path" value="/home/users/joe/public_html"/>
+
+ <property name="version" value="SNAPSHOT"/>
+
+ <target name="full-test">
+ <!-- clean -->
+ <ant dir="testsuite" target="clean"/>
+ <!-- build, test, jar and dist -->
+ <ant dir="." target="dist"/>
+ <!-- acceptance tests on embedded server -->
+ <ant dir="testsuite" target="test-embedded"/>
+ </target>
+
+ <target name="publish" depends="full-test">
+ <!-- publish -->
+ <copy file="dist/sitemesh-${version}.jar" todir="${jar.path}"/>
+ <copy file="dist/sitemesh-${version}.zip" todir="${dist.path}"/>
+ </target>
+
+</project>
@@ -1,30 +0,0 @@
-<!-- Build tasks for continuous integration server. -->
-
-<project name="sitemesh-ci">
-
- <property name="version" value="SNAPSHOT"/>
-
- <target name="clean">
- <ant dir="../testsuite" target="clean"/>
- <ant dir=".." target="clean"/>
- </target>
-
- <target name="unit-tests">
- <ant dir=".." target="test"/>
- </target>
-
- <target name="acceptance-tests">
- <ant dir="../testsuite" target="test-embedded"/>
- </target>
-
- <target name="snapshot">
- <ant dir=".." target="jar"/>
- </target>
-
- <target name="publish" depends="snapshot">
- <fail unless="publishDir" message="Specify path to publish: ant -DpublishDir=/some/path publish"/>
- <mkdir dir="${publishDir}"/>
- <copy file="../dist/sitemesh-${version}.jar" todir="${publishDir}"/>
- </target>
-
-</project>
View
@@ -80,10 +80,18 @@
<mkdir dir="${test-results}"/>
<junit haltonfailure="no" fork="yes" forkmode="once" dir=".">
<classpath>
- <fileset dir="lib"/>
- <fileset dir="dist"/>
- <fileset dir="../lib"/>
- <fileset dir="../dist"/>
+ <fileset dir="lib">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="dist">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="../lib">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="../dist">
+ <include name="*.jar"/>
+ </fileset>
</classpath>
<formatter type="plain" usefile="false"/>
<formatter type="xml"/>

0 comments on commit 2de445d

Please sign in to comment.