bloritsch 2003/08/11 10:39:38
Modified: configuration maven.xml project.properties project.xml
Log:
update build system
Revision Changes Path
1.3 +0 -46 avalon-excalibur/configuration/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/configuration/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 11 Aug 2003 17:17:25 -0000 1.2
+++ maven.xml 11 Aug 2003 17:39:38 -0000 1.3
@@ -28,50 +28,4 @@
<j:import file="${avalon.buildsystem}/maven-common.xml" inherit="true"/>
- <!-- copy additional test resources -->
- <postGoal name="test:prepare-filesystem">
- <echo>
- copy additional unit test resources
- from ${pom.build.unitTestSourceDirectory}
- to ${maven.test.dest}
- </echo>
- <copy todir="${maven.build.dir}/test-classes">
- <fileset dir="${pom.build.unitTestSourceDirectory}">
- <exclude name="**/*.java"/>
- <exclude name="**/package.html"/>
- </fileset>
- </copy>
- </postGoal>
-
- <postGoal name="java:jar">
- <!-- build big jar -->
- <ant:mkdir dir="${maven.build.dir}/libs"/>
- <deploy:copy-deps
- todir="${maven.build.dir}/libs"
-
excludes="junit,avalon-fortress-tools,ant,qdox,xalan,concurrent,commons-collections"/>
-
- <ant:jar
destfile="${maven.build.dir}/${pom.artifactId}-complete-${pom.currentVersion}.jar"
duplicate="preserve">
- <ant:manifest>
- <ant:attribute name="Extension-Name"
value="${pom.aritfactId}-complete"/>
- <ant:attribute name="Specification-Vendor" value="Apache Software
Foundation"/>
- <ant:attribute name="Specification-Version"
value="${pom.currentVersion}"/>
- <ant:attribute name="Implementation-Vendor" value="Apache Software
Foundation"/>
- <ant:attribute name="Implementation-Version"
value="${pom.currentVersion}"/>
- </ant:manifest>
-
- <ant:zipfileset src="${maven.build.dir}/${maven.final.name}.jar"/>
- <ant:zipgroupfileset dir="${maven.build.dir}/libs" includes="*.zip"/>
- </ant:jar>
- </postGoal>
-
- <postGoal name="avalon:deploy-upload">
- <!-- upload big jar -->
- <ant:exec dir="." executable="${maven.scp.executable}">
- <ant:arg line="${scpopts}
target/${pom.artifactId}-complete-${pom.currentVersion}.jar
${repo}/${pom.groupId}/jars/"/>
- </ant:exec>
- </postGoal>
-
- <postGoal name="clean">
- <ant:delete dir="${maven.src.dir}/java"/>
- </postGoal>
</project>
1.3 +7 -1 avalon-excalibur/configuration/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon-excalibur/configuration/project.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.properties 7 Jul 2003 16:50:40 -0000 1.2
+++ project.properties 11 Aug 2003 17:39:38 -0000 1.3
@@ -3,4 +3,10 @@
# P R O J E C T P R O P E R T I E S
# -------------------------------------------------------------------
maven.repo.remote =
http://lsd.student.utwente.nl/repository,http://www.apache.org/dist/avalon,http://www.ibiblio.org/maven
-
+
+maven.junit.fork = yes
+# location of the build system
+avalon.buildsystem = ${basedir}/../../avalon/buildsystem
+
+# gump integration
+project.name=excalibur-configuration
1.2 +1 -1 avalon-excalibur/configuration/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/configuration/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 7 Jun 2003 16:43:52 -0000 1.1
+++ project.xml 11 Aug 2003 17:39:38 -0000 1.2
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
- <extend>${basedir}/../project-common.xml</extend>
+ <extend>${avalon.buildsystem}/project-common.xml</extend>
<name>Configuration</name>
<id>excalibur-configuration</id>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
