jvanzyl 02/02/24 11:53:00
Modified: . build-bootstrap.xml
src/java/org/apache/maven ChangeLog.java
src/templates/build build-docs.xml
Log:
- the bootstrap graduates to producing the real build system, i guess we
don't have to check the build file into CVS. i'm open to discussion but
i don't see any need to check the build system in.
Revision Changes Path
1.12 +13 -28 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build-bootstrap.xml 24 Feb 2002 19:35:31 -0000 1.11
+++ build-bootstrap.xml 24 Feb 2002 19:53:00 -0000 1.12
@@ -11,8 +11,6 @@
<!-- Allow any user specific values to override the defaults -->
<property file="${user.home}/build.properties" />
- <property name="work.dir" value="work"/>
-
<path id="classpath">
<pathelement location="${lib.repo}/dom4j-1.1.jar"/>
<pathelement location="${lib.repo}/commons-util-0.1-dev.jar"/>
@@ -26,7 +24,7 @@
<pathelement location="${lib.repo}/oro.jar"/>
<pathelement location="${lib.repo}/gnu-regexp-1.1.4.jar"/>
<pathelement location="${lib.repo}/genjar.jar"/>
- <pathelement location="${work.dir}"/>
+ <pathelement location="${basedir}"/>
</path>
<!-- ================================================================== -->
@@ -35,13 +33,20 @@
<target
name="generate-build">
+
+ <!-- Remove the elements of past generations before creating
+ the new one -->
- <delete dir="${work.dir}"/>
- <mkdir dir="${work.dir}"/>
+ <delete file="build-docs.xml"/>
+ <delete file="build-test.xml"/>
+ <delete file="build.xml"/>
+ <delete file="default.properties"/>
+ <delete file="LICENSE"/>
+ <delete file="README.txt"/>
<javac
srcdir="src/java"
- destdir="${work.dir}"
+ destdir="${basedir}"
debug="${debug}"
deprecation="${deprecation}"
optimize="${optimize}">
@@ -56,7 +61,7 @@
<create-build-system
controlTemplate="Control.vm"
- outputDirectory="${work.dir}"
+ outputDirectory="${basedir}"
templatePath="src/templates/build"
outputFile="bootstrap.report"
projectDescriptor="project.xml"
@@ -112,29 +117,9 @@
<pathelement location="${lib.repo}/bcel.jar"/>
<pathelement location="${lib.repo}/oro.jar"/>
<pathelement location="${lib.repo}/gnu-regexp-1.1.4.jar"/>
- <pathelement location="${work.dir}"/>
+ <pathelement location="${basedir}"/>
</classpath>
</genjar>
-
- <copy tofile="${work.dir}/project.xml" file="project.xml"/>
-
- <chmod perm="+x">
- <fileset dir="${work.dir}">
- <include name="*.sh"/>
- </fileset>
- </chmod>
-
- <copy todir="${work.dir}">
- <fileset dir=".">
- <include name="src/**"/>
- </fileset>
- </copy>
-
- <copy todir="${work.dir}">
- <fileset dir=".">
- <include name="xdocs/**"/>
- </fileset>
- </copy>
</target>
</project>
1.4 +2 -2 jakarta-turbine-maven/src/java/org/apache/maven/ChangeLog.java
Index: ChangeLog.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ChangeLog.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ChangeLog.java 24 Feb 2002 19:35:32 -0000 1.3
+++ ChangeLog.java 24 Feb 2002 19:53:00 -0000 1.4
@@ -71,7 +71,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jeff Martin</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: ChangeLog.java,v 1.3 2002/02/24 19:35:32 jvanzyl Exp $
+ * @version $Id: ChangeLog.java,v 1.4 2002/02/24 19:53:00 jvanzyl Exp $
*/
public class ChangeLog
extends Task
@@ -253,6 +253,8 @@
try
{
exe.execute();
+
+
}
catch (IOException e)
{
@@ -266,8 +268,6 @@
public void start()
throws IOException
{
- System.out.println("!!!");
-
String file = null;
out = new PrintWriter(new OutputStreamWriter(
1.14 +1 -1 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build-docs.xml 24 Feb 2002 19:35:32 -0000 1.13
+++ build-docs.xml 24 Feb 2002 19:53:00 -0000 1.14
@@ -69,7 +69,7 @@
<change-log
projectDescriptor="project.xml"
baseDir="src/java"
- output="docs/cvs-change-log.xml"
+ output="xdocs/changelog.xml"
/>
</target>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
