DPML Notify

[mcconnell AT netcompartner.com]

Author: mcconnell
Date: Fri Feb 18 18:25:37 2005
New Revision: 1816

Modified:
   development/main/home/build.xml
   development/main/magic/core/src/main/net/dpml/magic/model/Resource.java
   development/main/magic/core/src/main/net/dpml/magic/tasks/DistTask.java
Log:
add platform identifier into the dist artifacts

Modified: development/main/home/build.xml
==============================================================================
--- development/main/home/build.xml     (original)
+++ development/main/home/build.xml     Fri Feb 18 18:25:37 2005
@@ -201,7 +201,7 @@
 
   <target name="install.zip">
     <echo message="Generating ZIP dist"/>
-    <zip destfile="${dist}/${project.name}-${project.version}.zip" 
whenempty="create">
+    <zip destfile="${dist}/${project.name}-win32-${project.version}.zip" 
whenempty="create">
       <zipfileset dir="${bundle}">
         <include name="LICENSE.TXT"/>
         <include name="NOTICE.TXT"/>
@@ -220,24 +220,24 @@
         <exclude name="data/**"/>
       </zipfileset>
     </zip>
-    <checksum fileext=".md5" 
file="${dist}/${project.name}-${project.version}.zip"/>
+    <checksum fileext=".md5" 
file="${dist}/${project.name}-win32-${project.version}.zip"/>
     <antcall target="install.zip.asc"/>
   </target>
 
   <target name="install.zip.asc" if="gpg.declared">
-    <delete file="${dist}/${project.name}-${project.version}.zip.asc"/>
+    <delete file="${dist}/${project.name}-win32-${project.version}.zip.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"/>
+      <arg value="${dist}/${project.name}-win32-${project.version}.zip.asc"/>
+      <arg value="${dist}/${project.name}-win32-${project.version}.zip"/>
     </exec>
   </target>
 
   <target name="install.tar">
     <echo message="Generating TAR dist"/>
-    <tar destfile="${dist}/${project.name}-${project.version}.tar.gz" 
compression="gzip" longfile="gnu">
+    <tar destfile="${dist}/${project.name}-linux-${project.version}.tar.gz" 
compression="gzip" longfile="gnu">
       <tarfileset dir="${bin}" prefix="share/bin">
         <include name="security.policy"/>
       </tarfileset>
@@ -249,18 +249,18 @@
         <exclude name="share/bin/**"/>
       </tarfileset>
     </tar>
-    <checksum fileext=".md5" 
file="${dist}/${project.name}-${project.version}.tar.gz"/>
+    <checksum fileext=".md5" 
file="${dist}/${project.name}-linux-${project.version}.tar.gz"/>
     <antcall target="install.tar.asc"/>
   </target>
 
   <target name="install.tar.asc" if="gpg.declared">
-    <delete file="${dist}/${project.name}-${project.version}.tar.gz.asc"/>
+    <delete 
file="${dist}/${project.name}-linux-${project.version}.tar.gz.asc"/>
     <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"/>
+      <arg 
value="${dist}/${project.name}-linux-${project.version}.tar.gz.asc"/>
+      <arg value="${dist}/${project.name}-linux-${project.version}.tar.gz"/>
     </exec>
   </target>
 

Modified: 
development/main/magic/core/src/main/net/dpml/magic/model/Resource.java
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/model/Resource.java   
  (original)
+++ development/main/magic/core/src/main/net/dpml/magic/model/Resource.java   
  Fri Feb 18 18:25:37 2005
@@ -419,6 +419,23 @@
         }
     }
 
+    public String getFilename( final String prefix, final String type )
+    {
+        if( null == prefix )
+        {
+            throw new NullArgumentException( "prefix" );
+        }
+        final String name = getInfo().getName() + "-" + prefix;
+        if( null != getInfo().getVersion() )
+        {
+            return name + "-" + getInfo().getVersion() + "." + type;
+        }
+        else
+        {
+            return name + "." + type;
+        }
+    }
+
     public String toString()
     {
         return "[" + getInfo().toString() + "]";

Modified: 
development/main/magic/core/src/main/net/dpml/magic/tasks/DistTask.java
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/tasks/DistTask.java   
  (original)
+++ development/main/magic/core/src/main/net/dpml/magic/tasks/DistTask.java   
  Fri Feb 18 18:25:37 2005
@@ -116,7 +116,7 @@
 
         if( isZipContentDeclared() )
         {
-            final String zipfilename = getDefinition().getFilename( ZIP_EXT 
);
+            final String zipfilename = getDefinition().getFilename( "win32", 
ZIP_EXT );
             final File zipfile = new File( dist, zipfilename );
             zipIt( zipfile );
         }
@@ -131,7 +131,7 @@
 
     private String getTarFilename()
     {
-        final String tarfilename = getDefinition().getFilename( TAR_EXT );
+        final String tarfilename = getDefinition().getFilename( "linux", 
TAR_EXT );
         if( m_compression != null )
         {
             return tarfilename + "." + m_compression;