tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@locus.apache.org
Subject cvs commit: jakarta-tomcat build.sh build.xml
Date Thu, 03 Feb 2000 07:13:42 GMT
akv         00/02/02 23:13:42

  Modified:    .        build.sh build.xml
  Log:
  Fixed dist and build targets
  
  Revision  Changes    Path
  1.8       +1 -3      jakarta-tomcat/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/build.sh,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- build.sh	2000/01/15 17:35:10	1.7
  +++ build.sh	2000/02/03 07:13:41	1.8
  @@ -1,6 +1,6 @@
   #! /bin/sh
   
  -# $Id: build.sh,v 1.7 2000/01/15 17:35:10 rubys Exp $
  +# $Id: build.sh,v 1.8 2000/02/03 07:13:41 akv Exp $
   
   if [ -z "$JAVA_HOME" ]
   then
  @@ -19,5 +19,3 @@
   cp=../jakarta-ant/lib/ant.jar:../jakarta-tools/moo.jar:../jakarta-ant/lib/xml.jar:../build/tomcat/classes:$JAVA_HOME/lib/tools.jar
   
   $JAVACMD -classpath $cp:$CLASSPATH org.apache.tools.ant.Main "$@"
  -
  -chmod +x `find ../build -name "*.sh"`
  
  
  
  1.26      +33 -46    jakarta-tomcat/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/build.xml,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- build.xml	2000/01/30 18:57:05	1.25
  +++ build.xml	2000/02/03 07:13:41	1.26
  @@ -6,6 +6,7 @@
   
     <!-- ==================== Copy static files ==================== -->
     <!-- IF YOU CHANGE, sync dist.prepare !!! -->
  +
     <target name="prepare">
       <mkdir dir="src/doc"/> <!-- Temp change until dir is not empty -->
       <mkdir dir="${tomcat.build}"/>
  @@ -62,9 +63,6 @@
              classpath="${tomcat.build}/classes"/>
       <javac srcdir="src/examples/jsp/plugin/applet"
              destdir="${tomcat.build}/webapps/examples/jsp/plugin/applet"/>
  -    <jar   jarfile="${tomcat.build}/webapps/examples.war"
  -           basedir="${tomcat.build}/webapps/examples"
  -           items="." /> 
   
       <!-- Root context -->
       <mkdir dir="${tomcat.build}/webapps/ROOT"/>
  @@ -72,9 +70,6 @@
       <javac srcdir="src/webpages/WEB-INF/classes"
              destdir="${tomcat.build}/webapps/ROOT/WEB-INF/classes"
              classpath="${tomcat.build}/classes"/>
  -    <jar   jarfile="${tomcat.build}/webapps/ROOT.war"
  -           basedir="${tomcat.build}/webapps/ROOT"
  -           items="." /> 
   
       <!-- Test application -->
       <mkdir dir="${tomcat.build}/webapps/test"/>
  @@ -82,68 +77,60 @@
       <javac srcdir="src/tests/webpages/WEB-INF/classes"
              destdir="${tomcat.build}/webapps/test/WEB-INF/classes"
              classpath="${tomcat.build}/classes"/>
  -    <jar   jarfile="${tomcat.build}/webapps/test.war"
  -           basedir="${tomcat.build}/webapps/test"
  -           items="." /> 
  -
     </target>
   
  +
     <!-- ==================== Copy the files to distribution format ====================
