dims 01/06/04 04:27:05
Modified: . build.bat build.sh build.xml
Log:
Ensure tools.jar is picked up from JAVA_HOME/lib directory.
Revision Changes Path
1.4 +2 -2 xml-cocoon2/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.bat,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.bat 2001/05/25 16:13:25 1.3
+++ build.bat 2001/06/04 11:27:04 1.4
@@ -2,7 +2,7 @@
:: -----------------------------------------------------------------------------
:: build.bat - Win32 Build Script for Apache Cocoon
::
-:: $Id: build.bat,v 1.3 2001/05/25 16:13:25 giacomo Exp $
+:: $Id: build.bat,v 1.4 2001/06/04 11:27:04 dims Exp $
:: -----------------------------------------------------------------------------
:: ----- Verify and Set Required Environment Variables -------------------------
@@ -22,7 +22,7 @@
:: ----- Execute The Requested Build -------------------------------------------
-%JAVA_HOME%\bin\java.exe %ANT_OPTS% -classpath %CP% org.apache.tools.ant.Main
-Dant.home=%ANT_HOME% %1 %2 %3 %4 %5 %6 %7 %8 %9
+%JAVA_HOME%\bin\java.exe %ANT_OPTS% -classpath %CP% org.apache.tools.ant.Main
-Djava.home=%JAVA_HOME% -Dant.home=%ANT_HOME% %1 %2 %3 %4 %5 %6 %7 %8 %9
:: ----- Cleanup the environment -----------------------------------------------
1.4 +2 -2 xml-cocoon2/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.sh 2001/05/25 16:13:26 1.3
+++ build.sh 2001/06/04 11:27:04 1.4
@@ -2,7 +2,7 @@
# -----------------------------------------------------------------------------
# build.sh - Unix Build Script for Apache Cocoon
#
-# $Id: build.sh,v 1.3 2001/05/25 16:13:26 giacomo Exp $
+# $Id: build.sh,v 1.4 2001/06/04 11:27:04 dims Exp $
# -----------------------------------------------------------------------------
# ----- Verify and Set Required Environment Variables -------------------------
@@ -28,7 +28,7 @@
# ----- Execute The Requested Build -------------------------------------------
-$JAVA_HOME/bin/java $ANT_OPTS -classpath $CP org.apache.tools.ant.Main
-Dant.home=$ANT_HOME -logger org.apache.tools.ant.NoBannerLogger -emacs $*
+$JAVA_HOME/bin/java $ANT_OPTS -classpath $CP org.apache.tools.ant.Main
-Djava.home=$JAVA_HOME -Dant.home=$ANT_HOME -logger
org.apache.tools.ant.NoBannerLogger -emacs $*
1.7 +7 -2 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 2001/06/01 16:14:52 1.6
+++ build.xml 2001/06/04 11:27:05 1.7
@@ -169,6 +169,11 @@
<property name="site" value="../xml-site/targets/${name}"/>
+ <!--
+ The location of tools.jar, relative to the JAVA_HOME home.
+ -->
+ <property name="tools.jar" value="${java.home}/lib/tools.jar"/>
+
<filter token="Name" value="${Name}"/>
<filter token="name" value="${fullname}"/>
<filter token="year" value="${year}"/>
@@ -371,7 +376,7 @@
<include name="**/*.jar"/>
</fileset>
<pathelement location="${build.dir}/${name}.jar"/>
- <pathelement location="${java.home}/../lib/tools.jar"/>
+ <pathelement location="${tools.jar}"/>
</classpath>
</java>
</target>
@@ -390,7 +395,7 @@
</copy>
<!-- NOTE: java.home is normally set by the JVM to the /jre directory -->
- <copy file="${java.home}/../lib/tools.jar"
tofile="${build.war}/WEB-INF/lib/javac.jar"/>
+ <copy file="${tools.jar}" tofile="${build.war}/WEB-INF/lib/javac.jar"/>
<copy file="${build.dir}/${name}.jar"
tofile="${build.war}/WEB-INF/lib/${name}-${version}.jar"/>
</target>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
