notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

svn commit: r1280 - in development/laboratory/ant: . plugin plugin/etc/bin plugin/src/main/net/dpml/ant

From: mcconnell AT netcompartner.com
To: notify-dpml AT lists.ibiblio.org
Subject: svn commit: r1280 - in development/laboratory/ant: . plugin plugin/etc/bin plugin/src/main/net/dpml/ant
Date: Fri, 24 Dec 2004 08:02:14 +0100

Author: mcconnell
Date: Fri Dec 24 08:02:14 2004
New Revision: 1280

Added:
development/laboratory/ant/plugin/etc/bin/magic
- copied, changed from r1243,
development/laboratory/ant/plugin/etc/bin/build
development/laboratory/ant/plugin/etc/bin/magic.bat
- copied, changed from r1243,
development/laboratory/ant/plugin/etc/bin/build.bat
Removed:
development/laboratory/ant/plugin/etc/bin/build
development/laboratory/ant/plugin/etc/bin/build.bat

development/laboratory/ant/plugin/src/main/net/dpml/ant/TransitComponentHelper.java
Modified:
development/laboratory/ant/index.xml
development/laboratory/ant/plugin/build.xml
development/laboratory/ant/plugin/src/main/net/dpml/ant/AntPlugin.java
Log:
bumping and tweaking

Modified: development/laboratory/ant/index.xml
==============================================================================
--- development/laboratory/ant/index.xml (original)
+++ development/laboratory/ant/index.xml Fri Dec 24 08:02:14 2004
@@ -21,14 +21,16 @@

<index>

- <project basedir="plugin">
+ <import uri="artifact:module:dpml/metro/dpml-metro#SNAPSHOT"/>
+
+ <project basedir="main">
<info>
- <group>dpml/transit</group>
- <name>dpml-transit-ant</name>
+ <group>dpml/magic</group>
+ <name>dpml-magic-main</name>
<type>jar</type>
</info>
<dependencies>
- <include key="dpml-transit-main" build="false"/>
+ <include key="dpml-transit-plugin"/>
<include key="ant"/>
<include key="ant-launcher"/>
<include key="ant-junit"/>
@@ -36,10 +38,30 @@
</dependencies>
</project>

+ <resource>
+ <info>
+ <group>sun</group>
+ <name>tools</name>
+ <version>1.4.0</version>
+ <type>jar</type>
+ </info>
+ </resource>
+
+ <resource>
+ <info>
+ <group>ant</group>
+ <name>ant-launcher</name>
+ <version>1.6.2</version>
+ <type>jar</type>
+ </info>
+ </resource>
+
+


+ 

</index>

Modified: development/laboratory/ant/plugin/build.xml
==============================================================================
--- development/laboratory/ant/plugin/build.xml (original)
+++ development/laboratory/ant/plugin/build.xml Fri Dec 24 08:02:14 2004
@@ -1,13 +1,26 @@
<?xml version="1.0" encoding="UTF-8" ?>

-<project name="dpml-transit-ant" default="install" basedir="."
- xmlns:transit="antlib:net.dpml.transit" xmlns:x="antlib:net.dpml.magic" >
+<project name="dpml-magic-cli" default="install" basedir="."
+ xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <transit:init/>
- <import file="${dpml.templates}/standard.xml"/>
+ <magic:import uri="artifact:template:dpml/magic/standard"/>
+
+ <target name="init" depends="standard.init">
+ <x:filter feature="plugin" token="MAGIC-CLI-PLUGIN-URI"/>
+ </target>

<target name="package" depends="standard.package">
<x:export class="net.dpml.ant.AntPlugin"/>
</target>

+ <target name="install" depends="standard.install,bin"/>
+
+ <target name="bin" depends="prepare">
+ <mkdir dir="${dpml.home}/bin"/>
+ <copy todir="${dpml.home}/bin">
+ <fileset dir="target/bin"/>
+ </copy>
+ <chmod file="${dpml.home}/bin/magic" perm="755"/>
+ </target>
+
</project>

Copied: development/laboratory/ant/plugin/etc/bin/magic (from r1243,
development/laboratory/ant/plugin/etc/bin/build)
==============================================================================
--- development/laboratory/ant/plugin/etc/bin/build (original)
+++ development/laboratory/ant/plugin/etc/bin/magic Fri Dec 24 08:02:14
2004
@@ -17,7 +17,7 @@
# limitations under the License.

if [ -z "$TRANSIT_ANT_PLUGIN_URI" ] ; then
- TRANSIT_ANT_PLUGIN_URI=@TRANSIT-ANT-PLUGIN-URI@
+ MAGIC_CLI_PLUGIN_URI=@MAGIC-CLI-PLUGIN-URI@
fi
BIN_DIR=`dirname "$0"`
-$BIN_DIR/transit -load $TRANSIT_ANT_PLUGIN_URI "$@"
+$BIN_DIR/transit -load $MAGIC_CLI_PLUGIN_URI "$@"

Copied: development/laboratory/ant/plugin/etc/bin/magic.bat (from r1243,
development/laboratory/ant/plugin/etc/bin/build.bat)
==============================================================================
--- development/laboratory/ant/plugin/etc/bin/build.bat (original)
+++ development/laboratory/ant/plugin/etc/bin/magic.bat Fri Dec 24 08:02:14
2004
@@ -1,4 +1,4 @@
@echo off
set CMD_LINE_ARGS=%*
-if "%TRANSIT_ANT_PLUGIN_URI%" == "" set
TRANSIT_ANT_PLUGIN_URI=@TRANSIT-ANT-PLUGIN-URI@
-transit -load %TRANSIT_ANT_PLUGIN_URI% %CMD_LINE_ARGS%
+if "%MAGIC_CLI_PLUGIN_URI%" == "" set
MAGIC_CLI_PLUGIN_URI=@MAGIC-CLI-PLUGIN-URI@
+transit -load %MAGIC_CLI_PLUGIN_URI% %CMD_LINE_ARGS%

Modified:
development/laboratory/ant/plugin/src/main/net/dpml/ant/AntPlugin.java
==============================================================================
--- development/laboratory/ant/plugin/src/main/net/dpml/ant/AntPlugin.java
(original)
+++ development/laboratory/ant/plugin/src/main/net/dpml/ant/AntPlugin.java
Fri Dec 24 08:02:14 2004
@@ -136,8 +136,8 @@
//System.setOut(new PrintStream(new DemuxOutputStream(project,
false)));
//System.setErr(new PrintStream(new DemuxOutputStream(project,
true)));

- setupTransitComponentHelper( project );
- setupTransitProperties( project );
+ //setupTransitComponentHelper( project );
+ //setupTransitProperties( project );

try
{
@@ -186,6 +186,7 @@
}
}

+ /*
private void setupTransitComponentHelper( Project project )
{
ComponentHelper componentHelper = new TransitComponentHelper();
@@ -193,6 +194,7 @@
componentHelper.initDefaultDefinitions();
project.addReference( "ant.ComponentHelper", componentHelper );
}
+ */

private ProjectHelper setupTransitProjectHelper( Project project )
{
@@ -201,6 +203,7 @@
return helper;
}

+ /*
private void setupTransitProperties( Project project )
{
File home = Transit.HOME;
@@ -212,6 +215,7 @@
project.setNewProperty( "dpml.docs", docs.getAbsolutePath() );
project.setNewProperty( "dpml.cache", cache.getAbsolutePath() );
}
+ */

private BuildLogger createLogger()
{

svn commit: r1280 - in development/laboratory/ant: . plugin plugin/etc/bin plugin/src/main/net/dpml/ant, mcconnell, 12/24/2004