jakarta-taglibs-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@locus.apache.org
Subject cvs commit: jakarta-taglibs/sql build.xml
Date Sun, 28 May 2000 13:32:11 GMT
rubys       00/05/28 06:32:10

  Modified:    .        build.xml
               bsf      build.xml
               jspspec  build.xml
               sql      build.xml
  Log:
  1) Only compile the taglibs for which the dependencies are present
  2) Comment out steps that don't apply
  3) Remove extra CR's on each line in bsf/build.xml
  
  Revision  Changes    Path
  1.5       +7 -3      jakarta-taglibs/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/build.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.xml	2000/05/23 23:16:44	1.4
  +++ build.xml	2000/05/28 13:32:09	1.5
  @@ -1,5 +1,5 @@
   <!-- ANT Build Script for the JAKARTA-TAGLIBS Project -->
  -<!-- $Id: build.xml,v 1.4 2000/05/23 23:16:44 craigmcc Exp $ -->
  +<!-- $Id: build.xml,v 1.5 2000/05/28 13:32:09 rubys Exp $ -->
   <project name="jakarta-taglibs" default="dist" basedir=".">
   
   
  @@ -47,6 +47,10 @@
     <target name="prepare">
       <mkdir dir="${build.dir}"/>
       <mkdir dir="${dist.dir}"/>
  +    <available property="bsf.present" 
  +               classname="com.ibm.bsf.BSFManager" />
  +    <available property="xslt.present" 
  +               classname="org.apache.xalan.xslt.XSLTProcessor" />
     </target>
   
     <!-- Copy the static files that describe the entire project -->
  @@ -73,7 +77,7 @@
   
     -->
   
  -  <target name="bsf">
  +  <target name="bsf" if="bsf.present">
       <ant dir="./bsf" target="dist"/>
     </target>
   
  @@ -85,7 +89,7 @@
       <ant dir="./sql" target="dist"/>
     </target>
   
  -  <target name="xsl">
  +  <target name="xsl" if="xslt.present">
       <ant dir="./xsl" target="dist"/>
     </target>
   
  
  
  
  1.2       +193 -191  jakarta-taglibs/bsf/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/bsf/build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.xml	2000/05/23 23:16:44	1.1
  +++ build.xml	2000/05/28 13:32:09	1.2
  @@ -1,191 +1,193 @@
  -<!-- ANT Build Script for the "bsf" Custom Tag Library -->
  -<!-- $Id: build.xml,v 1.1 2000/05/23 23:16:44 craigmcc Exp $ -->
  -<project name="bsf" default="main" basedir=".">
  -
  -    <!-- ******************** Adjustable Properties *********************** -->
  -
  -    <!--
  -
  -        The following property values should be examined and customized
  -	for each custom tag library subproject.
  -
  -	ant.home                    Home directory for the ANT build tool
  -	                            This is normally defaulted from the
  -				    ANT_HOME environment variable in the
  -				    build script.
  -
  -	servlet.jar                 Pathname of the servlet API classes
  -	                            you are using to compile, such as the
  -				    one that comes with Tomcat.  This is
  -				    normally defaulted from the SERVLET_JAR
  -				    environment variable in the build script.
  -
  -        taglib.name		    Base name of this tag library subproject.
  -
  -    -->
  -
  -    <property name="taglib.name"    value="bsf"/>
  -    <property name="ant.home"       value="../../jakarta-ant"/>
  -    <property name="servlet.jar"    value="../../jakarta-servletapi/lib/servlet.jar"/>
  -
  -
  -    <!-- ****************** Project Standard Properties ******************* -->
  -
  -    <!--
  -
  -        The following property values reflect the standard directory
  -	organization for the jakarta-taglibs project, and should not
  -	be changed or overridden.
  -
  -	build.dir                   Base directory for build targets
  -	dist.dir                    Base directory for distribution targets
  -
  -    -->
  -
  -    <property name="build.dir"      value="../../build/taglibs"/>
  -    <property name="dist.dir"       value="../../dist/taglibs"/>
  -
  -    <!-- *********************** Default Properties ********************** -->
  -
  -    <!--
  -
  -        The following property values reflect the recommended directory
  -	structure for each custom tag library subproject.  You should only
  -	need to adjust or override them if you use a different organization.
  -
  -	conf.src                    Library configuration source directory
  -        doc.src                     Documentation app source directory
  -        examples.src                Examples app source directory
  -        library.src                 Library Java source directory
  -
  -    -->
  -
  -    <property name="conf.src"       value="conf"/>
  -    <property name="doc.src"        value="doc"/>
  -    <property name="examples.src"   value="examples"/>
  -    <property name="library.src"    value="src"/>
  -    <property name="lib.src"        value="lib"/>
  -
  -
  -    <!-- ********************* Derived Properties ************************* -->
  -
  -    <!--
  -
  -        These property values are derived from the previously defined values,
  -	and should not normally be overridden from the command line.
  -
  -        build.doc                   Target directory for documentation app
  -        build.examples		    Target directory for examples app
  -        build.library               Target directory for tag library
  -	dist.doc                    Destination WAR for documentation app
  -	dist.examples		    Destination WAR for examples app
  -	dist.library                Destination JAR for tag library
  -	dist.tld                    Destination TLD file for tag library
  -
  -    -->
  -
  -    <property name="build.doc"      value="${build.dir}/${taglib.name}-doc"/>
  -    <property name="build.examples" value="${build.dir}/${taglib.name}-examples"/>
  -    <property name="build.library"  value="${build.dir}/${taglib.name}"/>
  -    <property name="dist.doc"       value="${dist.dir}/${taglib.name}/${taglib.name}-doc.war"/>
  -    <property name="dist.examples"  value="${dist.dir}/${taglib.name}/${taglib.name}-examples.war"/>
  -    <property name="dist.library"   value="${dist.dir}/${taglib.name}/${taglib.name}.jar"/>
  -    <property name="dist.tld"       value="${dist.dir}/${taglib.name}/${taglib.name}.tld"/>
  -
  -
  -  <!-- ********************** Destination Preparation ********************* -->
  -
  -  <target name="prepare">
  -    <!-- Set up build directories -->
  -    <mkdir dir="${build.dir}"/>
  -    <mkdir dir="${build.doc}"/>
  -    <mkdir dir="${build.doc}/WEB-INF"/>
  -    <mkdir dir="${build.doc}/WEB-INF/classes"/>
  -    <mkdir dir="${build.doc}/WEB-INF/lib"/>
  -    <mkdir dir="${build.examples}"/>
  -    <mkdir dir="${build.examples}/WEB-INF"/>
  -    <mkdir dir="${build.examples}/WEB-INF/classes"/>
  -    <mkdir dir="${build.examples}/WEB-INF/lib"/>
  -    <mkdir dir="${build.library}"/>
  -    <mkdir dir="${build.library}/META-INF"/>
  -    <!-- Set up distribution directory -->
  -    <mkdir dir="${dist.dir}"/>
  -    <mkdir dir="${dist.dir}/${taglib.name}"/>
  -  </target>
  -
  -
  -  <!-- **************** Compile Tag Library Components ******************** -->
  -
  -  <!-- Compile the documentation application -->
  -  <target name="documentation" depends="prepare">
  -    <copydir src="${doc.src}/conf"      dest="${build.doc}/WEB-INF"/>
  -    <copydir src="${doc.src}/web"       dest="${build.doc}"/>
  -<!--
  -    <javac srcdir="${doc.src}/src"   destdir="${build.doc}/WEB-INF/classes"
  -           classpath="${servlet.jar}" debug="on"/>
  --->
  -  </target>
  -
  -  <!-- Compile the examples application -->
  -  <target name="examples" depends="library-dist">
  -    <copydir src="${lib.src}" dest="${build.examples}/WEB-INF/lib"/> 
  -    <copydir src="${library.src}" dest="${build.examples}/WEB-INF/classes"/>
  -    <copydir src="${examples.src}/conf" dest="${build.examples}/WEB-INF"/>
  -    <copydir src="${examples.src}/web"  dest="${build.examples}"/>
  -    <copyfile src="${dist.tld}"
  -              dest="${build.examples}/WEB-INF/${taglib.name}.tld"/>
  -    <copyfile src="${dist.library}"
  -              dest="${build.examples}/WEB-INF/lib/${taglib.name}.jar"/>
  -<!--
  -    <javac srcdir="${examples.src}/src"
  -           destdir="${build.examples}/WEB-INF/classes"
  -           classpath="${servlet.jar}" debug="on"/>
  --->
  -  </target>
  -
  -  <!-- Compile the tag library itself -->
  -  <target name="library" depends="prepare">
  -    <copyfile src="${conf.src}/taglib.tld"
  -              dest="${build.library}/META-INF/taglib.tld"/>
  -    <javac srcdir="${library.src}" destdir="${build.library}"
  -           classpath="${servlet.jar}" debug="on"/>
  -  </target>
  -
  -  <!-- Compile the library as well as the associated applications -->
  -  <target name="main" depends="library,documentation,examples"/>
  -
  -
  -  <!-- ******************* Create Distribution Files ********************** -->
  -
  -  <!-- Create the documentation application WAR file -->
  -  <target name="documentation-dist" depends="documentation">
  -    <jar jarfile="${dist.doc}" basedir="${build.doc}"/>
  -  </target>
  -
  -  <!-- Create the examples application WAR file -->
  -  <target name="examples-dist" depends="examples">
  -    <jar jarfile="${dist.examples}" basedir="${build.examples}"/>
  -  </target>
  -
  -  <!-- Create the library distribution files -->
  -  <target name="library-dist" depends="library">
  -    <jar jarfile="${dist.library}" basedir="${build.library}"/>
  -    <copyfile src="${conf.src}/taglib.tld" dest="${dist.tld}"/>
  -  </target>
  -
  -  <!-- Create the entire set of distribution files -->
  -  <target name="dist" depends="library-dist,examples-dist,documentation-dist"/>
  -
  -
  -
  -  <!-- ************************ Utility Commands ************************** -->
  -
  -  <!-- Delete output directories and files so we can build from scratch -->
  -  <target name="clean">
  -    <deltree dir="${build.doc}"/>
  -    <deltree dir="${build.examples}"/>
  -    <deltree dir="${build.library}"/>
  -    <deltree dir="${dist.dir}/${taglib.name}"/>
  -  </target>
  -
  -</project>
  +<!-- ANT Build Script for the "bsf" Custom Tag Library -->
  +<!-- $Id: build.xml,v 1.2 2000/05/28 13:32:09 rubys Exp $ -->
  +<project name="bsf" default="main" basedir=".">
  +
  +    <!-- ******************** Adjustable Properties *********************** -->
  +
  +    <!--
  +
  +        The following property values should be examined and customized
  +        for each custom tag library subproject.
  +
  +        ant.home                    Home directory for the ANT build tool
  +                                    This is normally defaulted from the
  +                                    ANT_HOME environment variable in the
  +                                    build script.
  +
  +        servlet.jar                 Pathname of the servlet API classes
  +                                    you are using to compile, such as the
  +                                    one that comes with Tomcat.  This is
  +                                    normally defaulted from the SERVLET_JAR
  +                                    environment variable in the build script.
  +
  +        taglib.name                 Base name of this tag library subproject.
  +
  +    -->
  +
  +    <property name="taglib.name"    value="bsf"/>
  +    <property name="ant.home"       value="../../jakarta-ant"/>
  +    <property name="servlet.jar"    value="../../jakarta-servletapi/lib/servlet.jar"/>
  +
  +
  +    <!-- ****************** Project Standard Properties ******************* -->
  +
  +    <!--
  +
  +        The following property values reflect the standard directory
  +        organization for the jakarta-taglibs project, and should not
  +        be changed or overridden.
  +
  +        build.dir                   Base directory for build targets
  +        dist.dir                    Base directory for distribution targets
  +
  +    -->
  +
  +    <property name="build.dir"      value="../../build/taglibs"/>
  +    <property name="dist.dir"       value="../../dist/taglibs"/>
  +
  +    <!-- *********************** Default Properties ********************** -->
  +
  +    <!--
  +
  +        The following property values reflect the recommended directory
  +        structure for each custom tag library subproject.  You should only
  +        need to adjust or override them if you use a different organization.
  +
  +        conf.src                    Library configuration source directory
  +        doc.src                     Documentation app source directory
  +        examples.src                Examples app source directory
  +        library.src                 Library Java source directory
  +
  +    -->
  +
  +    <property name="conf.src"       value="conf"/>
  +    <property name="doc.src"        value="doc"/>
  +    <property name="examples.src"   value="examples"/>
  +    <property name="library.src"    value="src"/>
  +    <property name="lib.src"        value="lib"/>
  +
  +
  +    <!-- ********************* Derived Properties ************************* -->
  +
  +    <!--
  +
  +        These property values are derived from the previously defined values,
  +        and should not normally be overridden from the command line.
  +
  +        build.doc                   Target directory for documentation app
  +        build.examples              Target directory for examples app
  +        build.library               Target directory for tag library
  +        dist.doc                    Destination WAR for documentation app
  +        dist.examples               Destination WAR for examples app
  +        dist.library                Destination JAR for tag library
  +        dist.tld                    Destination TLD file for tag library
  +
  +    -->
  +
  +    <property name="build.doc"      value="${build.dir}/${taglib.name}-doc"/>
  +    <property name="build.examples" value="${build.dir}/${taglib.name}-examples"/>
  +    <property name="build.library"  value="${build.dir}/${taglib.name}"/>
  +    <property name="dist.doc"       value="${dist.dir}/${taglib.name}/${taglib.name}-doc.war"/>
  +    <property name="dist.examples"  value="${dist.dir}/${taglib.name}/${taglib.name}-examples.war"/>
  +    <property name="dist.library"   value="${dist.dir}/${taglib.name}/${taglib.name}.jar"/>
  +    <property name="dist.tld"       value="${dist.dir}/${taglib.name}/${taglib.name}.tld"/>
  +
  +
  +  <!-- ********************** Destination Preparation ********************* -->
  +
  +  <target name="prepare">
  +    <!-- Set up build directories -->
  +    <mkdir dir="${build.dir}"/>
  +    <mkdir dir="${build.doc}"/>
  +    <mkdir dir="${build.doc}/WEB-INF"/>
  +    <mkdir dir="${build.doc}/WEB-INF/classes"/>
  +    <mkdir dir="${build.doc}/WEB-INF/lib"/>
  +    <mkdir dir="${build.examples}"/>
  +    <mkdir dir="${build.examples}/WEB-INF"/>
  +    <mkdir dir="${build.examples}/WEB-INF/classes"/>
  +    <mkdir dir="${build.examples}/WEB-INF/lib"/>
  +    <mkdir dir="${build.library}"/>
  +    <mkdir dir="${build.library}/META-INF"/>
  +    <!-- Set up distribution directory -->
  +    <mkdir dir="${dist.dir}"/>
  +    <mkdir dir="${dist.dir}/${taglib.name}"/>
  +  </target>
  +
  +
  +  <!-- **************** Compile Tag Library Components ******************** -->
  +
  +  <!-- Compile the documentation application -->
  +  <target name="documentation" depends="prepare">
  +    <copydir src="${doc.src}/conf"      dest="${build.doc}/WEB-INF"/>
  +    <copydir src="${doc.src}/web"       dest="${build.doc}"/>
  +<!--
  +    <javac srcdir="${doc.src}/src"   destdir="${build.doc}/WEB-INF/classes"
  +           classpath="${servlet.jar}" debug="on"/>
  +-->
  +  </target>
  +
  +  <!-- Compile the examples application -->
  +  <target name="examples" depends="library-dist">
  +<!--
  +    <copydir src="${lib.src}" dest="${build.examples}/WEB-INF/lib"/>
  +    <copydir src="${library.src}" dest="${build.examples}/WEB-INF/classes"/>
  +-->
  +    <copydir src="${examples.src}/conf" dest="${build.examples}/WEB-INF"/>
  +    <copydir src="${examples.src}/web"  dest="${build.examples}"/>
  +    <copyfile src="${dist.tld}"
  +              dest="${build.examples}/WEB-INF/${taglib.name}.tld"/>
  +    <copyfile src="${dist.library}"
  +              dest="${build.examples}/WEB-INF/lib/${taglib.name}.jar"/>
  +<!--
  +    <javac srcdir="${examples.src}/src"
  +           destdir="${build.examples}/WEB-INF/classes"
  +           classpath="${servlet.jar}" debug="on"/>
  +-->
  +  </target>
  +
  +  <!-- Compile the tag library itself -->
  +  <target name="library" depends="prepare">
  +    <copyfile src="${conf.src}/taglib.tld"
  +              dest="${build.library}/META-INF/taglib.tld"/>
  +    <javac srcdir="${library.src}" destdir="${build.library}"
  +           classpath="${servlet.jar}" debug="on"/>
  +  </target>
  +
  +  <!-- Compile the library as well as the associated applications -->
  +  <target name="main" depends="library,documentation,examples"/>
  +
  +
  +  <!-- ******************* Create Distribution Files ********************** -->
  +
  +  <!-- Create the documentation application WAR file -->
  +  <target name="documentation-dist" depends="documentation">
  +    <jar jarfile="${dist.doc}" basedir="${build.doc}"/>
  +  </target>
  +
  +  <!-- Create the examples application WAR file -->
  +  <target name="examples-dist" depends="examples">
  +    <jar jarfile="${dist.examples}" basedir="${build.examples}"/>
  +  </target>
  +
  +  <!-- Create the library distribution files -->
  +  <target name="library-dist" depends="library">
  +    <jar jarfile="${dist.library}" basedir="${build.library}"/>
  +    <copyfile src="${conf.src}/taglib.tld" dest="${dist.tld}"/>
  +  </target>
  +
  +  <!-- Create the entire set of distribution files -->
  +  <target name="dist" depends="library-dist,examples-dist,documentation-dist"/>
  +
  +
  +
  +  <!-- ************************ Utility Commands ************************** -->
  +
  +  <!-- Delete output directories and files so we can build from scratch -->
  +  <target name="clean">
  +    <deltree dir="${build.doc}"/>
  +    <deltree dir="${build.examples}"/>
  +    <deltree dir="${build.library}"/>
  +    <deltree dir="${dist.dir}/${taglib.name}"/>
  +  </target>
  +
  +</project>
  
  
  
  1.2       +5 -1      jakarta-taglibs/jspspec/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/jspspec/build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.xml	2000/04/10 00:53:08	1.1
  +++ build.xml	2000/05/28 13:32:10	1.2
  @@ -1,5 +1,5 @@
   <!-- ANT Build Script for the "jspspec" Custom Tag Library -->
  -<!-- $Id: build.xml,v 1.1 2000/04/10 00:53:08 craigmcc Exp $ -->
  +<!-- $Id: build.xml,v 1.2 2000/05/28 13:32:10 rubys Exp $ -->
   <project name="jspspec" default="main" basedir=".">
   
       <!-- ******************** Adjustable Properties *********************** -->
  @@ -116,8 +116,10 @@
     <target name="documentation" depends="prepare">
       <copydir src="${doc.src}/conf"      dest="${build.doc}/WEB-INF"/>
       <copydir src="${doc.src}/web"       dest="${build.doc}"/>
  +  <!--
       <javac srcdir="${doc.src}/src"   destdir="${build.doc}/WEB-INF/classes"
              classpath="${servlet.jar}" debug="on"/>
  +    -->
     </target>
   
     <!-- Compile the examples application -->
  @@ -128,9 +130,11 @@
                 dest="${build.examples}/WEB-INF/${taglib.name}.tld"/>
       <copyfile src="${dist.library}"
                 dest="${build.examples}/WEB-INF/lib/${taglib.name}.jar"/>
  +  <!--
       <javac srcdir="${examples.src}/src"
              destdir="${build.examples}/WEB-INF/classes"
              classpath="${servlet.jar}" debug="on"/>
  +    -->
     </target>
   
     <!-- Compile the tag library itself -->
  
  
  
  1.2       +5 -1      jakarta-taglibs/sql/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/sql/build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.xml	2000/05/10 13:00:23	1.1
  +++ build.xml	2000/05/28 13:32:10	1.2
  @@ -1,5 +1,5 @@
   <!-- ANT Build Script for the "sql" Custom Tag Library -->
  -<!-- $Id: build.xml,v 1.1 2000/05/10 13:00:23 nacho Exp $ -->
  +<!-- $Id: build.xml,v 1.2 2000/05/28 13:32:10 rubys Exp $ -->
   <project name="jspspec" default="main" basedir=".">
   
       <!-- ******************** Adjustable Properties *********************** -->
  @@ -115,9 +115,11 @@
     <!-- Compile the documentation application -->
     <target name="documentation" depends="prepare">
       <copydir src="${doc.src}/conf"      dest="${build.doc}/WEB-INF"/>
  +   <!--
       <copydir src="${doc.src}/web"       dest="${build.doc}"/>
       <javac srcdir="${doc.src}/src"   destdir="${build.doc}/WEB-INF/classes"
              classpath="${servlet.jar}" debug="on"/>
  +     -->
     </target>
   
     <!-- Compile the examples application -->
  @@ -128,9 +130,11 @@
                 dest="${build.examples}/WEB-INF/${taglib.name}.tld"/>
       <copyfile src="${dist.library}"
                 dest="${build.examples}/WEB-INF/lib/${taglib.name}.jar"/>
  +   <!--
       <javac srcdir="${examples.src}/src"
              destdir="${build.examples}/WEB-INF/classes"
              classpath="${servlet.jar}" debug="on"/>
  +     -->
     </target>
   
     <!-- Compile the tag library itself -->
  
  
  

Mime
View raw message