You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by oz...@apache.org on 2004/01/13 11:33:01 UTC

cvs commit: jakarta-slide/webdavclient build.xml

ozeigermann    2004/01/13 02:33:01

  Modified:    webdavclient build.xml
  Added:       webdavclient/lib antlr-tools.jar antlr.jar antlr.license
  Log:
  - Patched build file with patch from Martin Dulisch. 
  - Added antlr libs
  
  Revision  Changes    Path
  1.1                  jakarta-slide/webdavclient/lib/antlr-tools.jar
  
  	<<Binary file>>
  
  
  1.1                  jakarta-slide/webdavclient/lib/antlr.jar
  
  	<<Binary file>>
  
  
  1.1                  jakarta-slide/webdavclient/lib/antlr.license
  
  Index: antlr.license
  ===================================================================
  
  SOFTWARE RIGHTS
  $Id: antlr.license,v 1.1 2002/01/11 13:15:56 dirkv Exp $
  
  ANTLR 1989-2000 Developed by jGuru.com (MageLang Institute), 
  http://www.ANTLR.org  and http://www.jGuru.com
  
  We reserve no legal rights to the ANTLR--it is fully in the
  public domain. An individual or company may do whatever
  they wish with source code distributed with ANTLR or the
  code generated by ANTLR, including the incorporation of
  ANTLR, or its output, into commerical software.
  
  We encourage users to develop software with ANTLR. However,
  we do ask that credit is given to us for developing
  ANTLR. By "credit", we mean that if you use ANTLR or
  incorporate any source code into one of your programs
  (commercial product, research project, or otherwise) that
  you acknowledge this fact somewhere in the documentation,
  research report, etc... If you like ANTLR and have
  developed a nice tool with the output, please mention that
  you developed it using ANTLR. In addition, we ask that the
  headers remain intact in our source code. As long as these
  guidelines are kept, we expect to continue enhancing this
  system and expect to make other tools available as they are
  completed.
  
  The primary ANTLR guy:
  
  Terence Parr
  http://www.jGuru.com
  parrt@jguru.com
  
  
  
  1.2       +86 -75    jakarta-slide/webdavclient/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/webdavclient/build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.xml	12 Jan 2004 11:47:29 -0000	1.1
  +++ build.xml	13 Jan 2004 10:33:01 -0000	1.2
  @@ -15,138 +15,149 @@
       <property name="name" value="Jakarta-Slide"/>
       <property name="year" value="2002"/>
       <property name="version" value="2.0.0"/>
  -    <property name="project" value="jakarta-slide-webdavlib"/>
  -    <property name="final.name" value="${project}-${version}"/>
  -    <property name="final-src.name" value="${project}-src-${version}"/>
  +    <property name="project" value="jakarta-slide"/>
  +    <property name="clientlib.final.name" value="${project}-webdavlib-${version}"/>
  +    <property name="cmd.final.name" value="${project}-commandline-${version}"/>
       <!-- =================================================================== -->
       <!-- Build Properties                                                    -->
       <!-- =================================================================== -->
       <property name="slide.build" value="./build"/>
       <property name="clientlib.build" value="${slide.build}/clientlib"/>
  +    <property name="cmd.build" value="${slide.build}/commandline"/>
  +    <property name="slide.dist" value="./dist"/>
  +    <property name="clientlib.dist" value="${slide.dist}"/>
  +    <property name="cmd.dist" value="${slide.dist}"/>
  +    <property name="clientlib.javadoc.path" value="doc/clientjavadoc"/>
       <!-- =================================================================== -->
       <!-- Dependencies Properties                                             -->
       <!-- =================================================================== -->
       <property name="commons-httpclient.jar" value="lib/commons-httpclient.jar"/>
  +    <property name="antlr.jar" value="lib/antlr.jar"/>
       <!-- =================================================================== -->
       <!-- Classpaths                                                          -->
       <!-- =================================================================== -->
  -    <path id="webdavclient.classpath">
  -        <!--pathelement location="${jaxp.jar}"/>
  -        <pathelement location="${xmlapi.jar}"/>
  -        <pathelement location="${ant.jar}"/-->
  +    <path id="clientlib.classpath">
           <pathelement location="${commons-httpclient.jar}"/>
  -        <!--pathelement location="${slide.build}/classes"/>
  +    </path>
  +    <path id="cmd.classpath">
           <pathelement location="${antlr.jar}"/>
  -        <pathelement location="${antlr-tools.jar}"/-->
  +        <pathelement location="${commons-httpclient.jar}"/>
  +        <pathelement location="${clientlib.build}/classes"/>
       </path>
       <!-- =================================================================== -->
  -    <!-- Prepare                                                             -->
  +    <!-- Prepare build                                                       -->
       <!-- =================================================================== -->
  -    <target name="prepare" depends="">
  +    <target name="prepare-build" depends="">
           <mkdir dir="${slide.build}"/>
           <mkdir dir="${clientlib.build}"/>
           <mkdir dir="${clientlib.build}/classes"/>
  -        <mkdir dir="${slide.build}/lib"/>
  -        <mkdir dir="${clientlib.build}/doc/javadoc"/>
  +        <mkdir dir="${clientlib.build}/${clientlib.javadoc.path}"/>
  +    </target>
  +    <!-- =================================================================== -->
  +    <!-- Prepare commandline build                                           -->
  +    <!-- =================================================================== -->
  +    <target name="prepare-build-cmd" depends="prepare-build">
  +        <mkdir dir="${cmd.build}"/>
  +        <mkdir dir="${cmd.build}/classes"/>
  +    </target>
  +    <!-- =================================================================== -->
  +    <!-- Prepare dist                                                        -->
  +    <!-- =================================================================== -->
  +    <target name="prepare-dist" depends="">
  +        <mkdir dir="${slide.dist}"/>
  +        <mkdir dir="${clientlib.dist}"/>
  +        <mkdir dir="${clientlib.dist}/lib"/>
  +        <mkdir dir="${clientlib.dist}/${clientlib.javadoc.path}"/>
  +    </target>
  +    <!-- =================================================================== -->
  +    <!-- Prepare commandline dist                                            -->
  +    <!-- =================================================================== -->
  +    <target name="prepare-dist-cmd" depends="prepare-dist">
  +        <mkdir dir="${cmd.dist}"/>
  +        <mkdir dir="${cmd.dist}/lib"/>
  +        <mkdir dir="${cmd.dist}/bin"/>
       </target>
       <!-- =================================================================== -->
       <!-- Build All : Main, Doc and JavaDoc                                   -->
       <!-- =================================================================== -->
  -    <target name="all" depends="clean,dist-clientlib,javadoc-clientlib" 
  +    <target name="all" depends="clean,dist-clientlib,dist-cmd" 
   	    description="Delete previous build and make distribution"/>
       <!-- =================================================================== -->
  +    <!-- Clean build and distribution directories of the DAV client          -->
  +    <!-- =================================================================== -->
  +    <target name="clean">
  +        <delete dir="${slide.build}"/>
  +        <delete dir="${slide.dist}"/>
  +    </target>
  +    <!-- =================================================================== -->
       <!-- Build Slide WebDAV client lib                                       -->
       <!-- =================================================================== -->
  -    <target name="build-clientlib" depends="prepare" description="Build the WebDAV client lib">
  +    <target name="build-clientlib" depends="prepare-build" description="Build the WebDAV client lib">
           <echo message="Building Slide WebDAV client lib"/>
           <javac srcdir="clientlib/src/java" destdir="${clientlib.build}/classes" 
   	       debug="${compile.debug}" deprecation="${compile.deprecation}" 
   	       optimize="${compile.optimize}" excludes="**/CVS/**">
  -            <classpath refid="webdavclient.classpath"/>
  +            <classpath refid="clientlib.classpath"/>
           </javac>
  -        <!--copy todir="${slide.build}/clientlib/lib">
  -            <fileset dir="lib">
  -                <include name="commons-httpclient.jar,commons-logging.jar"/>
  -            </fileset>
  -        </copy-->
       </target>
       <!-- =================================================================== -->
  -    <!-- Clean build and distribution directories of the DAV client          -->
  +    <!-- Build Slide commandline client                                      -->
       <!-- =================================================================== -->
  -    <target name="clean">
  -        <delete dir="${slide.build}"/>
  +    <target name="build-cmd" depends="prepare-build-cmd,build-clientlib" 
  +	    description="Build the commandline client">
  +        <echo message="Building Slide commandline client"/>
  +        <javac srcdir="commandline/src/java" destdir="${cmd.build}/classes" 
  +	       debug="${compile.debug}" deprecation="${compile.deprecation}" 
  +	       optimize="${compile.optimize}" excludes="**/CVS/**">
  +            <classpath refid="cmd.classpath"/>
  +        </javac>
       </target>
       <!-- =================================================================== -->
       <!-- Javadoc of the WebDAV client                                        -->
       <!-- =================================================================== -->
  -    <target name="javadoc-clientlib" depends="prepare" description="Create WebDAV client javadocs">
  +    <target name="javadoc-clientlib" depends="prepare-build" description="Create WebDAV client javadocs">
           <property name="copyright" value=""/>
  -        <javadoc sourcepath="clientlib/src/java" destdir="${clientlib.build}/doc/javadoc" 
  +        <javadoc sourcepath="clientlib/src/java" destdir="${clientlib.build}/${clientlib.javadoc.path}" 
   		 doctitle="Slide ${version} WebDAV Client JavaDoc" windowtitle="Slide WebDAV Client Javadoc" 
   		 package="true" noindex="false" author="true" version="true" packagenames="org.apache.webdav.lib.*">
  -            <classpath refid="webdavclient.classpath"/>
  +            <classpath refid="clientlib.classpath"/>
               <link href="http://jakarta.apache.org/commons/httpclient/apidocs/"/>
           </javadoc>
  -        <!--copy todir="${slide.dist}/doc/clientjavadoc">
  -            <fileset dir="${slide.build}/doc/clientjavadoc"/>
  -        </copy-->
       </target>
       <!-- =================================================================== -->
       <!-- Build a WebDAV client distribution                                     -->
       <!-- =================================================================== -->
  -    <target name="dist-clientlib" depends="build-clientlib"
  +    <target name="dist-clientlib" depends="build-clientlib,prepare-dist,javadoc-clientlib"
   	    description="Jar WebDAV client lib and copy required jar libs">
  -        <copy todir="${slide.build}/lib">
  +        <copy todir="${clientlib.dist}/lib">
               <fileset dir="lib">
  -                <include name="*.jar"/>
  +                <include name="commons-*.jar"/>
               </fileset>
           </copy>
  -        <jar jarfile="${slide.build}/lib/${final.name}.jar" basedir="${clientlib.build}/classes"/> 
  +        <jar jarfile="${clientlib.dist}/lib/${clientlib.final.name}.jar" basedir="${clientlib.build}/classes"/> 
  +        <copy todir="${clientlib.dist}/${clientlib.javadoc.path}">
  +            <fileset dir="${clientlib.build}/${clientlib.javadoc.path}"/>
  +        </copy>
       </target>
  -
  -
  -    <!--target name="webdav-client-dist" depends="webdav-client, webdav-client-dist-prepare,webdav-client-javadoc,webdav-client-dist-xml" description="Build the WebDAV client library and command-line application">
  -        <copy todir="${webdavclient.dist}/bin">
  -            <fileset dir="${webdavclient.build}/bin">
  +    <!-- =================================================================== -->
  +    <!-- Build a commandline client distribution                             -->
  +    <!-- =================================================================== -->
  +    <target name="dist-cmd" depends="build-cmd,dist-clientlib,prepare-dist-cmd"
  +	    description="Distribute commandline client">
  +        <jar jarfile="${cmd.dist}/lib/${cmd.final.name}.jar" basedir="${cmd.build}/classes"/> 
  +        <copy todir="${cmd.dist}/lib">
  +            <fileset dir="lib">
  +                <include name="commons-*.jar"/>
  +                <include name="antlr*.*"/>
  +            </fileset>
  +        </copy>
  +        <copy todir="${cmd.dist}/bin">
  +            <fileset dir="commandline/src/bin">
                   <include name="**/*.bat"/>
                   <include name="**/*.sh"/>
               </fileset>
           </copy>
  -        <chmod dir="${webdavclient.dist}/bin" perm="+x" includes="**/*.sh"/>
  -        <copy file="src/etc/MANIFEST.MF" tofile="${webdavclient.build}/classes/MANIFEST.MF"/>
  -        <replace file="${webdavclient.build}/classes/MANIFEST.MF" token="$$VERSION$$" value="${version}"/>
  -        <echo message="Copying libraries"/>
  -        <copy todir="${webdavclient.dist}/lib" file="${antlr.jar}"/>
  -        <copy todir="${webdavclient.dist}/lib" file="${commons-httpclient.jar}"/>
  -        <copy todir="${webdavclient.dist}/lib" file="${commons-logging.jar}"/>
  -        <echo message="Building DAV Client library JAR file"/>
  -        <jar jarfile="${webdavclient.dist}/lib/slide-webdavlib.jar" basedir="${webdavclient.build}/classes" manifest="${webdavclient.build}/classes/MANIFEST.MF" includes="org/apache/util/**,org/apache/webdav/lib/**,org/apache/webdav/util/**">
  -            <metainf dir=".">
  -                <include name="LICENSE"/>
  -            </metainf>
  -        </jar>
  -        <echo message="Building DAV Client 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 Swing JAR"/>
  -        <jar jarfile="${webdavclient.dist}/lib/slide-swing.jar" basedir="${webdavclient.build}/classes" manifest="${webdavclient.build}/classes/MANIFEST.MF" includes="org/apache/webdav/ui/**">
  -            <metainf dir=".">
  -                <include name="LICENSE"/>
  -            </metainf>
  -        </jar>
  -    </target>
  -    <target name="webdav-client-dist-xml" unless="jvm14.present">
  -        <copy todir="${webdavclient.dist}/lib" file="${jaxp.jar}"/>
  -        <copy todir="${webdavclient.dist}/lib" file="${xmlapi.jar}"/>        
  -    </target-->
  +        <chmod dir="${cmd.dist}/bin" perm="+x" includes="**/*.sh"/>
  +    </target>
   </project>
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org