glennm 02/05/18 22:40:39
Modified: . build-bootstrap.xml project.properties
src/templates/build Control.vm
src/templates/build/plugins/core default.properties
xdocs/ref properties.xml
Log:
Glenn McAllister - 2002/05/19
Changed the bootstrap process to generate all files into the bootstrap
directory. The new bootstrap dir layout looks like:
./bootstrap/bootstrap.report
./bootstrap/classes/**/*.class
./bootstrap/maven/**
The LICENSE.txt and README.txt files now get correctly copied into
${maven.home}, rather than dropped into the jakarta-turbine-maven directory.
The only generated file left in the top-level maven directory is the
velocity.log* file(s).
Added the maven.compile.debug, maven.compile.deprecation, and
maven.compile.optimize properties to default.properties; added the
documentation for these properties.
Cleaned up project.properties by removing properties that were already
correctly defined in default.properties.
Revision Changes Path
1.86 +23 -22 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- build-bootstrap.xml 17 May 2002 21:08:16 -0000 1.85
+++ build-bootstrap.xml 19 May 2002 05:40:39 -0000 1.86
@@ -6,7 +6,17 @@
<property file="${user.home}/build.properties" />
<property file="project.properties"/>
- <property name="maven.get.jars.baseUrl"
value="http://jakarta.apache.org/turbine/jars"; />
+
+ <property name="maven.get.jars.baseUrl"
+ value="http://jakarta.apache.org/turbine/jars"; />
+ <property name="maven.bootstrap.dir"
+ value="${basedir}/bootstrap" />
+ <property name="maven.bootstrap.classes"
+ value="${maven.bootstrap.dir}/classes" />
+
+ <path id="pre-bootstrap-classpath">
+ <pathelement location="${maven.bootstrap.classes}"/>
+ </path>
<!-- ================================================================== -->
<!-- P R O P E R T I E S C H E C K -->
@@ -90,21 +100,21 @@
name="generate-build"
depends="update-jars,phase2-compile">
- <delete dir="${basedir}/maven"/>
- <mkdir dir="${basedir}/maven"/>
+ <delete dir="${maven.bootstrap.dir}/maven"/>
+ <mkdir dir="${maven.bootstrap.dir}/maven"/>
<taskdef
name="create-build-system"
classname="org.apache.maven.BaseProjectTask">
<classpath>
<path refid="bootstrap-classpath"/>
- <pathelement location="${basedir}/bootstrap"/>
+ <pathelement location="${maven.bootstrap.classes}"/>
</classpath>
</taskdef>
<create-build-system
controlTemplate="Control.vm"
- outputDirectory="${basedir}"
+ outputDirectory="${maven.bootstrap.dir}"
templatePath="src/templates/build"
outputFile="bootstrap.report"
projectDescriptor="project.xml"
@@ -120,10 +130,6 @@
<!-- available until maven is built. -->
<!-- ================================================================== -->
- <path id="pre-bootstrap-classpath">
- <pathelement location="${basedir}/bootstrap"/>
- </path>
-
<target
name="update-jars"
depends="phase1-compile,make-lib-repo-dir">
@@ -166,11 +172,11 @@
<target
name="phase1-compile">
- <delete dir="${basedir}/bootstrap"/>
- <mkdir dir="${basedir}/bootstrap"/>
+ <delete dir="${maven.bootstrap.dir}"/>
+ <mkdir dir="${maven.bootstrap.classes}"/>
<javac
- destdir="${basedir}/bootstrap"
+ destdir="${maven.bootstrap.classes}"
debug="on"
deprecation="off"
optimize="off">
@@ -197,7 +203,7 @@
name="create-classpath"
classname="org.apache.maven.ant.CreateClasspath">
<classpath>
- <pathelement location="${basedir}/bootstrap"/>
+ <pathelement location="${maven.bootstrap.classes}"/>
</classpath>
</taskdef>
@@ -208,7 +214,7 @@
/>
<javac
- destdir="${basedir}/bootstrap"
+ destdir="${maven.bootstrap.classes}"
debug="on"
deprecation="off"
optimize="off">
@@ -235,7 +241,7 @@
<jar
jarfile="${lib.repo}/maven.jar"
- basedir="${basedir}/bootstrap"
+ basedir="${maven.bootstrap.classes}"
excludes="**/package.html"
/>
@@ -250,16 +256,11 @@
name="install"
depends="generate-build,make-maven-home-dir">
- <copy
- tofile="maven/project.xsd"
- file="src/dtd/project.xsd"
- />
-
<copy todir="${maven.home}">
- <fileset dir="maven"/>
+ <fileset dir="${maven.bootstrap.dir}/maven"/>
</copy>
- <delete dir="maven" />
+ <copy todir="${maven.home}" file="src/dtd/project.xsd" />
<copy todir="${maven.home}/stylesheets">
<fileset dir="src/dvsl/xdocs"/>
1.11 +1 -9 jakarta-turbine-maven/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.properties 17 May 2002 05:20:05 -0000 1.10
+++ project.properties 19 May 2002 05:40:39 -0000 1.11
@@ -4,16 +4,8 @@
maven.home = ${user.home}/maven
-maven.compile.debug = on
-maven.compile.optimize = off
-maven.compile.deprecation = off
-
-maven.src.dir = src
maven.final.name = maven
-# note we currently have our conf inside of src - ?
-maven.conf.dir = ${maven.src.dir}/conf
-maven.jarResources.basedir=${maven.conf.dir}
-
+maven.jarResources.basedir = src/conf
maven.parserJJTreeGrammar =
${src.dir}/java/org/apache/maven/java/parser/JavaParser.jjt
maven.outputDirectory = ${src.dir}/java/org/apache/maven/java/parser
1.23 +5 -5 jakarta-turbine-maven/src/templates/build/Control.vm
Index: Control.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/Control.vm,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Control.vm 15 May 2002 21:38:24 -0000 1.22
+++ Control.vm 19 May 2002 05:40:39 -0000 1.23
@@ -47,7 +47,7 @@
#set ($outputDir = "maven")
#set ($mavenDirectory = "${maven.home}")
-$files.mkdir($outputDir)
+$files.mkdir("bootstrap/$outputDir")
## -------------------------------------------------------
## Call plug-ins
@@ -57,7 +57,7 @@
#foreach ($plugin in $plugins)
#if ($plugin != "CVS")
- $files.mkdir("$outputDir/plugins/$plugin")
+ $files.mkdir("bootstrap/$outputDir/plugins/$plugin")
#parse("plugins/$plugin/Control.vm")
#end
#end
@@ -86,7 +86,7 @@
## delegators so users can use this as a starting point.
## -------------------------------------------------------
-$files.mkdir("$outputDir/examples")
+$files.mkdir("bootstrap/$outputDir/examples")
$generator.parse("build.xml","$outputDir/examples/build.xml")
## -------------------------------------------------------
@@ -106,5 +106,5 @@
$generator.parse("cvsignore",".cvsignore")
#end
-$generator.parse("LICENSE.txt","LICENSE.txt")
-$generator.parse("README.txt","README.txt")
+$generator.parse("LICENSE.txt","$outputDir/LICENSE.txt")
+$generator.parse("README.txt","$outputDir/README.txt")
1.3 +20 -17
jakarta-turbine-maven/src/templates/build/plugins/core/default.properties
Index: default.properties
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/core/default.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- default.properties 17 May 2002 21:08:17 -0000 1.2
+++ default.properties 19 May 2002 05:40:39 -0000 1.3
@@ -5,7 +5,6 @@
# keep them apart from the project specific properties.
# -------------------------------------------------------------------
-
maven.src.dir = ${basedir}/src
maven.conf.dir = ${basedir}/conf
maven.build.dir = ${basedir}/target
@@ -13,6 +12,10 @@
maven.build.dest = ${maven.build.dir}/classes
maven.compile.aspects = false
+maven.compile.debug = on
+maven.compile.optimize = off
+maven.compile.deprecation = off
+
maven.jar.aspectjrt = ${ant.home}/lib/aspectjrt.jar
maven.jar.aspectjtools = ${ant.home}/lib/aspectjtools.jar
maven.jar.excludes = **/package.html
@@ -26,11 +29,11 @@
maven.repo.local = ${lib.repo}
maven.jarResources.basedir=${basedir}
-##
+#
# Properties that are used for the integration unit tests
# Defined here so they can easily be overridden by project
# specific properties if necessary.
-##
+#
maven.iutest.dir = ${maven.integrationUnitTestSourceDirectory}
maven.out.test.dir = ${maven.build.dir}/iutest
maven.webapp.dir = ${maven.iutest.dir}/testapp
@@ -39,25 +42,25 @@
maven.test.port = 8192
maven.iutest.dest = ${maven.build.dir}/iutest-classes
-##
+#
# properties for unit testing
-##
+#
maven.junit.fork = no
maven.junit.dir = ${basedir}
maven.junit.usefile = true
maven.test.dest = ${maven.build.dir}/test-classes
maven.test.reportsDirectory = ${maven.build.dir}/test-reports
-##
+#
# These names will actually be based on the versioning document
# that morgan checked into jakarta-site2 the other day.
-##
+#
maven.final.name = ${maven.id}-${maven.currentVersion}
maven.final.dir = ${basedir}/${maven.final.name}
-##
+#
# Properties for the javadoc generation
-##
+#
maven.javadoc.destdir = ${maven.docs.dest}/apidocs
maven.javadoc.windowtitle = ${maven.name} ${maven.currentVersion} API
maven.javadoc.doctitle = ${maven.name} ${maven.currentVersion} API
@@ -66,15 +69,15 @@
maven.javadoc.version = true
maven.javadoc.use = true
-##
+#
# properties for jxr cross-referencing
-##
+#
maven.jxr.destdir = ${maven.docs.dest}/xref
-##
+#
# Checkstyle settings ... default maven settings, these can be
# overridden in a project specific properties file.
-##
+#
maven.checkstyle.includes = **/*.java
maven.checkstyle.excludes =
maven.checkstyle.lcurly.type = nl
@@ -115,9 +118,9 @@
maven.checkstyle.fail.on.violation = false
maven.checkstyle.cache.file = ${maven.build.dir}/checkstyle-cachefile
-##
+#
# UI Color Prefs
-##
+#
maven.ui.body.background = #fff
maven.ui.body.foreground = #000
maven.ui.section.background = #036
@@ -155,9 +158,9 @@
maven.ui.href.link.active = #f30
maven.ui.href.link.selfref = #555
-##
+#
# properties for changelog
-##
+#
maven.changelog.range = 5
maven.activitylog.range = 30
maven.changelog.generator = org.apache.maven.cvslib.CvsChangeLogGenerator
1.17 +59 -30 jakarta-turbine-maven/xdocs/ref/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/xdocs/ref/properties.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- properties.xml 15 May 2002 19:17:45 -0000 1.16
+++ properties.xml 19 May 2002 05:40:39 -0000 1.17
@@ -266,31 +266,44 @@
<table>
<tr><th>Property</th><th>Optional?</th><th>Description</th></tr>
<tr>
- <td>maven.prepareSourceDirectory</td>
+ <td>maven.compile.aspects</td>
<td>Yes</td>
<td>
- If this property is set, it specifies that the sources must
- be prepared or pre-processed before being compiled. The
- value of this property is the directory that Maven can find
- the prepared sources when it begins compilation. It is the
- responsibility of the user to populate this directory with
- the prepared source tree.
+ Specifies that Aspects are included during compilation.
+ Used by the <a href="build-file.html#maven:compile">maven:compile</a>
+ target. The default value is <code>false</code>. Please
+ refer to the <a href="http://www.aspectj.org/";>AspectJ</a>
+ web site for more information on Aspect-Oriented
+ Programming.
</td>
</tr>
<tr>
- <td>maven.prepareSourceTarget</td>
+ <td>maven.compile.debug</td>
<td>Yes</td>
<td>
- This property is used to specify an Ant target in the
- <code>maven.delegatorBuildFile</code> that will prepare the
- sources for compilation and place the resulting source tree
- in <code>maven.prepareSourceDirectory</code>. This target
- is invoked by Maven prior to compilation. It is assumed
- that the target called takes care of knowing when and when
- not to regenerate, if you don't add any logic the source
- preparation will happen repeatedly because of the
- dependencies among the maven targets (which is currently a
- result of ant deficiencies is passing around references).
+ Specifies wether to include debugging information in the compiled
+ class files; the default value is <code>on</code>.
+ Used by the <a href="build-file.html#maven:compile">
+ maven:compile</a> target.
+ </td>
+ </tr>
+ <tr>
+ <td>maven.compile.deprecation</td>
+ <td>Yes</td>
+ <td>
+ Specifies wether source should be compiled with deprecation
+ information; the default value is <code>off</code>.
+ Used by the <a href="build-file.html#maven:compile">
+ maven:compile</a> target.
+ </td>
+ </tr>
+ <tr>
+ <td>maven.compile.optimize</td>
+ <td>Yes</td>
+ <td>
+ Specifies whether source should be compiled with optimization; the
+ default value is <code>off</code>. Used by the <a
+ href="build-file.html#maven:compile">maven:compile</a> target.
</td>
</tr>
<tr>
@@ -306,18 +319,6 @@
</td>
</tr>
<tr>
- <td>maven.compile.aspects</td>
- <td>Yes</td>
- <td>
- Specifies that Aspects are included during compilation.
- Used by the <a href="build-file.html#maven:compile">maven:compile</a>
- target. The default value is <code>false</code>. Please
- refer to the <a href="http://www.aspectj.org/";>AspectJ</a>
- web site for more information on Aspect-Oriented
- Programming.
- </td>
- </tr>
- <tr>
<td>maven.jar.aspectjrt</td>
<td>Yes</td>
<td>
@@ -333,6 +334,34 @@
Specifies the default location of the <a
href="http://www.aspectj.org/";>AspectJ</a> tools JAR.
The default value is <code>${ant.home}/lib</code>.
+ </td>
+ </tr>
+ <tr>
+ <td>maven.prepareSourceDirectory</td>
+ <td>Yes</td>
+ <td>
+ If this property is set, it specifies that the sources must
+ be prepared or pre-processed before being compiled. The
+ value of this property is the directory that Maven can find
+ the prepared sources when it begins compilation. It is the
+ responsibility of the user to populate this directory with
+ the prepared source tree.
+ </td>
+ </tr>
+ <tr>
+ <td>maven.prepareSourceTarget</td>
+ <td>Yes</td>
+ <td>
+ This property is used to specify an Ant target in the
+ <code>maven.delegatorBuildFile</code> that will prepare the
+ sources for compilation and place the resulting source tree
+ in <code>maven.prepareSourceDirectory</code>. This target
+ is invoked by Maven prior to compilation. It is assumed
+ that the target called takes care of knowing when and when
+ not to regenerate, if you don't add any logic the source
+ preparation will happen repeatedly because of the
+ dependencies among the maven targets (which is currently a
+ result of ant deficiencies is passing around references).
</td>
</tr>
</table>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
