avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon/repository maven.xml
Date Tue, 03 Feb 2004 09:22:51 GMT
mcconnell    2004/02/03 01:22:51

  Modified:    repository maven.xml
  Log:
  Correct my initial type and add missing existance tests.
  
  Revision  Changes    Path
  1.12      +32 -24    avalon/repository/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/repository/maven.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- maven.xml	3 Feb 2004 04:53:41 -0000	1.11
  +++ maven.xml	3 Feb 2004 09:22:51 -0000	1.12
  @@ -82,8 +82,8 @@
         <util:file var="jarFile" name="${maven.build.dir}/jars/${path}.jar"/>
         <j:if test="${jarFile.exists()}">
           <checksum file="${jarFile}"/>
  -        <j:if test="${maven.gpg.exec != null}">
  -          <ant:exec executable="${maven.gpg.exec}">
  +        <j:if test="${maven.gpg.exe != ''}">
  +          <ant:exec executable="${maven.gpg.exe}">
               <ant:arg value="--armour"/>
               <ant:arg value="--yes"/>
               <ant:arg value="-b"/>
  @@ -94,8 +94,8 @@
         <util:file var="metaFile" name="${maven.build.dir}/jars/${path}.jar.meta"/>
         <j:if test="${metaFile.exists()}">
           <checksum file="${metaFile}"/>
  -        <j:if test="${maven.gpg.exec != null}">
  -          <ant:exec executable="${maven.gpg.exec}">
  +        <j:if test="${maven.gpg.exe != ''}">
  +          <ant:exec executable="${maven.gpg.exe}">
               <ant:arg value="--armour"/>
               <ant:arg value="--yes"/>
               <ant:arg value="-b"/>
  @@ -194,22 +194,26 @@
       />
       <ant:delete file="${maven.dist.dir}/${binary.name}.tar"/>
       <checksum file="${maven.dist.dir}/${binary.name}.tar.gz"/>
  -    <ant:exec executable="${maven.gpg.exec}">
  -      <ant:arg value="--armour"/>
  -      <ant:arg value="-b"/>
  -      <ant:arg value="${maven.dist.dir}/${binary.name}.tar.gz"/>
  -    </ant:exec>
  +    <j:if test="${maven.gpg.exe != ''}">
  +      <ant:exec executable="${maven.gpg.exe}">
  +        <ant:arg value="--armour"/>
  +        <ant:arg value="-b"/>
  +        <ant:arg value="${maven.dist.dir}/${binary.name}.tar.gz"/>
  +      </ant:exec>
  +    </j:if>
   
       <!-- Create a zip file -->
       <ant:zip zipfile="${maven.dist.dir}/${binary.name}.zip">
         <ant:zipfileset dir="${maven.dist.bin.archive.dir}"/>
       </ant:zip>
       <checksum file="${maven.dist.dir}/${binary.name}.zip"/>
  -    <ant:exec executable="${maven.gpg.exec}">
  -      <ant:arg value="--armour"/>
  -      <ant:arg value="-b"/>
  -      <ant:arg value="${maven.dist.dir}/${binary.name}.zip"/>
  -    </ant:exec>
  +    <j:if test="${maven.gpg.exe != ''}">
  +      <ant:exec executable="${maven.gpg.exe}">
  +        <ant:arg value="--armour"/>
  +        <ant:arg value="-b"/>
  +        <ant:arg value="${maven.dist.dir}/${binary.name}.zip"/>
  +      </ant:exec>
  +    </j:if>
     </goal>
   
     <goal
  @@ -227,22 +231,26 @@
       />
       <ant:delete file="${maven.dist.dir}/${source.name}.tar"/>
       <checksum file="${maven.dist.dir}/${source.name}.tar.gz"/>
  -    <ant:exec executable="${maven.gpg.exec}">
  -      <ant:arg value="--armour"/>
  -      <ant:arg value="-b"/>
  -      <ant:arg value="${maven.dist.dir}/${source.name}.tar.gz"/>
  -    </ant:exec>
  +    <j:if test="${maven.gpg.exe != ''}">
  +      <ant:exec executable="${maven.gpg.exe}">
  +        <ant:arg value="--armour"/>
  +        <ant:arg value="-b"/>
  +        <ant:arg value="${maven.dist.dir}/${source.name}.tar.gz"/>
  +      </ant:exec>
  +    </j:if>
   
       <!-- Create a zip file -->
       <ant:zip zipfile="${maven.dist.dir}/${source.name}.zip">
         <ant:zipfileset dir="${maven.dist.src.archive.dir}"/>
       </ant:zip>
       <checksum file="${maven.dist.dir}/${source.name}.zip"/>
  -    <ant:exec executable="${maven.gpg.exec}">
  -      <ant:arg value="--armour"/>
  -      <ant:arg value="-b"/>
  -      <ant:arg value="${maven.dist.dir}/${source.name}.zip"/>
  -    </ant:exec>
  +    <j:if test="${maven.gpg.exe != ''}">
  +      <ant:exec executable="${maven.gpg.exe}">
  +        <ant:arg value="--armour"/>
  +        <ant:arg value="-b"/>
  +        <ant:arg value="${maven.dist.dir}/${source.name}.zip"/>
  +      </ant:exec>
  +    </j:if>
     </goal>
   
     <goal
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message