Skip to Content.
Sympa Menu

notify-dpml - svn commit: r1741 - in development/main/home: . transit/tools/src/main/net/dpml/transit/tools

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell AT netcompartner.com
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: svn commit: r1741 - in development/main/home: . transit/tools/src/main/net/dpml/transit/tools
  • Date: Sun, 06 Feb 2005 06:50:49 +0100

Author: mcconnell
Date: Sun Feb 6 06:50:48 2005
New Revision: 1741

Modified:
development/main/home/build.properties
development/main/home/build.xml
development/main/home/standard.xml

development/main/home/transit/tools/src/main/net/dpml/transit/tools/MainTask.java
Log:
Update transit tools to declare a common dist directory which enables other
projects to grab dist resources without knowledge of the generating project.
Update the transit build to publish the dists resource to
${dpml.home}/dist/[group]/[version]/*.

Modified: development/main/home/build.properties
==============================================================================
--- development/main/home/build.properties (original)
+++ development/main/home/build.properties Sun Feb 6 06:50:48 2005
@@ -1,8 +1,7 @@

home = .
-transit.home = .
project.name = dpml-home
-project.group = dpml
+project.group = dpml/home
dpml.repository = http://repository.dpml.net/classic
junit.filename = junit-3.8.1.jar


Modified: development/main/home/build.xml
==============================================================================
--- development/main/home/build.xml (original)
+++ development/main/home/build.xml Sun Feb 6 06:50:48 2005
@@ -29,6 +29,16 @@
<target name="install" depends="standard.install,bundle">
<property name="dist" location="${basedir}/target/dist"/>
<mkdir dir="${dist}"/>
+ <antcall target="install.zip"/>
+ <antcall target="install.tar"/>
+ <property name="export"
location="${dpml.dist}/${project.group}/${project.version}"/>
+ <mkdir dir="${export}"/>
+ <copy todir="${export}">
+ <fileset dir="${dist}"/>
+ </copy>
+ </target>
+
+ <target name="install.zip">
<echo message="Generating ZIP dist"/>
<zip destfile="${dist}/${project.name}-${project.version}.zip"
whenempty="create">
<zipfileset dir="${bundle}/bin" prefix="bin">
@@ -41,6 +51,21 @@
</zipfileset>
</zip>
<checksum fileext=".md5"
file="${dist}/${project.name}-${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"/>
+ <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>
+ </target>
+
+ <target name="install.tar">
<echo message="Generating TAR dist"/>
<tar destfile="${dist}/${project.name}-${project.version}.tar.gz"
compression="gzip" longfile="gnu">
<tarfileset dir="${bundle}/bin" prefix="bin">
@@ -57,35 +82,23 @@
</tarfileset>
</tar>
<checksum fileext=".md5"
file="${dist}/${project.name}-${project.version}.tar.gz"/>
- <antcall target="dist.asc"/>
+ <antcall target="install.tar.asc"/>
</target>

- <target name="dist.asc" if="gpg.declared">
- <echo message="Generating ASC"/>
- <delete file="${dist}/${project.name}-${project.version}.zip.asc"/>
+ <target name="install.tar.asc" if="gpg.declared">
<delete file="${dist}/${project.name}-${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}.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">
-
<delete dir="${basedir}/target/bundle"/>
-
<mkdir dir="${bundle}/cache"/>
-
<!-- create the transit configuration directory -->
<property name="root" value="${bundle}/transit"/>
<echo>Adding Transit application properties to ${root}</echo>

Modified: development/main/home/standard.xml
==============================================================================
--- development/main/home/standard.xml (original)
+++ development/main/home/standard.xml Sun Feb 6 06:50:48 2005
@@ -55,9 +55,11 @@
<target name="dpml-home-create">
<property name="dpml.cache" value="${dpml.home}/cache"/>
<property name="dpml.docs" value="${dpml.home}/docs"/>
+ <property name="dpml.dist" value="${dpml.home}/dist"/>
<mkdir dir="${dpml.home}"/>
<mkdir dir="${dpml.cache}"/>
<mkdir dir="${dpml.docs}"/>
+ <mkdir dir="${dpml.dist}"/>
</target>

<target name="junit-test">

Modified:
development/main/home/transit/tools/src/main/net/dpml/transit/tools/MainTask.java
==============================================================================
---
development/main/home/transit/tools/src/main/net/dpml/transit/tools/MainTask.java
(original)
+++
development/main/home/transit/tools/src/main/net/dpml/transit/tools/MainTask.java
Sun Feb 6 06:50:48 2005
@@ -50,6 +50,7 @@
&lt;echo message="Cache: ${dpml.cache}"/>
&lt;echo message="Templates: ${dpml.templates}"/>
&lt;echo message="Docs: ${dpml.docs}"/>
+ &lt;echo message="Docs: ${dpml.dist}"/>
&lt;/project></pre>
* <p>Output from the above example is shown below:</p>
* <pre>
@@ -57,6 +58,7 @@
[echo] Cache: C:\system\dpml\main
[echo] Templates: C:\system\dpml\templates
[echo] Docs: C:\system\dpml\docs
+ [echo] Docs: C:\system\dpml\dist
* </pre>
*
* @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
@@ -127,7 +129,6 @@
TransitComponentHelper.register( maps );
}

-
/**
* Declares four properties into the current project covering the DPML
home directory,
* template directory, doc and main cache directories.
@@ -140,13 +141,14 @@
File templates = new File( home, "templates" );
File docs = new File( home, "docs" );
File cache = new File( home, "cache" );
+ File dist = new File( home, "dist" );
updateProperty( project, "dpml.home", home.getAbsolutePath() );
updateProperty( project, "dpml.templates",
templates.getAbsolutePath() );
updateProperty( project, "dpml.docs", docs.getAbsolutePath() );
updateProperty( project, "dpml.cache", cache.getAbsolutePath() );
+ updateProperty( project, "dpml.dist", dist.getAbsolutePath() );
}

-
/**
* Setup the monitors.
*/



  • svn commit: r1741 - in development/main/home: . transit/tools/src/main/net/dpml/transit/tools, mcconnell, 02/06/2005

Archive powered by MHonArc 2.6.24.

Top of Page