dirkv       02/01/11 05:33:38

  Modified:    .        build.xml
  Log:
  antlr task to process slide.g
  new client jars with same naming conventions as the server ones
  
  Revision  Changes    Path
  1.141     +59 -10    jakarta-slide/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/build.xml,v
  retrieving revision 1.140
  retrieving revision 1.141
  diff -u -r1.140 -r1.141
  --- build.xml 3 Jan 2002 21:30:16 -0000       1.140
  +++ build.xml 11 Jan 2002 13:33:38 -0000      1.141
  @@ -54,6 +54,7 @@
     <property name="log4j.jar"             value="./lib/log4j.jar"/>
     <property name="hsqldb.jar"            value="./lib/hsqldb.jar"/>
     <property name="hsqldb.license"        value="./lib/hsqldb.license"/>
  +  <property name="antlr.jar"             value="./lib/antlr.jar"/>
     <property name="commons-dbcp.jar"      value="./lib/commons-dbcp.jar"/>
     <property name="commons-pool.jar"      value="./lib/commons-pool.jar"/>
     <property name="commons-modeler.jar"   value="./lib/commons-modeler.jar"/>
  @@ -179,6 +180,7 @@
       <pathelement location="${ant.jar}"/>
       <pathelement location="${commons-httpclient.jar}"/>
       <pathelement location="${slide.build}/classes"/>
  +    <pathelement location="${antlr.jar}"/>
     </path>
   
     <path id="examples.classpath">
  @@ -301,6 +303,9 @@
       <available property="modeler.present"
        classname="org.apache.commons.modeler.Registry"
        classpath="${commons-modeler.jar}" />
  +    <available property="antlr.present"
  +     classname="antlr.Parser"
  +     classpath="${antlr.jar}" />
       <available property="httpclient.present"
        classname="org.apache.commons.httpclient.HttpClient"
        classpath="${commons-httpclient.jar}" />
  @@ -357,6 +362,7 @@
       <echo message="sax.present (must be present) = ${sax.present}" />
       <echo message="jta.present (must be present) = ${jta.present}" />
       <echo message="httpclient.present (must be present) = ${httpclient.present}" />
  +    <echo message="antlr.present (must be present) = ${antlr.present}" />
   
       <echo message="--- Optional Libraries ---" />
   
  @@ -600,8 +606,7 @@
       <mkdir dir="${webdavclient.build}" />
       <mkdir dir="${webdavclient.build}/bin" />
       <mkdir dir="${webdavclient.build}/classes" />
  -    <mkdir dir="${webdavclient.build}/conf" />
  -    <mkdir dir="${webdavclient.build}/logs" />
  +    <mkdir dir="${webdavclient.build}/src/org/apache/webdav/cmd" />
       <mkdir dir="${slide.build}/doc/clientjavadoc" />
   
       <copy todir="${webdavclient.build}/classes">
  @@ -610,6 +615,12 @@
         </fileset>
       </copy>
   
  +    <copy file="src/webdav/client/src/org/apache/webdav/cmd/Slide.java"
  +     tofile="${webdavclient.build}/src/org/apache/webdav/cmd/Slide.java" />
  +    <replace  file="${webdavclient.build}/src/org/apache/webdav/cmd/Slide.java"
  +     token="$$VERSION$$" value="${version}" />
  +
  +
     </target>
   
   
  @@ -618,7 +629,10 @@
     <!-- =================================================================== -->
     <target name="webdav-client" depends="webdav-client-prepare">
   
  -    <javac srcdir="src/webdav/client/src"
  +    <antlr target="src/webdav/client/src/org/apache/webdav/cmd/Client.g"
  +           outputdirectory="${webdavclient.build}/src/org/apache/webdav/cmd" />
  +
  +    <javac srcdir="src/webdav/client/src:${webdavclient.build}/src"
        destdir="${webdavclient.build}/classes"
        debug="${compile.debug}" 
        deprecation="${compile.deprecation}"
  @@ -626,6 +640,10 @@
        excludes="**/CVS/**,**/package.html">
         <classpath refid="webdavclient.classpath"/>
         <exclude name="**/ant/**" unless="ant.present" />
  +      <exclude name="src/webdav/client/src/org/apache/webdav/cmd/ClientLexer.java" 
