crossley 2003/12/24 01:12:29
Modified: . build.properties
tools/targets forrest-build.xml
Log:
Do not set forrest.home in build.properties and use the $FORREST_HOME
environment variable instead (or set it in a project.properties or
ant.properties). Cocoon already reads build.properties which prevents
forrest from setting it properly.
Revision Changes Path
1.31 +1 -1 cocoon-2.1/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/cocoon-2.1/build.properties,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- build.properties 8 Dec 2003 11:39:26 -0000 1.30
+++ build.properties 24 Dec 2003 09:12:29 -0000 1.31
@@ -34,7 +34,7 @@
# ---- Forrest
-----------------------------------------------------------------
-forrest.home=../xml-forrest/build/dist/shbat/
+# set $FORREST_HOME and $PATH as instructed by Forrest
# ---- Build
-------------------------------------------------------------------
1.3 +2 -2 cocoon-2.1/tools/targets/forrest-build.xml
Index: forrest-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/targets/forrest-build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- forrest-build.xml 18 Dec 2003 07:29:23 -0000 1.2
+++ forrest-build.xml 24 Dec 2003 09:12:29 -0000 1.3
@@ -138,8 +138,8 @@
Then either:
- Set FORREST_HOME as the Forrest build instructions describe
- - Create a build.properties, with the forrest.home property pointing to
- the forrest shbat directory, eg:
+ - Create a project.properties, with the forrest.home property
+ pointing to the forrest shbat directory, e.g.
forrest.home=${winpath} (Windows)
forrest.home=${unixpath} (Unix)
