DPML Notify

[mcconnell AT netcompartner.com]

Author: mcconnell
Date: Fri Feb  4 08:28:04 2005
New Revision: 1718

Added:
   development/main/home/etc/packagelists/ant/
      - copied from r1709, development/main/home/etc/ant/
   development/main/home/etc/packagelists/ant/package-list
      - copied unchanged from r1717, 
development/main/home/etc/ant/package-list
   development/main/home/etc/packagelists/commons-cli/
      - copied from r1709, development/main/home/etc/commons-cli/
   development/main/home/etc/packagelists/commons-cli/package-list
      - copied unchanged from r1717, 
development/main/home/etc/commons-cli/package-list
   development/main/home/etc/packagelists/jdk/
      - copied from r1709, development/main/home/etc/jdk/
   development/main/home/etc/packagelists/jdk/package-list
      - copied unchanged from r1717, 
development/main/home/etc/jdk/package-list
Removed:
   development/main/home/etc/ant/
   development/main/home/etc/commons-cli/
   development/main/home/etc/jdk/
Modified:
   development/main/home/   (props changed)
   development/main/home/build.xml
   development/main/home/standard.xml
   development/main/home/transit/build.xml
   development/main/home/util/build.xml
Log:
Add asc signature generation on modules, jar files and the binary 
distributions.

Modified: development/main/home/build.xml
==============================================================================
--- development/main/home/build.xml     (original)
+++ development/main/home/build.xml     Fri Feb  4 08:28:04 2005
@@ -55,6 +55,25 @@
       </tarfileset>
     </tar>
     <checksum fileext=".md5" 
file="${dist}/${project.name}-${project.version}.tar.gz"/>
+    <antcall target="dist.asc"/>
+  </target>
+
+  <target name="dist.asc" if="gpg.declared">
+    <echo message="Generating ASC"/>
+    <exec executable="${project.gpg.exe}">
+      <arg value="-a"/>
+      <arg value="-b"/>
+      <arg value="-o"/>
+      <arg value="${dist}/${project.name}-${project.version}.zip.asc"/>
+      <arg value="${dist}/${project.name}-${project.version}.zip"/>
+    </exec>
+    <exec executable="${project.gpg.exe}">
+      <arg value="-a"/>
+      <arg value="-b"/>
+      <arg value="-o"/>
+      <arg value="${dist}/${project.name}-${project.version}.tar.gz.asc"/>
+      <arg value="${dist}/${project.name}-${project.version}.tar.gz"/>
+    </exec>
   </target>
 
   <target name="bundle" depends="install.children">

Modified: development/main/home/standard.xml
==============================================================================
--- development/main/home/standard.xml  (original)
+++ development/main/home/standard.xml  Fri Feb  4 08:28:04 2005
@@ -27,6 +27,8 @@
   -->
 
   <property environment="ENV"/>
+  <property file="${basedir}/user.properties"/>
+  <property file="${home}/user.properties"/>
   <property file="${basedir}/build.properties"/>
   <property file="${home}/common.properties"/>
 
@@ -34,6 +36,10 @@
     <isset property="ENV.DPML_HOME"/>
   </condition>
 
+  <condition property="gpg.declared" value="false">
+    <isset property="project.gpg.exe"/>
+  </condition>
+
   <target name="setup" depends="dpml-home-setup,junit-setup"/>
 
   <target name="dpml-home-setup" 
depends="dpml-home-environment,dpml-home-default,dpml-home-create"/>
@@ -59,7 +65,6 @@
   </target>
 
   <target name="junit-setup" depends="junit-test" unless="junit.available">
-    
     <property name="junit.url" 
value="${dpml.repository}/junit/jars/${junit.filename}"/>
     <echo>
 
#----------------------------------------------------------------------------------
@@ -278,10 +283,12 @@
     <available file="${target.classes.dir}" 
property="target.classes.available"/>
   </target>
 
