tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pier...@locus.apache.org
Subject cvs commit: jakarta-tomcat-4.0/jasper build.bat build.sh build.xml
Date Fri, 22 Sep 2000 13:57:48 GMT
pierred     00/09/22 06:57:46

  Modified:    .        build.bat build.sh
               jasper   build.bat build.sh build.xml
  Log:
  java.home all the way to jasper so it can use tools.jar
  when building javadocs
  Submitted by:	Bob Jamison <rjamison@lincom-asg.com>
  
  Revision  Changes    Path
  1.6       +2 -2      jakarta-tomcat-4.0/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/build.bat,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.bat	2000/09/20 19:54:58	1.5
  +++ build.bat	2000/09/22 13:57:32	1.6
  @@ -20,7 +20,7 @@
   rem   SERVLETAPI_HOME  Must point at your "jakarta-servletapi" installation.
   rem                    [REQUIRED]
   rem
  -rem $Id: build.bat,v 1.5 2000/09/20 19:54:58 pierred Exp $
  +rem $Id: build.bat,v 1.6 2000/09/22 13:57:32 pierred Exp $
   rem ---------------------------------------------------------------------------
   
   
  @@ -70,7 +70,7 @@
   
   rem ----- Execute The Requested Build -----------------------------------------
   
  -java %ANT_OPTS% org.apache.tools.ant.Main -Dant.home=%ANT_HOME% -Dxerces.home="%XERCES_HOME%"
-Djsse.home=%JSSE_HOME% -Dregexp.home=%REGEXP_HOME% -Dservletapi.home=%SERVLETAPI_HOME% %1
%2 %3 %4 %5 %6 %7 %8 %9
  +java %ANT_OPTS% org.apache.tools.ant.Main -Dant.home="%ANT_HOME%" -Dxerces.home="%XERCES_HOME%"
-Djsse.home="%JSSE_HOME%" -Dregexp.home="%REGEXP_HOME%" -Dservletapi.home="%SERVLETAPI_HOME%"
-Djava.home="%JAVA_HOME%" %1 %2 %3 %4 %5 %6 %7 %8 %9
   
   
   rem ----- Restore Environment Variables ---------------------------------------
  
  
  
  1.6       +2 -2      jakarta-tomcat-4.0/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/build.sh,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.sh	2000/09/22 13:39:49	1.5
  +++ build.sh	2000/09/22 13:57:33	1.6
  @@ -21,7 +21,7 @@
   #   SERVLETAPI_HOME  Must point at your "jakarta-servletapi" installation.
   #                    [../jakarta-servletapi]
   #
  -# $Id: build.sh,v 1.5 2000/09/22 13:39:49 pierred Exp $
  +# $Id: build.sh,v 1.6 2000/09/22 13:57:33 pierred Exp $
   # -----------------------------------------------------------------------------
   
   
  @@ -72,4 +72,4 @@
   
   # ----- Execute The Requested Build -------------------------------------------
   
  -java $ANT_OPTS -classpath $CP org.apache.tools.ant.Main -Dant.home=$ANT_HOME -Dxerces.home=$XERCES_HOME
-Djsse.home=$JSSE_HOME -Dregexp.home=$REGEXP_HOME -Dservletapi.home=$SERVLETAPI_HOME "$@"
  +java $ANT_OPTS -classpath $CP org.apache.tools.ant.Main -Dant.home=$ANT_HOME -Dxerces.home=$XERCES_HOME