-->
     <target name="dist" depends="main,webapps">
  -    <mkdir dir="${tomcat.home}"/>
  -    <mkdir dir="${tomcat.home}/classes"/>
  -    <mkdir dir="${tomcat.home}/conf"/>
  -    <mkdir dir="${tomcat.home}/src"/>
  -    <mkdir dir="${tomcat.home}/lib"/>
  -    <mkdir dir="${tomcat.home}/bin"/>
  -    <mkdir dir="${tomcat.home}/webapps"/>
  -    <mkdir dir="${tomcat.home}/webapps/ROOT"/>
  -
  -    <copydir src="${tomcat.build}/bin" dest="${tomcat.home}/bin" />
  -    <copydir src="${tomcat.build}/conf" dest="${tomcat.home}/conf"/>
  -    <copydir src="${tomcat.build}/doc" dest="${tomcat.home}/doc"/>
  -    <copydir src="${tomcat.build}/src" dest="${tomcat.home}/src"/>
  -    <copydir src="${tomcat.build}/lib" dest="${tomcat.home}/lib"/>
  -    <copyfile src="${tomcat.build}/LICENSE" dest="${tomcat.home}/LICENSE"/>
  -
  -    <copydir src="${tomcat.build}/webapps/ROOT" dest="${tomcat.home}/webapps/ROOT"/>
  -    <copydir src="${tomcat.build}/webapps/examples" dest="${tomcat.home}/webapps/examples"/>
  -    <copydir src="${tomcat.build}/webapps/test" dest="${tomcat.home}/webapps/test"/>
  -    <!-- Copy only war format for examples and test  -->
  -    <copyfile src="${tomcat.build}/webapps/examples.war" 
  -              dest="${tomcat.home}/webapps/examples.war"/>
  -    <copyfile src="${tomcat.build}/webapps/test.war" 
  -              dest="${tomcat.home}/webapps/test.war"/>
   
  +    <mkdir dir="${tomcat.home}"/>
  +    <copydir src="${tomcat.build}" dest="${tomcat.home}"/>
   
       <!-- create tomcat jar files -->
       <jar jarfile="${tomcat.home}/lib/webserver.jar"
  -         basedir="${tomcat.build}/classes"
  +         basedir="${tomcat.home}/classes"
            items="org/apache/tomcat"/> 
       <jar jarfile="${tomcat.home}/lib/servlet.jar"
  -         basedir="${tomcat.build}/classes"
  +         basedir="${tomcat.home}/classes"
            items="javax/servlet"/>
       <jar jarfile="${tomcat.home}/lib/jasper.jar"
  -         basedir="${tomcat.build}/classes"
  +         basedir="${tomcat.home}/classes"
            items="org/apache/jasper"/>
   
  +    <deltree dir="${tomcat.home}/classes"/>
  +
  +    <!-- create webapp WARS -->
  +    <jar   jarfile="${tomcat.home}/webapps/examples.war"
  +           basedir="${tomcat.home}/webapps/examples"
  +           items="." /> 
  +    <deltree dir="${tomcat.home}/webapps/examples"/>
  +
  +    <jar   jarfile="${tomcat.home}/webapps/ROOT.war"
  +           basedir="${tomcat.home}/webapps/ROOT"
  +           items="." />
  +    <deltree dir="${tomcat.home}/webapps/ROOT"/>
  +
  +    <jar   jarfile="${tomcat.home}/webapps/test.war"
  +           basedir="${tomcat.home}/webapps/test"
  +           items="." /> 
  +    <deltree dir="${tomcat.home}/webapps/test"/>
  +
  +
       <!-- Change permissions for unix -->
       <chmod perm="+x" src="${tomcat.home}/bin/tomcat.sh"/>
  -    <chmod perm="+x" src="${tomcat.build}/bin/ant"/>
  -    <chmod perm="+x" src="${tomcat.build}/bin/startup.sh"/>
  -    <chmod perm="+x" src="${tomcat.build}/bin/shutdown.sh"/>
  +    <chmod perm="+x" src="${tomcat.home}/bin/ant"/>
  +    <chmod perm="+x" src="${tomcat.home}/bin/startup.sh"/>
  +    <chmod perm="+x" src="${tomcat.home}/bin/shutdown.sh"/>
  +    <chmod perm="+x" src="${tomcat.home}/bin/test-tomcat.sh"/>
     </target>
     
     <!-- ==================== Admin ==================== -->
     <target name="clean">
       <deltree dir="${tomcat.build}"/>
  -  </target>
  -  
  -  <target name="dist.clean">
       <deltree dir="${tomcat.home}"/>
     </target>
  -
  -  <target name="all" depends="clean,main,dist,webapps"/>
  -  <target name="main" depends="tomcat"/>
  +  
  +  <target name="all" depends="clean,dist"/>
  +  <target name="main" depends="tomcat,webapps"/>
     
   </project>
  
  
  

Mime
View raw message