Skip to Content.
Sympa Menu

notify-dpml - svn commit: r2964 - in development/main: depot depot/install/src/main/net/dpml/depot depot/install/src/main/net/dpml/dpml magic/core/src/main/net/dpml/magic/tasks transit

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell AT dpml.net
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: svn commit: r2964 - in development/main: depot depot/install/src/main/net/dpml/depot depot/install/src/main/net/dpml/dpml magic/core/src/main/net/dpml/magic/tasks transit
  • Date: Mon, 04 Jul 2005 17:51:53 -0400

Author: mcconnell AT dpml.net
Date: Mon Jul 4 17:51:53 2005
New Revision: 2964

Added:
development/main/depot/install/src/main/net/dpml/depot/
- copied from r2961,
development/main/depot/install/src/main/net/dpml/dpml/
Removed:
development/main/depot/install/src/main/net/dpml/dpml/
Modified:
development/main/depot/module.xml
development/main/magic/core/src/main/net/dpml/magic/tasks/FeatureTask.java
development/main/transit/build.xml
Log:
Update transit to package t's platform independent bundle in a zip file which
Depot uses to build the Depot distribution.

Modified: development/main/depot/module.xml
==============================================================================
--- development/main/depot/module.xml (original)
+++ development/main/depot/module.xml Mon Jul 4 17:51:53 2005
@@ -45,8 +45,18 @@
</target>

<target name="package" depends="standard.package">
+
+ <mkdir dir="${bundle}"/>
+ <x:property name="transit.bundle" key="dpml-transit" feature="path"
type="zip"/>
+ <unzip src="${dpml.cache}/${transit.bundle}" dest="${bundle}"/>
+
+ <!--
+ Grab a copy of the Transit bundle to form the basis for the depot bundle.
+ -->
+
<property name="share" value="${bundle}/share"/>
<property name="data" value="${bundle}/data"/>
+
<!-- create the README and LICENSE files-->
<copy todir="${bundle}" filtering="true">
<fileset dir="${basedir}">
@@ -55,30 +65,44 @@
<include name="DEPOT_README.TXT"/>
</fileset>
</copy>
+
+ <!-- build the lib directory -->
+
+ <property name="lib" value="${data}/lib"/>
+ <mkdir dir="${lib}"/>
+ <x:property name="transit.main.version" key="dpml-transit-main"
feature="version"/>
+ <x:property name="depot.console.version" key="dpml-depot-console"
feature="version"/>
+ <copy
file="${dpml.cache}/dpml/transit/jars/dpml-transit-main-${transit.main.version}.jar"
+ toFile="${lib}/dpml-transit-main.jar"/>
+ <copy
file="${dpml.cache}/dpml/depot/jars/dpml-depot-console-${depot.console.version}.jar"
+ toFile="${lib}/dpml-depot-console.jar"/>
+
+ <!-- build the local repository -->
+
<property name="local" value="${share}/local"/>
<x:path id="module.path" type="*" mode="RUNTIME" module="true"/>
<x:replicate refid="module.path" toDir="${local}" />
<copy todir="${local}/${project.group}">
<fileset dir="target/deliverables"/>
</copy>
- <!--
- Add the non-version bin files to the bin directory.
- -->
+
+ <!-- build the bin directory -->
+
<copy todir="${share}/bin">
<fileset dir="${basedir}/console/target/bin"/>
</copy>
- <!--
- Add the javadoc to the dist.
- -->
+
+ <!-- add depot javadocs to the distribution -->
+
<property name="docs.src" location="${basedir}/target/api"/>
<property name="docs.dest"
location="${share}/docs/api/${project.group}/${project.version}"/>
<mkdir dir="${docs.dest}"/>
<copy todir="${docs.dest}">
<fileset dir="${docs.src}"/>
</copy>
- <!--
- Package the bundle into a compressed archive.
- -->
+
+ <!-- package it all up -->
+
<x:dist compression="gzip">
<fileset dir="${bundle}">
<include name="*.TXT"/>

Modified:
development/main/magic/core/src/main/net/dpml/magic/tasks/FeatureTask.java
==============================================================================
---
development/main/magic/core/src/main/net/dpml/magic/tasks/FeatureTask.java
(original)
+++
development/main/magic/core/src/main/net/dpml/magic/tasks/FeatureTask.java
Mon Jul 4 17:51:53 2005
@@ -145,7 +145,14 @@
}
else if( m_feature.equals( "path" ) )
{
- return convertString( resource.getInfo().getPath() );
+ if( null == m_type )
+ {
+ return convertString( resource.getInfo().getPath() );
+ }
+ else
+ {
+ return convertString( resource.getInfo().getPath( m_type ) );
+ }
}
else if( m_feature.equals( "docs" ) )
{

Modified: development/main/transit/build.xml
==============================================================================
--- development/main/transit/build.xml (original)
+++ development/main/transit/build.xml Mon Jul 4 17:51:53 2005
@@ -120,6 +120,18 @@
<mkdir dir="${templates}"/>
<copy file="${basedir}/standard.xml"
tofile="${templates}/standard-${project.version}.template" />
<copy file="${basedir}/target/standard.template.link"
toDir="${templates}"/>
+
+ <!-- zip up a copy of the platform independent bundle for use by depot
-->
+
+ <property name="zip.filename"
+
value="${basedir}/target/deliverables/zips/${project.name}-${project.version}.zip"/>
+ <mkdir dir="target/deliverables/zips"/>
+ <zip destfile="${zip.filename}" whenempty="create">
+ <zipfileset dir="${bundle}">
+ <include name="**/*"/>
+ </zipfileset>
+ </zip>
+
</target>

<target name="install" depends="standard.install">



  • svn commit: r2964 - in development/main: depot depot/install/src/main/net/dpml/depot depot/install/src/main/net/dpml/dpml magic/core/src/main/net/dpml/magic/tasks transit, mcconnell, 07/04/2005

Archive powered by MHonArc 2.6.24.

Top of Page