You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by cr...@locus.apache.org on 2000/09/20 06:21:49 UTC
cvs commit: jakarta-struts build.bat build.sh build.xml
craigmcc 00/09/19 21:21:49
Modified: . build.bat build.sh build.xml
Log:
Update the build scripts to include all official DTDs in the documentation
application (so that they will be included on the web site), and update
the "deploy" targets for Tomcat 3.x and Tomcat 4.0 (i.e. Catalina).
Revision Changes Path
1.7 +14 -5 jakarta-struts/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/jakarta-struts/build.bat,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.bat 2000/06/24 23:28:34 1.6
+++ build.bat 2000/09/20 04:21:48 1.7
@@ -10,15 +10,18 @@
rem ANT_OPTS Command line options to pass to the JVM when
rem executing Ant. [none]
rem
+rem CATALINA_HOME Build directory for "jakarta-tomcat-4.0".
+rem [../build/tomcat-4.0]
+rem
rem JAVA_HOME Java Development Kit directory. [REQUIRED]
rem
rem SERVLETAPI_HOME Distribution directory for "jakarta-servletapi".
rem [../jakarta-servletapi]
rem
-rem TOMCAT_HOME Distribution directory for "jakarta-tomcat".
-rem [../jakarta-tomcat]
+rem TOMCAT_HOME Build directory for "jakarta-tomcat".
+rem [../build/tomcat]
rem
-rem $Id: build.bat,v 1.6 2000/06/24 23:28:34 craigmcc Exp $
+rem $Id: build.bat,v 1.7 2000/09/20 04:21:48 craigmcc Exp $
rem ---------------------------------------------------------------------------
@@ -26,6 +29,7 @@
set _ANT_HOME=%ANT_HOME%
set _ANT_OPTS=%ANT_OPTS%
+set _CATALINA_HOME=%CATALINA_HOME%
set _SERVLETAPI_HOME=%SERVLETAPI_HOME%
set _TOMCAT_HOME=%TOMCAT_HOME%
@@ -41,13 +45,16 @@
set ANT_HOME=..\jakarta-ant
:gotAntHome
+if not "%CATALINA_HOME%" == "" goto gotCatalinaHome
+set CATALINA_HOME=..\build\tomcat-4.0
+:gotCatalinaHome
if not "%SERVLETAPI_HOME%" == "" goto gotServletapiHome
set SERVLETAPI_HOME=..\jakarta-servletapi
:gotServletapiHome
if not "%TOMCAT_HOME%" == "" goto gotTomcatHome
-set TOMCAT_HOME=..\jakarta-tomcat
+set TOMCAT_HOME=..\build\tomcat
:gotTomcatHome
@@ -64,7 +71,7 @@
rem ----- Execute The Requested Build -----------------------------------------
-java %ANT_OPTS% -classpath "%CP%" org.apache.tools.ant.Main -Dant.home=%ANT_HOME% -Dservlet.jar=%SERVLETAPI_HOME%\lib\servlet.jar -Dtomcat.home=%TOMCAT_HOME% %1 %2 %3 %4 %5 %6 %7 %8 %9
+java %ANT_OPTS% -classpath "%CP%" org.apache.tools.ant.Main -Dant.home=%ANT_HOME% -Dcatalina.home=%CATALINA_HOME% -Dservlet.jar=%SERVLETAPI_HOME%\lib\servlet.jar -Dtomcat.home=%TOMCAT_HOME% %1 %2 %3 %4 %5 %6 %7 %8 %9
rem ----- Clean Up Environment Variables --------------------------------------
@@ -73,11 +80,13 @@
set ANT_HOME=%_ANT_HOME%
set ANT_OPTS=%_ANT_OPTS%
+set CATALINA_HOME=%_CATALINA_HOME%
set SERVLETAPI_HOME=%_SERVLETAPI_HOME%
set TOMCAT_HOME=%_TOMCAT_HOME%
set _ANT_HOME=
set _ANT_OPTS=
+set _CATALINA_HOME=
set _SERVLETAPI_HOME=
set _TOMCAT_HOME=
1.3 +12 -8 jakarta-struts/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/jakarta-struts/build.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.sh 2000/06/01 00:05:54 1.2
+++ build.sh 2000/09/20 04:21:48 1.3
@@ -10,15 +10,18 @@
# ANT_OPTS Command line options to pass to the JVM when
# executing Ant. [none]
#
+# CATALINA_HOME Build directory for "jakarta-tomcat-4.0".
+# [../build/tomcat-4.0]
+#
# JAVA_HOME Java Development Kit directory. [REQUIRED]
#
# SERVLETAPI_HOME Distribution directory for "jakarta-servletapi".
# [../jakarta-servletapi]
#
-# TOMCAT_HOME Distribution directory for "jakarta-tomcat".
-# [../jakarta-tomcat]
+# TOMCAT_HOME Build directory for "jakarta-tomcat".
+# [../build/tomcat]
#
-# $Id: build.sh,v 1.2 2000/06/01 00:05:54 craigmcc Exp $
+# $Id: build.sh,v 1.3 2000/09/20 04:21:48 craigmcc Exp $
# -----------------------------------------------------------------------------
@@ -32,6 +35,10 @@
ANT_OPTS=""
fi
+if [ "$CATALINA_HOME" = "" ] ; then
+ CATALINA_HOME=../build/tomcat-4.0
+fi
+
if [ "$JAVA_HOME" = "" ] ; then
echo You must set JAVA_HOME to point at your Java Development Kit directory
exit 1
@@ -42,7 +49,7 @@
fi
if [ "$TOMCAT_HOME" = "" ] ; then
- TOMCAT_HOME=../jakarta-tomcat
+ TOMCAT_HOME=../build/tomcat
fi
@@ -56,8 +63,5 @@
# ----- Execute The Requested Build -------------------------------------------
-
-java $ANT_OPTS -classpath "$CP" org.apache.tools.ant.Main -Dant.home=$ANT_HOME -Dservlet.jar=$SERVLETAPI_HOME/lib/servlet.jar -Dtomcat.home=$TOMCAT_HOME "$@"
-
-
+java $ANT_OPTS -classpath "$CP" org.apache.tools.ant.Main -Dant.home=$ANT_HOME -Dcatalina.home=$CATALINA_HOME -Dservlet.jar=$SERVLETAPI_HOME/lib/servlet.jar -Dtomcat.home=$TOMCAT_HOME "$@"
1.16 +27 -14 jakarta-struts/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.xml 2000/09/05 21:28:02 1.15
+++ build.xml 2000/09/20 04:21:48 1.16
@@ -3,21 +3,34 @@
<!-- Initialization properties -->
<property name="app.name" value="struts"/>
<property name="build.home" value="../build/${app.name}"/>
- <property name="catalina.build" value="../build/tomcat-4.0"/>
+ <property name="catalina.home" value="../build/tomcat-4.0"/>
<property name="dist.home" value="../dist/${app.name}"/>
- <property name="tomcat.build" value="../build/tomcat"/>
+ <property name="tomcat.home" value="../build/tomcat"/>
<!-- BUILD: Create directories and copy files for library -->
<target name="prepare.library">
<mkdir dir="${build.home}"/>
<mkdir dir="${build.home}/library"/>
<mkdir dir="${build.home}/library/classes"/>
+ <mkdir dir="${build.home}/library/classes/org"/>
+ <mkdir dir="${build.home}/library/classes/org/apache"/>
+ <mkdir dir="${build.home}/library/classes/org/apache/struts"/>
+ <mkdir dir="${build.home}/library/classes/org/apache/struts/resources"/>
+ <copydir src="src/conf"
+ dest="${build.home}/library/classes/org/apache/struts/resources">
+ <include name="**/*.dtd"/>
+ </copydir>
</target>
<!-- BUILD: Create directories and copy files for documentation app -->
<target name="prepare.documentation">
<mkdir dir="${build.home}"/>
<mkdir dir="${build.home}/documentation"/>
+ <mkdir dir="${build.home}/documentation/dtds"/>
+ <copydir src="src/conf"
+ dest="${build.home}/documentation/dtds">
+ <include name="**/*.dtd"/>
+ </copydir>
<mkdir dir="${build.home}/documentation/WEB-INF"/>
<mkdir dir="${build.home}/documentation/WEB-INF/classes"/>
<mkdir dir="${build.home}/documentation/WEB-INF/lib"/>
@@ -195,28 +208,28 @@
<!-- DEPLOY: Deploy these applications on Catalina -->
<target name="deploy.catalina" depends="compile.documentation,compile.example,compile.test">
- <mkdir dir="${catalina.build}/webapps/struts-documentation"/>
+ <mkdir dir="${catalina.home}/webapps/struts-documentation"/>
<copydir src="${build.home}/documentation"
- dest="${catalina.build}/webapps/struts-documentation"/>
- <mkdir dir="${catalina.build}/webapps/struts-example"/>
+ dest="${catalina.home}/webapps/struts-documentation"/>
+ <mkdir dir="${catalina.home}/webapps/struts-example"/>
<copydir src="${build.home}/example"
- dest="${catalina.build}/webapps/struts-example"/>
- <mkdir dir="${catalina.build}/webapps/struts-test"/>
+ dest="${catalina.home}/webapps/struts-example"/>
+ <mkdir dir="${catalina.home}/webapps/struts-test"/>
<copydir src="${build.home}/test"
- dest="${catalina.build}/webapps/struts-test"/>
+ dest="${catalina.home}/webapps/struts-test"/>
</target>
<!-- DEPLOY: Deploy these applications on Tomcat -->
<target name="deploy.tomcat" depends="compile.documentation,compile.example,compile.test">
- <mkdir dir="${tomcat.build}/webapps/struts-documentation"/>
+ <mkdir dir="${tomcat.home}/webapps/struts-documentation"/>
<copydir src="${build.home}/documentation"
- dest="${tomcat.build}/webapps/struts-documentation"/>
- <mkdir dir="${tomcat.build}/webapps/struts-example"/>
+ dest="${tomcat.home}/webapps/struts-documentation"/>
+ <mkdir dir="${tomcat.home}/webapps/struts-example"/>
<copydir src="${build.home}/example"
- dest="${tomcat.build}/webapps/struts-example"/>
- <mkdir dir="${tomcat.build}/webapps/struts-test"/>
+ dest="${tomcat.home}/webapps/struts-example"/>
+ <mkdir dir="${tomcat.home}/webapps/struts-test"/>
<copydir src="${build.home}/test"
- dest="${tomcat.build}/webapps/struts-test"/>
+ dest="${tomcat.home}/webapps/struts-test"/>
</target>
<!-- UTILITY: Clean up build and distribution directories -->