You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by je...@apache.org on 2002/01/15 06:23:17 UTC
cvs commit: jakarta-commons BUILD_DOCS.txt build.properties.sample build.xml build.bat build.sh cpappend.bat
jefft 02/01/14 21:23:17
Modified: . BUILD_DOCS.txt build.properties.sample build.xml
Removed: . build.bat build.sh cpappend.bat
Log:
Make building the site docs easier:
- Remove the build scripts (unneeded now)
- In build.properties.sample, added commented-out property definitions
referencing ../jakarta-site2
- Changed build.xml to use build.properties, instead of .ant.properties
- Added an <echo> to build.xml to print the used properties, and a message
about what to do if it fails.
- Updated BUILD_DOCS.txt, documenting this.
Revision Changes Path
1.5 +11 -11 jakarta-commons/BUILD_DOCS.txt
Index: BUILD_DOCS.txt
===================================================================
RCS file: /home/cvs/jakarta-commons/BUILD_DOCS.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BUILD_DOCS.txt 15 Jan 2002 03:04:02 -0000 1.4
+++ BUILD_DOCS.txt 15 Jan 2002 05:23:17 -0000 1.5
@@ -4,32 +4,32 @@
#
# EITHER:
#
-# 1) Check the jakarta-site2 module out from CVS, to the same directory as
-# jakarta-commons.
-#
-# 2) Run './build.sh' or 'build.bat'
+# 1) Copy build.properties.sample to build.properties, and define the
+# properties: velocity.jar, xerces.jar and jdom.jar. This is easiest to do
+# if you have jakarta-site2 or jakarta-velocity checked out.
#
# OR:
#
# 1) Make sure Ant, Xerces, Velocity (at least v1.2-dev)
# and JDOM are in your classpath.
#
-# 2) Either invoke Ant directly with the build.xml file in this
-# directory
#
-# or
+# 2) Either invoke Ant directly (type 'ant') with the build.xml file in this
+# directory
+#
+# or
#
# java org.apache.tools.ant.Main -buildfile build.xml
#
-# or
+# or
#
# use this as a build.sh script :)
#
-# 3) Then commit the xdocs and docs changes to CVS
+# 3) Then commit the xdocs and docs changes to CVS
#
-# 4) On daedalus, cd to /www/jakarta.apache.org/commons
+# 4) On daedalus, cd to /www/jakarta.apache.org/commons
#
-# 5) Type ' cvs update '
+# 5) Type ' cvs update '
#
#-----------------------------
# Script for building
1.4 +6 -1 jakarta-commons/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-commons/build.properties.sample,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.properties.sample 15 Jan 2002 03:25:32 -0000 1.3
+++ build.properties.sample 15 Jan 2002 05:23:17 -0000 1.4
@@ -6,7 +6,7 @@
# Make any changes you need, and rename this file to
# "build.properties"
#
-# $Id: build.properties.sample,v 1.3 2002/01/15 03:25:32 jefft Exp $
+# $Id: build.properties.sample,v 1.4 2002/01/15 05:23:17 jefft Exp $
# -------------------------------------------------------------------
root=/java
@@ -36,6 +36,11 @@
# xerces.jar -- Xerces classes
xerces.jar=${velocity.home}/build/lib/xerces-1.3.0.jar
+# Alternative properties assuming you have the jakarta-site2 module
+#site2.home=../jakarta-site2
+#velocity.jar=${site2.home}/lib/velocity-1.3-dev.jar
+#jdom.jar=${site2.home}/lib/jdom-b7.jar
+#xerces.jar=${site2.home}/lib/xerces-1.4.3.jar
# -------------------------------------------------------------------
# JAKARTA-COMMONS DEPENDENCIES
1.8 +19 -4 jakarta-commons/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 11 Dec 2001 08:16:38 -0000 1.7
+++ build.xml 15 Jan 2002 05:23:17 -0000 1.8
@@ -6,8 +6,8 @@
<!-- Give user a chance to override without editing this file
(and without typing -D each time it compiles it -->
- <property file="${user.home}/.ant.properties" />
- <property file=".ant.properties" />
+ <property file="${user.home}/build.properties" />
+ <property file="build.properties" />
<property name="Name" value="Commons"/>
<property name="version" value="0.01"/>
@@ -28,7 +28,6 @@
<property name="jdom.jar" value="../jakarta-velocity/build/lib/jdom-b7.jar"/>
<property name="log4j.jar" value="../jakarta-velocity/build/lib/log4j-1.1.3.jar"/>
<property name="xerces.jar" value="../jakarta-velocity/build/lib/xerces-1.3.0.jar"/>
-
<!-- =================================================================== -->
<!-- prints the environment -->
@@ -83,10 +82,26 @@
output="${docs.src}/stylesheets/site.vsl"
/>
+ <echo>
+ ####################################################################
+ #
+ # Now declaring the Anakia task, using jar definitions:
+ # commons-collections.jar = ${commons-collections.jar}
+ # velocity.jar = ${velocity.jar}
+ # jdom.jar = ${jdom.jar}
+ # log4j.jar = ${log4j.jar}
+ # xerces.jar = ${xerces.jar}
+ #
+ # These are usually defined in build.properties (use
+ # build.properties.sample as a template). If the build fails here,
+ # double-check that these definitions (esp. velocity.jar) are correct.
+ #
+ ####################################################################
+ </echo>
<taskdef name="anakia"
classname="org.apache.velocity.anakia.AnakiaTask">
- <classpath location="${velocity.jar}"/>
<classpath location="${commons-collections.jar}"/>
+ <classpath location="${velocity.jar}"/>
<classpath location="${jdom.jar}"/>
<classpath location="${log4j.jar}"/>
<classpath location="${xerces.jar}"/>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>