mcconnell    2004/02/04 08:16:49

  Modified:    repository maven.xml
  Log:
  Fix maven_gpg_exe handling.
  
  Revision  Changes    Path
  1.14      +18 -18    avalon/repository/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/repository/maven.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- maven.xml 3 Feb 2004 09:38:58 -0000       1.13
  +++ maven.xml 4 Feb 2004 16:16:49 -0000       1.14
  @@ -82,9 +82,9 @@
         <util:file var="jarFile" name="${maven.build.dir}/jars/${path}.jar"/>
         <j:if test="${jarFile.exists()}">
           <checksum file="${jarFile}"/>
  -        <j:if test="${maven.gpg.exe != null}">
  -          <ant:exec executable="${maven.gpg.exe}">
  -            <ant:arg value="--armour"/>
  +        <j:if test="${maven_gpg_exe != null}">
  +          <ant:exec executable="${maven_gpg_exe}">
  +            <ant:arg value="-a"/>
               <ant:arg value="--yes"/>
               <ant:arg value="-b"/>
               <ant:arg value="${jarFile}"/>
  @@ -94,9 +94,9 @@
         <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.exe != null}">
  -          <ant:exec executable="${maven.gpg.exe}">
  -            <ant:arg value="--armour"/>
  +        <j:if test="${maven_gpg_exe != null}">
  +          <ant:exec executable="${maven_gpg_exe}">
  +            <ant:arg value="-a"/>
               <ant:arg value="--yes"/>
               <ant:arg value="-b"/>
               <ant:arg value="${metaFile}"/>
  @@ -194,9 +194,9 @@
       />
       <ant:delete file="${maven.dist.dir}/${binary.name}.tar"/>
       <checksum file="${maven.dist.dir}/${binary.name}.tar.gz"/>
  -    <j:if test="${maven.gpg.exe != null}">
  -      <ant:exec executable="${maven.gpg.exe}">
  -        <ant:arg value="--armour"/>
  +    <j:if test="${maven_gpg_exe != null}">
  +      <ant:exec executable="${maven_gpg_exe}">
  +        <ant:arg value="-a"/>
           <ant:arg value="-b"/>
           <ant:arg value="${maven.dist.dir}/${binary.name}.tar.gz"/>
         </ant:exec>
  @@ -207,9 +207,9 @@
         <ant:zipfileset dir="${maven.dist.bin.archive.dir}"/>
       </ant:zip>
       <checksum file="${maven.dist.dir}/${binary.name}.zip"/>
  -    <j:if test="${maven.gpg.exe != null}">
  -      <ant:exec executable="${maven.gpg.exe}">
  -        <ant:arg value="--armour"/>
  +    <j:if test="${maven_gpg_exe != null}">
  +      <ant:exec executable="${maven_gpg_exe}">
  +        <ant:arg value="-a"/>
           <ant:arg value="-b"/>
           <ant:arg value="${maven.dist.dir}/${binary.name}.zip"/>
         </ant:exec>
  @@ -231,9 +231,9 @@
       />
       <ant:delete file="${maven.dist.dir}/${source.name}.tar"/>
       <checksum file="${maven.dist.dir}/${source.name}.tar.gz"/>
  -    <j:if test="${maven.gpg.exe != null}">
  -      <ant:exec executable="${maven.gpg.exe}">
  -        <ant:arg value="--armour"/>
  +    <j:if test="${maven_gpg_exe != null}">
  +      <ant:exec executable="${maven_gpg_exe}">
  +        <ant:arg value="-a"/>
           <ant:arg value="-b"/>
           <ant:arg value="${maven.dist.dir}/${source.name}.tar.gz"/>
         </ant:exec>
  @@ -244,9 +244,9 @@
         <ant:zipfileset dir="${maven.dist.src.archive.dir}"/>
       </ant:zip>
       <checksum file="${maven.dist.dir}/${source.name}.zip"/>
  -    <j:if test="${maven.gpg.exe != null}">
  -      <ant:exec executable="${maven.gpg.exe}">
  -        <ant:arg value="--armour"/>
  +    <j:if test="${maven_gpg_exe != null}">
  +      <ant:exec executable="${maven_gpg_exe}">
  +        <ant:arg value="-a"/>
           <ant:arg value="-b"/>
           <ant:arg value="${maven.dist.dir}/${source.name}.zip"/>
         </ant:exec>
  
  
  

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

Reply via email to