You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/10/07 20:04:34 UTC
cvs commit: avalon/merlin maven.xml platform.xml project.xml
mcconnell 2003/10/07 11:04:34
Modified: merlin maven.xml platform.xml project.xml
Log:
Gernel update including unit test package.
Revision Changes Path
1.4 +25 -13 avalon/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 3 Oct 2003 14:12:10 -0000 1.3
+++ maven.xml 7 Oct 2003 18:04:34 -0000 1.4
@@ -183,13 +183,13 @@
<goal name="merlin:package">
<!--
+ <j:set var="package.name" value="${maven.final.name}-dist"/>
+ -->
<maven:snapshot project="${pom}"/>
<j:set var="timestamp" value="${snapshotSignature.substring(7,15)}"/>
<j:set var="package.name" value="${maven.final.name}-dist-${timestamp}"/>
- -->
- <j:set var="package.name" value="${maven.final.name}-dist"/>
- <ant:echo>Building distribution: ${package.name}.zip</ant:echo>
+ <ant:echo>Building distribution: ${package.name}</ant:echo>
<ant:zip zipfile="${maven.build.dir}/${package.name}.zip">
<zipfileset dir="${merlin.build.inst.dir}" prefix="merlin"/>
<zipfileset dir="${maven.build.dir}/plugins" prefix="plugins"/>
@@ -197,6 +197,8 @@
<include name="INSTALLATION.TXT"/>
</fileset>
</ant:zip>
+ <checksum file="${maven.build.dir}/${package.name}.zip"/>
+
<ant:tar tarfile="${maven.build.dir}/${package.name}.tar">
<tarfileset dir="${merlin.build.inst.dir}" prefix="merlin"/>
<tarfileset dir="${maven.build.dir}/plugins" prefix="plugins"/>
@@ -208,14 +210,16 @@
zipfile="${maven.build.dir}/${package.name}.tar.gz"
src="${maven.build.dir}/${package.name}.tar"/>
<ant:delete file="${maven.build.dir}/${package.name}.tar"/>
+ <checksum file="${maven.build.dir}/${package.name}.tar.gz"/>
- <!--<j:set var="docs.name" value="${maven.final.name}-docs-${timestamp}"/>-->
- <j:set var="docs.name" value="${maven.final.name}-docs"/>
+ <j:set var="docs.name" value="${maven.final.name}-docs-${timestamp}"/>
+ <!-- <j:set var="docs.name" value="${package.name}-docs"/>-->
- <ant:echo>Building doc kit: ${docs.name}.zip</ant:echo>
+ <ant:echo>Building doc kit: ${docs.name}</ant:echo>
<ant:zip zipfile="${maven.build.dir}/${docs.name}.zip">
<zipfileset dir="${maven.build.dir}/docs" prefix="docs"/>
</ant:zip>
+ <checksum file="${maven.build.dir}/${docs.name}.zip"/>
<ant:tar tarfile="${maven.build.dir}/${docs.name}.tar">
<tarfileset dir="${maven.build.dir}/docs" prefix="docs"/>
</ant:tar>
@@ -223,14 +227,16 @@
zipfile="${maven.build.dir}/${docs.name}.tar.gz"
src="${maven.build.dir}/${docs.name}.tar"/>
<ant:delete file="${maven.build.dir}/${docs.name}.tar"/>
+ <checksum file="${maven.build.dir}/${docs.name}.tar.gz"/>
- <!--<j:set var="tutorial.name" value="${maven.final.name}-tutorial-${timestamp}"/>-->
- <j:set var="tutorial.name" value="${maven.final.name}-tutorial"/>
+ <j:set var="tutorial.name" value="${maven.final.name}-tutorial-${timestamp}"/>
+ <!--<j:set var="tutorial.name" value="${maven.final.name}-tutorial"/>-->
- <ant:echo>Building tutorial kit: ${tutorial.name}.zip</ant:echo>
+ <ant:echo>Building tutorial kit: ${tutorial.name}</ant:echo>
<ant:zip zipfile="${maven.build.dir}/${tutorial.name}.zip">
<zipfileset dir="${basedir}/target/tutorials" prefix="tutorial"/>
</ant:zip>
+ <checksum file="${maven.build.dir}/${tutorial.name}.zip"/>
<ant:tar tarfile="${maven.build.dir}/${tutorial.name}.tar">
<tarfileset dir="${basedir}/target/tutorials" prefix="tutorial"/>
</ant:tar>
@@ -238,6 +244,7 @@
zipfile="${maven.build.dir}/${tutorial.name}.tar.gz"
src="${maven.build.dir}/${tutorial.name}.tar"/>
<ant:delete file="${maven.build.dir}/${tutorial.name}.tar"/>
+ <checksum file="${maven.build.dir}/${tutorial.name}.tar.gz"/>
</goal>
@@ -249,10 +256,12 @@
-->
<goal name="ximport">
<j:forEach var="dep" items="${pom.dependencies}">
- <mkdir dir="${maven.build.dir}/${merlin.build.inst}/system/${dep.artifactDirectory}/${dep.type}s"/>
- <copy
- todir="${maven.build.dir}/${merlin.build.inst}/system/${dep.artifactDirectory}/${dep.type}s/"
- file="${maven.repo.local}/${dep.artifactDirectory}/${dep.type}s/${dep.artifact}"/>
+ <j:if test="${dep.getId() != 'junit:junit'}">
+ <mkdir dir="${maven.build.dir}/${merlin.build.inst}/system/${dep.artifactDirectory}/${dep.type}s"/>
+ <copy
+ todir="${maven.build.dir}/${merlin.build.inst}/system/${dep.artifactDirectory}/${dep.type}s/"
+ file="${maven.repo.local}/${dep.artifactDirectory}/${dep.type}s/${dep.artifact}"/>
+ </j:if>
</j:forEach>
</goal>
@@ -299,6 +308,8 @@
<include name="dependencies/**"/>
<include name="lifecycle/**"/>
<include name="meta/**"/>
+ <include name="profiles/**"/>
+ <include name="selection/**"/>
<exclude name="**/target/**"/>
<exclude name="**/*.log"/>
</fileset>
@@ -332,6 +343,7 @@
<sourcepath path="${basedir}/activation/impl/src/java"/>
<sourcepath path="${basedir}/kernel/spi/src/java"/>
<sourcepath path="${basedir}/kernel/impl/src/java"/>
+ <sourcepath path="${basedir}/kernel/unit/src/java"/>
<classpath>
<path refid="maven.dependency.classpath"/>
</classpath>
1.3 +6 -0 avalon/merlin/platform.xml
Index: platform.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- platform.xml 1 Oct 2003 10:47:44 -0000 1.2
+++ platform.xml 7 Oct 2003 18:04:34 -0000 1.3
@@ -176,6 +176,12 @@
<version>1.0</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ </dependency>
+
<!-- pre JDK 1.4 dependencies -->
<dependency>
1.4 +1 -1 avalon/merlin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 3 Oct 2003 14:12:10 -0000 1.3
+++ project.xml 7 Oct 2003 18:04:34 -0000 1.4
@@ -6,7 +6,7 @@
<groupId>merlin</groupId>
<id>merlin</id>
<name>Merlin POM</name>
- <currentVersion>3.1-SNAPSHOT</currentVersion>
+ <currentVersion>3.1</currentVersion>
<organization>
<name>Apache Software Foundation</name>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org