/>
  +      <exclude name="src/webdav/client/src/org/apache/webdav/cmd/ClientParser.java" 
/>
  +      <exclude 
name="src/webdav/client/src/org/apache/webdav/cmd/ClientParserTokenTypes.java" />
  +      <exclude name="src/webdav/client/src/org/apache/webdav/cmd/Slide.java" />
       </javac>
   
       <copy todir="${webdavclient.build}/bin">
  @@ -654,8 +672,6 @@
       <mkdir dir="${webdavclient.dist}" />
       <mkdir dir="${webdavclient.dist}/bin" />
       <mkdir dir="${webdavclient.dist}/lib" />
  -    <mkdir dir="${webdavclient.dist}/conf" />
  -    <mkdir dir="${webdavclient.dist}/logs" />
       <mkdir dir="${slide.dist}/doc/clientjavadoc" />
     </target>
   
  @@ -702,25 +718,58 @@
        token="$$VERSION$$" value="${version}" />
   
       <echo message="Building DAV Client library JAR file" />
  -    <jar jarfile="${webdavclient.dist}/lib/webdavlib.jar"
  +    <jar jarfile="${webdavclient.dist}/lib/slide-webdavlib.jar"
        basedir="${webdavclient.build}/classes"
        manifest="${webdavclient.build}/classes/MANIFEST.MF"
  -     
includes="LICENSE,RUNNING.txt,README,CHANGELOG,org/apache/util/**,org/apache/webdav/lib/**,org/apache/webdav/util/**"
 />
  +     
includes="org/apache/util/**,org/apache/webdav/lib/**,org/apache/webdav/util/**">
  +       <metainf dir=".">
  +         <include name="LICENSE"/>
  +       </metainf>
  +     </jar>
   
       <echo message="Copying libraries" />
  +    <copy todir="${webdavclient.dist}/lib" file="${antlr.jar}" />
       <copy todir="${webdavclient.dist}/lib" file="${jaxp.jar}" />
       <copy todir="${webdavclient.dist}/lib" file="${xmlapi.jar}" />
       <!--copy todir="${webdavclient.dist}/lib" file="${commons-httpclient.jar}" /-->
       <jar jarfile="${webdavclient.dist}/lib/commons-httpclient.jar"
        basedir="${webdavclient.build}/classes"
        manifest="${webdavclient.build}/classes/MANIFEST.MF"
  -     includes="org/apache/commons/httpclient/**" />
  +     includes="org/apache/commons/httpclient/**">
  +       <metainf dir=".">
  +         <include name="LICENSE"/>
  +       </metainf>
  +     </jar>
   
       <echo message="Building DAV Client JAR" />
  -    <jar jarfile="${webdavclient.dist}/lib/webdav.jar"
  +    <jar jarfile="${webdavclient.dist}/lib/slide-client.jar"
  +     basedir="${webdavclient.build}/classes"
  +     manifest="${webdavclient.build}/classes/MANIFEST.MF"
  +     includes="org/apache/webdav/cmd/**">
  +       <metainf dir=".">
  +         <include name="LICENSE"/>
  +       </metainf>
  +     </jar>
  +
  +    <echo message="Building DAV Anttasks JAR" />
  +    <jar jarfile="${webdavclient.dist}/lib/slide-anttasks.jar"
  +     basedir="${webdavclient.build}/classes"
  +     manifest="${webdavclient.build}/classes/MANIFEST.MF"
  +     includes="org/apache/webdav/ant/**">
  +       <metainf dir=".">
  +         <include name="LICENSE"/>
  +       </metainf>
  +     </jar>
  +
  +    <echo message="Building DAV Client UI JAR" />
  +    <jar jarfile="${webdavclient.dist}/lib/slide-swing.jar"
        basedir="${webdavclient.build}/classes"
        manifest="${webdavclient.build}/classes/MANIFEST.MF"
  -     
includes="LICENSE,RUNNING.txt,README,CHANGELOG,org/apache/webdav/**,org/apache/webdav/util/**,org/apache/util/**,images/**"
  />
  +     includes="org/apache/webdav/ui/**,images/**">
  +       <metainf dir=".">
  +         <include name="LICENSE"/>
  +       </metainf>
  +     </jar>
   
     </target>
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to