You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by jm...@apache.org on 2005/03/16 07:01:17 UTC
svn commit: r157697 - in struts/build/trunk: maven.xml project.xml
Author: jmitchell
Date: Tue Mar 15 22:01:15 2005
New Revision: 157697
URL: http://svn.apache.org/viewcvs?view=rev&rev=157697
Log:
fix shared build so that nightlies are copied correctly
Modified:
struts/build/trunk/maven.xml
struts/build/trunk/project.xml
Modified: struts/build/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/struts/build/trunk/maven.xml?view=diff&r1=157696&r2=157697
==============================================================================
--- struts/build/trunk/maven.xml (original)
+++ struts/build/trunk/maven.xml Tue Mar 15 22:01:15 2005
@@ -6,31 +6,33 @@
xmlns:maven="jelly:maven">
<tstamp>
- <format property="today" pattern="yyyy-MM-dd"/>
+ <format property="today" pattern="yyyyMMdd"/>
</tstamp>
<goal name="nightly">
<attainGoal name="clean-all"/>
<attainGoal name="build-all"/>
+
+ <ant:mkdir dir="nightly/struts-apps/"/>
- <ant:copy todir="${today}">
+ <ant:copy tofile="nightly/struts-apps/struts-blank-${today}.war">
<ant:fileset dir="../apps/blank/target/">
<ant:include name="struts-blank.war"/>
</ant:fileset>
</ant:copy>
-
- <ant:copy todir="${today}">
+
+ <ant:copy tofile="nightly/struts-apps/struts-mailreader-${today}.war">
<ant:fileset dir="../apps/shared/target/">
<ant:include name="struts-mailreader.war"/>
</ant:fileset>
</ant:copy>
-
- <ant:copy todir="${today}">
+
+ <ant:copy tofile="nightly/struts-apps/struts-examples-${today}.war">
<ant:fileset dir="../apps/examples/target/">
<ant:include name="struts-examples.war"/>
</ant:fileset>
</ant:copy>
-
+
</goal>
@@ -67,7 +69,6 @@
</goal>
-
<postGoal name="dist:prepare-bin-filesystem">
<!-- Copy Instructions and Readmes -->
<ant:copy todir="${maven.dist.bin.assembly.dir}">
@@ -81,33 +82,75 @@
</postGoal>
- <postGoal name="dist:prepare-src-filesystem">
- <!-- Copy Instructions and Readmes -->
- <ant:copy todir="${maven.dist.src.assembly.dir}">
- <ant:fileset dir="build">
- <ant:include name="README*"/>
- <ant:include name="LICENSE*"/>
- <ant:include name="STATUS*"/>
- <ant:include name="INSTALL*"/>
- </ant:fileset>
- </ant:copy>
-
- <!-- Copy Maven Control files -->
- <ant:copy todir="${maven.dist.src.assembly.dir}/build">
- <ant:fileset dir="build">
- <ant:include name="project.*"/>
- <ant:include name="*.xml"/>
- <ant:include name="*.jsl"/>
- </ant:fileset>
- </ant:copy>
- </postGoal>
+ <postGoal name="dist:prepare-src-filesystem">
+
+ <!-- Copy Instructions and Readmes -->
+ <ant:copy todir="${maven.dist.src.assembly.dir}">
+ <ant:fileset dir="build">
+ <ant:include name="README*"/>
+ <ant:include name="LICENSE*"/>
+ <ant:include name="STATUS*"/>
+ <ant:include name="INSTALL*"/>
+ </ant:fileset>
+ </ant:copy>
+
+ <!-- Copy Maven Control files -->
+ <ant:copy todir="${maven.dist.src.assembly.dir}/build">
+ <ant:fileset dir="build">
+ <ant:include name="project.*"/>
+ <ant:include name="*.xml"/>
+ <ant:include name="*.jsl"/>
+ </ant:fileset>
+ </ant:copy>
+ </postGoal>
+
+ <goal name="copy-artifacts">
+
+ <maven:reactor
+ basedir="../"
+ includes="*/project.xml"
+ excludes="build/project.xml"
+ goals="copy-distribution"
+ banner="Copy nightly artifacts"
+ ignoreFailures="false"/>
+
+ </goal>
- <goal name="copy-distribution">
+ <goal name="copy-distribution">
+<!--
<ant:copy todir="../build/${today}/${pom.artifactId}-${pom.currentVersion}">
<ant:fileset dir="${maven.build.dir}/distributions">
<ant:include name="*"/>
</ant:fileset>
</ant:copy>
+-->
+
+ <ant:mkdir dir="../build/nightly/${pom.artifactId}/"/>
+
+ <ant:copy tofile="../build/nightly/${pom.artifactId}/${pom.artifactId}-${pom.currentVersion}-${today}.tar.gz">
+ <ant:fileset dir="${maven.build.dir}/distributions">
+ <ant:include name="${pom.artifactId}-${pom.currentVersion}.tar.gz"/>
+ </ant:fileset>
+ </ant:copy>
+
+ <ant:copy tofile="../build/nightly/${pom.artifactId}/${pom.artifactId}-${pom.currentVersion}-${today}.zip">
+ <ant:fileset dir="${maven.build.dir}/distributions">
+ <ant:include name="${pom.artifactId}-${pom.currentVersion}.zip"/>
+ </ant:fileset>
+ </ant:copy>
+
+ <ant:copy tofile="../build/nightly/${pom.artifactId}/${pom.artifactId}-${pom.currentVersion}-${today}-src.tar.gz">
+ <ant:fileset dir="${maven.build.dir}/distributions">
+ <ant:include name="${pom.artifactId}-${pom.currentVersion}-src.tar.gz"/>
+ </ant:fileset>
+ </ant:copy>
+
+ <ant:copy tofile="../build/nightly/${pom.artifactId}/${pom.artifactId}-${pom.currentVersion}-${today}-src.zip">
+ <ant:fileset dir="${maven.build.dir}/distributions">
+ <ant:include name="${pom.artifactId}-${pom.currentVersion}-src.zip"/>
+ </ant:fileset>
+ </ant:copy>
+
</goal>
Modified: struts/build/trunk/project.xml
URL: http://svn.apache.org/viewcvs/struts/build/trunk/project.xml?view=diff&r1=157696&r2=157697
==============================================================================
--- struts/build/trunk/project.xml (original)
+++ struts/build/trunk/project.xml Tue Mar 15 22:01:15 2005
@@ -270,7 +270,6 @@
<url>http://jakarta.apache.org/commons/beanutils/</url>
<properties>
<war.bundle>true</war.bundle>
- <cactus.bundle>true</cactus.bundle>
</properties>
</dependency>
@@ -281,7 +280,6 @@
<url>http://jakarta.apache.org/commons/chain/</url>
<properties>
<war.bundle>true</war.bundle>
- <cactus.bundle>true</cactus.bundle>
</properties>
</dependency>
@@ -292,7 +290,6 @@
<url>http://jakarta.apache.org/commons/digester/</url>
<properties>
<war.bundle>true</war.bundle>
- <cactus.bundle>true</cactus.bundle>
</properties>
</dependency>
@@ -303,7 +300,6 @@
<url>http://jakarta.apache.org/commons/fileupload/</url>
<properties>
<war.bundle>true</war.bundle>
- <cactus.bundle>true</cactus.bundle>
</properties>
</dependency>
@@ -314,7 +310,6 @@
<url>http://jakarta.apache.org/commons/logging/</url>
<properties>
<war.bundle>true</war.bundle>
- <cactus.bundle>true</cactus.bundle>
</properties>
</dependency>
@@ -325,7 +320,6 @@
<url>http://jakarta.apache.org/commons/validator/</url>
<properties>
<war.bundle>true</war.bundle>
- <cactus.bundle>true</cactus.bundle>
</properties>
</dependency>
@@ -336,7 +330,6 @@
<url>http://jakarta.apache.org/oro/</url>
<properties>
<war.bundle>true</war.bundle>
- <cactus.bundle>true</cactus.bundle>
</properties>
</dependency>
@@ -367,16 +360,13 @@
<!-- ################################################################ -->
<build>
- <nagEmailAddress>struts-dev@jakarta.apache.org</nagEmailAddress>
+ <nagEmailAddress>struts-dev@struts.apache.org</nagEmailAddress>
<sourceDirectory>src/java</sourceDirectory>
-
- <!-- Unit test cases -->
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
- <integrationUnitTestSourceDirectory />
- <aspectSourceDirectory />
+
<unitTest>
<includes>
- <include>**/Test*</include>
+ <include>**/Test*.java</include>
</includes>
<resources>
<resource>
@@ -395,8 +385,10 @@
</resource>
</resources>
</unitTest>
+
<!-- J A R R E S O U R C E S -->
<!-- Resources that are packaged up inside the JAR file -->
+<!--
<resources>
<resource>
<directory>${basedir}/src/share</directory>
@@ -405,6 +397,8 @@
</includes>
</resource>
</resources>
+-->
+
</build>
<reports>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org