[db-jdo] 04/09: JDO-279: cleanup dist:build-src pre- and postGoal

[cl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

clr pushed a commit to branch origin/2.0-beta
in repository https://gitbox.apache.org/repos/asf/db-jdo.git

commit 22ff2e586b911c3d6b18a4b1fac44094d99ce220
Author: Michael Bouschen <mb...@apache.org>
AuthorDate: Fri Jan 20 22:11:26 2006 +0000

    JDO-279: cleanup dist:build-src pre- and postGoal
---
 maven.xml         | 13 +++++++++++++
 tck20/maven.xml   | 18 +++++++++++-------
 tck20/project.xml |  2 --
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/maven.xml b/maven.xml
index 7aac772..6837ed2 100644
--- a/maven.xml
+++ b/maven.xml
@@ -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>
diff --git a/tck20/maven.xml b/tck20/maven.xml
index 094a7ba..ee9338b 100644
--- a/tck20/maven.xml
+++ b/tck20/maven.xml
@@ -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>
diff --git a/tck20/project.xml b/tck20/project.xml
index fd8dc08..06dcb0b 100644
--- a/tck20/project.xml
+++ b/tck20/project.xml
@@ -156,8 +156,6 @@ NOTE!! This project has a nonstandard structure. The source files are located in
                     <include>**/*.xml</include>
                 </includes>
             </resource>
-        </resources>
-        <resources>
             <resource>
                 <directory>${basedir}/src/conf</directory>
                 <includes>