craigmcc 01/03/23 11:22:13
Modified: . .cvsignore build.xml
Log:
Load localized build properties from a file named "build.properties" in
the top-level directory (if it exists). A sample file will be checked in
momentarily.
The purpose of this change is to allow builds by using the "ant" command
directly (which must be on your PATH), instead of using the "build.sh" and
"build.bat" scripts. It also eliminates the requirement to set numerous
environment variables prior to building Struts.
Revision Changes Path
1.3 +1 -0 jakarta-struts/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/jakarta-struts/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 2001/03/10 05:15:31 1.2
+++ .cvsignore 2001/03/23 19:22:12 1.3
@@ -1 +1,2 @@
+build.properties
target
1.46 +14 -6 jakarta-struts/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build.xml,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- build.xml 2001/03/18 17:56:56 1.45
+++ build.xml 2001/03/23 19:22:13 1.46
@@ -25,7 +25,9 @@
installation. This is required only when
executing the "deploy.catalina" target.
- servlet.jar The path to the Servlet API jar.
+ servletapi.home (required). The path to the binary
+ distribution directory of your
+ servlet API distribution.
tomcat.home (optional). The path to the Tomcat 3.x
installation. This is required only when
@@ -36,13 +38,17 @@
when executing the "deploy.catalina"
target.
- The values defined below are default values for properties that were
- not defined
-->
- <property name="servlet.jar" value="../jakarta-servletapi/lib/servlet.jar"/>
- <property name="catalina.home" value="../jakarta-tomcat-4.0/build"/>
- <property name="tomcat.home" value="../build/tomcat"/>
+ <!-- Load local and user build preferences -->
+ <property file="build.properties"/>
+ <property file="${user.home}/.build.properties"/>
+
+ <!-- Default values for unspecified properties -->
+ <property name="catalina.home" value="../jakarta-tomcat-4.0/build"/>
+ <property name="servletapi.home" value="../jakarta-servletapi"/>
+ <property name="tomcat.home" value="../build/tomcat"/>
+ <property name="xerces.home" value="../xml-xerces"/>
<!-- ========== Initialization Properties ================================= -->
@@ -106,6 +112,8 @@
<!-- Web directory -->
<property name="web.dir" value="web"/>
+ <!-- Location of the "servlet.jar" file to compile against -->
+ <property name="servlet.jar" value="${servletapi.home}/lib/servlet.jar"/>
<!-- ========== Executable Targets ======================================== -->