-Djsse.home=$JSSE_HOME -Dregexp.home=$REGEXP_HOME -Dservletapi.home=$SERVLETAPI_HOME -Djava.home=$JAVA_HOME
"$@"
  
  
  
  1.4       +2 -2      jakarta-tomcat-4.0/jasper/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/build.bat,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.bat	2000/09/20 19:55:06	1.3
  +++ build.bat	2000/09/22 13:57:39	1.4
  @@ -16,7 +16,7 @@
   rem   SERVLETAPI_HOME  Must point at your "jakarta-servletapi" installation.
   rem                    [REQUIRED]
   rem
  -rem $Id: build.bat,v 1.3 2000/09/20 19:55:06 pierred Exp $
  +rem $Id: build.bat,v 1.4 2000/09/22 13:57:39 pierred Exp $
   rem ---------------------------------------------------------------------------
   
   
  @@ -56,7 +56,7 @@
   
   rem ----- Execute The Requested Build -----------------------------------------
   
  -java %ANT_OPTS% org.apache.tools.ant.Main -Dant.home=%ANT_HOME% -Dxerces.home="%XERCES_HOME%"
-Dservletapi.home=%SERVLETAPI_HOME% %1 %2 %3 %4 %5 %6 %7 %8 %9
  +java %ANT_OPTS% org.apache.tools.ant.Main -Dant.home="%ANT_HOME%" -Dxerces.home="%XERCES_HOME%"
-Dservletapi.home="%SERVLETAPI_HOME%" -Djava.home="%JAVA_HOME%" %1 %2 %3 %4 %5 %6 %7 %8 %9
   
   
   rem ----- Restore Environment Variables ---------------------------------------
  
  
  
  1.4       +2 -2      jakarta-tomcat-4.0/jasper/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/build.sh,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.sh	2000/09/20 19:55:07	1.3
  +++ build.sh	2000/09/22 13:57:40	1.4
  @@ -14,7 +14,7 @@
   #   SERVLETAPI_HOME  Must point at your "jakarta-servletapi" installation.
   #                    [../../jakarta-servletapi]
   #
  -# $Id: build.sh,v 1.3 2000/09/20 19:55:07 pierred Exp $
  +# $Id: build.sh,v 1.4 2000/09/22 13:57:40 pierred Exp $
   # -----------------------------------------------------------------------------
   
   
  @@ -54,5 +54,5 @@
   
   # ----- Execute The Requested Build -------------------------------------------
   
  -java $ANT_OPTS -classpath $CP org.apache.tools.ant.Main -Dant.home=$ANT_HOME -Dxerces.home=$XERCES_HOME
-Dservletapi.home=$SERVLETAPI_HOME "$@"
  +java $ANT_OPTS -classpath $CP org.apache.tools.ant.Main -Dant.home=$ANT_HOME -Dxerces.home=$XERCES_HOME
-Dservletapi.home=$SERVLETAPI_HOME -Djava.home=$JAVA_HOME "$@"
   
  
  
  
  1.9       +3 -1      jakarta-tomcat-4.0/jasper/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/build.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- build.xml	2000/09/22 13:35:39	1.8
  +++ build.xml	2000/09/22 13:57:41	1.9
  @@ -9,11 +9,13 @@
     <property name="jasper.dist"     value="../../dist/jasper"/>
     <property name="xerces.home"     value="${basedir}/../xerces"/>
     <property name="servletapi.home" value="../../jakarta-servletapi"/>
  +  <property name="java.home"       value="java.home_is_undefined"/>
   
   
     <!-- ================== Derived Property Values ========================= -->
     <property name="xerces.jar"      value="${xerces.home}/xerces.jar"/>
     <property name="servlet.jar"     value="${servletapi.home}/lib/servlet.jar"/>
  +  <property name="tools.jar"       value="${java.home}/lib/tools.jar"/>
   
   
     <!-- =================== BUILD: Create Directories ====================== -->
  @@ -67,7 +69,7 @@
       <deltree dir="${jasper.build}/javadoc"/>
       <mkdir dir="${jasper.build}/javadoc"/>
       <javadoc packagenames="org.apache.jasper.*"
  -             classpath="${xerces.jar}:${servlet.jar}:${jasper.build}/classes"
  +             classpath="${tools.jar}:${xerces.jar}:${servlet.jar}:${jasper.build}/classes"
                  sourcepath="src/share"
                     destdir="${jasper.build}/javadoc"
                      author="true"
  
  
  

Mime
View raw message