-  <target name="package" depends="build,package.setup" 
if="target.classes.available">
-    <!--
-    Create the jar file using the contents of target/classes.
-    -->
+  <target name="package" depends="package.setup" 
if="target.classes.available">
+    <antcall target="jar"/>
+    <antcall target="jar.asc"/>
+  </target>
+
+  <target name="jar" depends="build">
     <mkdir dir="${target.deliverables.jars.dir}"/>
     <jar destfile="${target.deliverables.jars.dir}/${project.filename}"
        basedir="${target.classes.dir}"
@@ -300,6 +307,17 @@
     <checksum fileext=".md5" 
file="${target.deliverables.jars.dir}/${project.filename}"/>
   </target>
 
+  <target name="jar.asc" if="gpg.declared">
+    <echo message="Generating ASC"/>
+    <exec executable="${project.gpg.exe}">
+      <arg value="-a"/>
+      <arg value="-b"/>
+      <arg value="-o"/>
+      <arg value="${target.deliverables.jars.dir}/${project.filename}.asc"/>
+      <arg value="${target.deliverables.jars.dir}/${project.filename}"/>
+    </exec>
+  </target>
+
   <!--
   Compile the tests using the classes as the classpath and
   place results into the target/test-classes directory.

Modified: development/main/home/transit/build.xml
==============================================================================
--- development/main/home/transit/build.xml     (original)
+++ development/main/home/transit/build.xml     Fri Feb  4 08:28:04 2005
@@ -35,6 +35,18 @@
     <move file="${basedir}/target/project.module"
       tofile="${module.file}"/>
     <checksum fileext=".md5" file="${module.file}"/>
+    <antcall target="module.asc"/>
+  </target>
+
+  <target name="module.asc" if="gpg.declared">
+    <echo message="Generating ASC"/>
+    <exec executable="${project.gpg.exe}">
+      <arg value="-a"/>
+      <arg value="-b"/>
+      <arg value="-o"/>
+      <arg value="${module.file}.asc"/>
+      <arg value="${module.file}"/>
+    </exec>
   </target>
 
   <target name="install" depends="standard.install,javadoc"/>
@@ -70,11 +82,11 @@
       <fileset dir="tools/target/build/main"/>
       <bottom><![CDATA[<i>Collective Work Copyright &#169; 2004-2005 The <a 
href="http://www.dpml.net";>Digial Product Meta Library.</a> All Rights 
Reserved.</i>]]></bottom>
       <link offline="true" href="http://java.sun.com/j2se/1.4/docs/api"; 
-         packagelistloc="${transit.home}/etc/jdk"/>
+         packagelistloc="${transit.home}/etc/packagelists/jdk"/>
       <link offline="true" href="http://www.dpml.net/api/commons-cli/1.0"; 
-         packagelistloc="${transit.home}/etc/commons-cli"/>
+         packagelistloc="${transit.home}/etc/packagelists/commons-cli"/>
       <link offline="true" href="http://www.dpml.net/api/ant/1.6.2"; 
-         packagelistloc="${transit.home}/etc/ant"/>
+         packagelistloc="${transit.home}/etc/packagelists/ant"/>
       <link offline="true" 
href="http://www.dpml.net/api/dpml/util/${project.version}"; 
          packagelistloc="${transit.home}/util/target/api"/>
       <classpath>

Modified: development/main/home/util/build.xml
==============================================================================
--- development/main/home/util/build.xml        (original)
+++ development/main/home/util/build.xml        Fri Feb  4 08:28:04 2005
@@ -35,6 +35,18 @@
     <move file="${basedir}/target/project.module"
       tofile="${module.file}"/>
     <checksum fileext=".md5" file="${module.file}"/>
+    <antcall target="module.asc"/>
+  </target>
+
+  <target name="module.asc" if="gpg.declared">
+    <echo message="Generating ASC"/>
+    <exec executable="${project.gpg.exe}">
+      <arg value="-a"/>
+      <arg value="-b"/>
+      <arg value="-o"/>
+      <arg value="${module.file}.asc"/>
+      <arg value="${module.file}"/>
+    </exec>
   </target>
 
   <target name="install" depends="standard.install,javadoc"/>