You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2002/02/23 08:18:03 UTC
cvs commit: jakarta-turbine-maven/src/templates/build build.init.target build.properties.loading build-docs.xml build-test.xml build.xml
jvanzyl 02/02/22 23:18:02
Modified: src/templates/build build-docs.xml build-test.xml build.xml
Added: src/templates/build build.init.target
build.properties.loading
Log:
- break out the common elements of the build files and use an #include
directive to pull them in.
Revision Changes Path
1.4 +1 -6 jakarta-turbine-maven/src/templates/build/build-docs.xml
Index: build-docs.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build-docs.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build-docs.xml 22 Feb 2002 14:05:51 -0000 1.3
+++ build-docs.xml 23 Feb 2002 07:18:02 -0000 1.4
@@ -2,12 +2,7 @@
<project name="$project.id" default="docs" basedir=".">
- <!-- Allow any user specific values to override the defaults -->
- <property file="${user.home}/build.properties" />
- <!-- Allow user defaults for this project -->
- <property file="build.properties" />
- <!-- Set default values for the build -->
- <property file="default.properties" />
+#include("build.properties.loading")
<!-- Construct compile classpath -->
<path id="classpath">
1.4 +2 -28 jakarta-turbine-maven/src/templates/build/build-test.xml
Index: build-test.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build-test.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build-test.xml 22 Feb 2002 14:05:51 -0000 1.3
+++ build-test.xml 23 Feb 2002 07:18:02 -0000 1.4
@@ -2,35 +2,9 @@
<project name="$project.id" default="test" basedir=".">
- <!-- Allow any user specific values to override the defaults -->
- <property file="${user.home}/build.properties" />
- <!-- Allow user defaults for this project -->
- <property file="build.properties" />
- <!-- Set default values for the build -->
- <property file="default.properties" />
- <property file="testing.properties"/>
-
- <target
- name="init">
+#include("build.properties.loading")
- <taskdef
- name="project-properties"
- classname="org.apache.maven.build.ProjectProperties">
- </taskdef>
-
- <!-- This task will create the 'classpath' and 'src.set'
- references required to build -->
-
- <project-properties projectDescriptor="project.xml"/>
-
- <!--
- <create-path rid="classpath" descriptor="${deps}" basedir="${lib.repo}"/>
- <create-path rid="test.src.set" descriptor="${test.src.set}"/>
- <create-patternset rid="runtime.test.set" descriptor="${runtime.test.set}"/>
- <create-patternset rid="unit.test.set" descriptor="${unit.test.set}"/>
- <create-patternset rid="rt.test.set" descriptor="${rt.test.set}"/>
- -->
- </target>
+#include("build.init.target")
<!-- ================================================================== -->
<!-- C O M P I L E T E S T S -->
1.10 +2 -41 jakarta-turbine-maven/src/templates/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 23 Feb 2002 04:01:49 -0000 1.9
+++ build.xml 23 Feb 2002 07:18:02 -0000 1.10
@@ -4,48 +4,9 @@
<project name="$project.id" default="jar" basedir=".">
- <!-- Give user a chance to override without editing this file
- (and without typing -D each time they invoke a target) -->
+#include("build.properties.loading")
- <!-- Allow any user specific values to override the defaults -->
- <property file="${user.home}/build.properties" />
- <!-- Allow user defaults for this project -->
- <property file="build.properties" />
- <!-- Set default values for the build -->
- <property file="default.properties" />
-
- <path id="maven-classpath">
- <pathelement location="${lib.repo}/maven.jar"/>
- </path>
-
- <!-- ================================================================== -->
- <!-- I N I T I A L I Z E -->
- <!-- ================================================================== -->
- <!-- This deals with loading our path creation task that is used to: -->
- <!-- -->
- <!-- a) Construct a classpath from a descriptor file which allows us -->
- <!-- to store our dependencies externally and makes a build -->
- <!-- file reusable. -->
- <!-- -->
- <!-- b) Construct pattern sets that can be used for various task like -->
- <!-- copying a set of resources into a JAR for deployment. -->
- <!-- ================================================================== -->
-
- <target
- name="init">
-
- <taskdef
- name="project-properties"
- classname="org.apache.maven.build.ProjectProperties">
- <classpath refid="maven-classpath"/>
- </taskdef>
-
- <!-- This task will create the 'classpath' and 'src.set'
- references required to build -->
-
- <project-properties projectDescriptor="project.xml"/>
-
- </target>
+#include("build.init.target")
<!-- ================================================================== -->
<!-- E N V I R O N M E N T -->
1.1 jakarta-turbine-maven/src/templates/build/build.init.target
Index: build.init.target
===================================================================
<path id="maven-classpath">
<pathelement location="${lib.repo}/maven.jar"/>
</path>
<!-- ================================================================== -->
<!-- I N I T I A L I Z E -->
<!-- ================================================================== -->
<!-- This deals with loading our path creation task that is used to: -->
<!-- -->
<!-- a) Construct a classpath from a descriptor file which allows us -->
<!-- to store our dependencies externally and makes a build -->
<!-- file reusable. -->
<!-- -->
<!-- b) Construct pattern sets that can be used for various task like -->
<!-- copying a set of resources into a JAR for deployment. -->
<!-- ================================================================== -->
<target
name="init">
<taskdef
name="project-properties"
classname="org.apache.maven.build.ProjectProperties">
<classpath refid="maven-classpath"/>
</taskdef>
<!-- This task will create the 'classpath' and 'src.set'
references required to build -->
<project-properties projectDescriptor="project.xml"/>
</target>
1.1 jakarta-turbine-maven/src/templates/build/build.properties.loading
Index: build.properties.loading
===================================================================
<!-- Give user a chance to override without editing this file
(and without typing -D each time they invoke a target) -->
<!-- Allow any user specific values to override the defaults -->
<property file="${user.home}/build.properties" />
<!-- Allow user defaults for this project -->
<property file="build.properties" />
<!-- Set default values for the build -->
<property file="default.properties" />
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>