You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mb...@apache.org on 2006/01/20 23:11:36 UTC
svn commit: r370910 - in /db/jdo: branches/2.0-beta/maven.xml
branches/2.0-beta/tck20/maven.xml branches/2.0-beta/tck20/project.xml
trunk/maven.xml trunk/tck20/maven.xml trunk/tck20/project.xml
Author: mbo
Date: Fri Jan 20 14:11:26 2006
New Revision: 370910
URL: http://svn.apache.org/viewcvs?rev=370910&view=rev
Log:
JDO-279: cleanup dist:build-src pre- and postGoal
Modified:
db/jdo/branches/2.0-beta/maven.xml
db/jdo/branches/2.0-beta/tck20/maven.xml
db/jdo/branches/2.0-beta/tck20/project.xml
db/jdo/trunk/maven.xml
db/jdo/trunk/tck20/maven.xml
db/jdo/trunk/tck20/project.xml
Modified: db/jdo/branches/2.0-beta/maven.xml
URL: http://svn.apache.org/viewcvs/db/jdo/branches/2.0-beta/maven.xml?rev=370910&r1=370909&r2=370910&view=diff
==============================================================================
--- db/jdo/branches/2.0-beta/maven.xml (original)
+++ db/jdo/branches/2.0-beta/maven.xml Fri Jan 20 14:11:26 2006
@@ -158,4 +158,17 @@
</j:forEach>
</goal>
+ <preGoal name="dist:build-src">
+ <echo>Copying top-level project.xml, project.properties, and README.txt to ${maven.dist.src.archive.dir}</echo>
+ <copy toDir="${maven.dist.src.archive.dir}">
+ <fileset dir="${basedir}/..">
+ <include name="project.properties"/>
+ <include name="project.xml"/>
+ <include name="README.txt"/>
+ </fileset>
+ </copy>
+ <echo>Creating ${maven.dist.src.archive.dir}/lib/ext</echo>
+ <mkdir dir="${maven.dist.src.archive.dir}/lib/ext"/>
+ </preGoal>
+
</project>
Modified: db/jdo/branches/2.0-beta/tck20/maven.xml
URL: http://svn.apache.org/viewcvs/db/jdo/branches/2.0-beta/tck20/maven.xml?rev=370910&r1=370909&r2=370910&view=diff
==============================================================================
--- db/jdo/branches/2.0-beta/tck20/maven.xml (original)
+++ db/jdo/branches/2.0-beta/tck20/maven.xml Fri Jan 20 14:11:26 2006
@@ -699,27 +699,31 @@
</goal>
<preGoal name="dist:build-src">
+ <echo>Copying RunRules.html to ${maven.dist.src.archive.dir}/${maven.final.name}</echo>
+ <copy toDir="${maven.dist.src.archive.dir}/${maven.final.name}"
+ file="${basedir}/RunRules.html"/>
+ <echo>Copying top-level project.xml, project.properties, and README.txt to ${maven.dist.src.archive.dir}</echo>
<copy toDir="${maven.dist.src.archive.dir}">
<fileset dir="${basedir}/..">
<include name="project.properties"/>
<include name="project.xml"/>
- </fileset>
- <fileset dir="${basedir}">
- <include name="RunRules.html"/>
+ <include name="README.txt"/>
</fileset>
</copy>
+ <echo>Creating ${maven.dist.src.archive.dir}/lib/ext</echo>
<mkdir dir="${maven.dist.src.archive.dir}/lib/ext"/>
</preGoal>
<postGoal name="dist:build-src">
+ <!-- copy zip distribution to file with date in the name -->
<tstamp>
<format property="distdate" pattern="dd_MMM_yyyy" locale="en"/>
</tstamp>
<u:replace var="version" oldChar="." newChar="_" value="${pom.currentVersion}"/>
- <j:set var="distfile" value="jdotck-${version}-src-${distdate}.zip"/>
- <copy file="${maven.build.dir}/distributions/${maven.final.name}-src.zip"
- tofile="${maven.build.dir}/distributions/${distfile}"
- failonerror="false"/>
+ <j:set var="zipfile" value="${maven.dist.dir}/${maven.final.name}-src.zip"/>
+ <j:set var="distfile" value="${maven.dist.dir}/${maven.final.name}-src-${distdate}.zip"/>
+ <echo>Create ${distfile}</echo>
+ <copy file="${zipfile}" tofile="${distfile}" failonerror="false"/>
</postGoal>
</project>
Modified: db/jdo/branches/2.0-beta/tck20/project.xml
URL: http://svn.apache.org/viewcvs/db/jdo/branches/2.0-beta/tck20/project.xml?rev=370910&r1=370909&r2=370910&view=diff
==============================================================================
--- db/jdo/branches/2.0-beta/tck20/project.xml (original)
+++ db/jdo/branches/2.0-beta/tck20/project.xml Fri Jan 20 14:11:26 2006
@@ -156,8 +156,6 @@
<include>**/*.xml</include>
</includes>
</resource>
- </resources>
- <resources>
<resource>
<directory>${basedir}/src/conf</directory>
<includes>
Modified: db/jdo/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/maven.xml?rev=370910&r1=370909&r2=370910&view=diff
==============================================================================
--- db/jdo/trunk/maven.xml (original)
+++ db/jdo/trunk/maven.xml Fri Jan 20 14:11:26 2006
@@ -158,4 +158,17 @@
</j:forEach>
</goal>
+ <preGoal name="dist:build-src">
+ <echo>Copying top-level project.xml, project.properties, and README.txt to ${maven.dist.src.archive.dir}</echo>
+ <copy toDir="${maven.dist.src.archive.dir}">
+ <fileset dir="${basedir}/..">
+ <include name="project.properties"/>
+ <include name="project.xml"/>
+ <include name="README.txt"/>
+ </fileset>
+ </copy>
+ <echo>Creating ${maven.dist.src.archive.dir}/lib/ext</echo>
+ <mkdir dir="${maven.dist.src.archive.dir}/lib/ext"/>
+ </preGoal>
+
</project>
Modified: db/jdo/trunk/tck20/maven.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/maven.xml?rev=370910&r1=370909&r2=370910&view=diff
==============================================================================
--- db/jdo/trunk/tck20/maven.xml (original)
+++ db/jdo/trunk/tck20/maven.xml Fri Jan 20 14:11:26 2006
@@ -699,27 +699,31 @@
</goal>
<preGoal name="dist:build-src">
+ <echo>Copying RunRules.html to ${maven.dist.src.archive.dir}/${maven.final.name}</echo>
+ <copy toDir="${maven.dist.src.archive.dir}/${maven.final.name}"
+ file="${basedir}/RunRules.html"/>
+ <echo>Copying top-level project.xml, project.properties, and README.txt to ${maven.dist.src.archive.dir}</echo>
<copy toDir="${maven.dist.src.archive.dir}">
<fileset dir="${basedir}/..">
<include name="project.properties"/>
<include name="project.xml"/>
- </fileset>
- <fileset dir="${basedir}">
- <include name="RunRules.html"/>
+ <include name="README.txt"/>
</fileset>
</copy>
+ <echo>Creating ${maven.dist.src.archive.dir}/lib/ext</echo>
<mkdir dir="${maven.dist.src.archive.dir}/lib/ext"/>
</preGoal>
<postGoal name="dist:build-src">
+ <!-- copy zip distribution to file with date in the name -->
<tstamp>
<format property="distdate" pattern="dd_MMM_yyyy" locale="en"/>
</tstamp>
<u:replace var="version" oldChar="." newChar="_" value="${pom.currentVersion}"/>
- <j:set var="distfile" value="jdotck-${version}-src-${distdate}.zip"/>
- <copy file="${maven.build.dir}/distributions/${maven.final.name}-src.zip"
- tofile="${maven.build.dir}/distributions/${distfile}"
- failonerror="false"/>
+ <j:set var="zipfile" value="${maven.dist.dir}/${maven.final.name}-src.zip"/>
+ <j:set var="distfile" value="${maven.dist.dir}/${maven.final.name}-src-${distdate}.zip"/>
+ <echo>Create ${distfile}</echo>
+ <copy file="${zipfile}" tofile="${distfile}" failonerror="false"/>
</postGoal>
</project>
Modified: db/jdo/trunk/tck20/project.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/project.xml?rev=370910&r1=370909&r2=370910&view=diff
==============================================================================
--- db/jdo/trunk/tck20/project.xml (original)
+++ db/jdo/trunk/tck20/project.xml Fri Jan 20 14:11:26 2006
@@ -156,8 +156,6 @@
<include>**/*.xml</include>
</includes>
</resource>
- </resources>
- <resources>
<resource>
<directory>${basedir}/src/conf</directory>
<includes>