Changeset 15234

Show
Ignore:
Timestamp:
29.04.2008 11:30:53 (12 years ago)
Author:
ak19
Message:

Better processing of chosen zip file type in target generate-download

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • other-projects/trunk/gs3-webservices-democlient/build.xml

    r15223 r15234  
    2626 <property name="exec.jar.name" value="GS3democlient.jar" /> <!-- name of the executable--> 
    2727 <property name="download.zip.name" value="gs3_webservices_democlient" /> 
    28  <property name="zip.excludes" value="${bin}/**,gs3democlient.properties" /> 
     28 <property name="zip.excludes" value="bin/**,gs3democlient.properties" /> 
    2929 
    3030  <!-- ============ project classpath: everything in the lib folder =================== --> 
     
    4747    <echo>- generate-download</echo> 
    4848    <echo>  for generating the zip/gzip/bzip file of the project</echo> 
     49    <echo>- ant clean-democlient</echo> 
     50    <echo>  for deleting the *.class files from the GS3democlient's source</echo> 
    4951    <echo>- ant clean</echo> 
    50     <echo>  for deleting the *.class files from the GS3democlient's source</echo> 
    51     <echo>- ant clean-all</echo> 
    5252    <echo>  for deleting the *.class files from the GS3democlient and GS3Fedora sources</echo> 
    53     <echo>- ant retain-sources-only</echo> 
     53    <echo>- ant dist-clean</echo> 
    5454    <echo>  for deleting the *.class files from the sources, the QBRdata.jar, fedoraGS3.jar, executable jar file, and any zips of the project folder</echo>  
    5555</target> 
     
    6767</target> 
    6868 
    69 <target name="generate-download" description="Generates the zip file of the lib and src folders and the executable ${exec.jar.name} file" depends="get-ziptype,ensure-exec-jar"> 
     69<target name="generate-download" description="Generates the zip file of the lib and src folders and the executable ${exec.jar.name} file" depends="get-ziptype,ensure-exec-jar" if="zip.type"> 
    7070     <mkdir dir="${bin}" /> 
    71      <antcall target="create-gzip"/> 
    72      <antcall target="create-zip"/> 
    73      <antcall target="create-bzip"/> 
     71     <antcall target="create-${zip.type}"/> 
    7472</target> 
    7573 
     
    8381 
    8482<!-- Cleaning targets --> 
    85 <target name="clean" description="Removes all class files from the GS3demo-client"> 
     83<target name="clean-democlient" description="Removes all class files from the GS3demo-client"> 
    8684   <delete> 
    8785    <fileset dir="${democlient.src}" includes="**/*.class"/> 
     
    8987</target> 
    9088 
    91 <target name="clean-all" description="Removes all class files from the GS3DemoClient and GS3Fedora source folders" depends="clean"> 
     89<target name="clean" description="Removes all class files from the GS3DemoClient and GS3Fedora source folders" depends="clean-democlient"> 
    9290   <delete> 
    9391    <fileset dir="${fedorags3.src}" includes="**/*.class"/> 
     
    9593</target> 
    9694 
    97 <target name="retain-sources-only" description="Removes the project-specific jars fedoraGS3.jar, QBRdata.jar, ${exec.jar.name} files AND all class files from the GS3DemoClient and GS3Fedora source folders" depends="clean-all"> 
     95<target name="dist-clean" description="Removes the project-specific jars fedoraGS3.jar, QBRdata.jar, ${exec.jar.name} files AND all class files from the GS3DemoClient and GS3Fedora source folders" depends="clean"> 
    9896   <delete> 
    9997    <fileset file="${basedir}/lib/fedoraGS3.jar"/> 
     
    166164<!-- User input for generating compressed output file for one of the chosen file types (zip, gzip, or bzip)--> 
    167165<target name="create-gzip" if="gzip" description="User chose to create a tar.gz file of the project"> 
    168     <tar destfile="${bin}/${download.zip.name}.tar" basedir="${basedir}" excludes="${zip.excludes}"/> 
     166    <tar destfile="${bin}/${download.zip.name}.tar" basedir="${basedir}" excludes="${zip.excludes}" /> 
    169167    <gzip destfile="${bin}/${download.zip.name}.tar.gz" src="${bin}/${download.zip.name}.tar" /> 
    170168    <delete file="${bin}/${download.zip.name}.tar"/> 
     
    197195    </condition> 
    198196  </target> 
    199  
    200197</project>