Skip to Content.
Sympa Menu

notify-dpml - r1673 - in trunk/main: . depot depot/tools depot/tools/builder

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: r1673 - in trunk/main: . depot depot/tools depot/tools/builder
  • Date: Tue, 25 Jul 2006 22:18:35 +0200

Author: mcconnell
Date: 2006-07-25 22:18:33 +0200 (Tue, 25 Jul 2006)
New Revision: 1673

Added:
trunk/main/depot/tools/build.properties
trunk/main/depot/tools/build.xml
trunk/main/depot/tools/etc/
trunk/main/depot/tools/src/
Removed:
trunk/main/depot/tools/builder/build.properties
trunk/main/depot/tools/builder/build.xml
trunk/main/depot/tools/builder/etc/
trunk/main/depot/tools/builder/src/
Modified:
trunk/main/bootstrap
trunk/main/bootstrap.bat
trunk/main/depot/module.xml
Log:
move depot/tools/builder to depot/tools

Modified: trunk/main/bootstrap
===================================================================
--- trunk/main/bootstrap 2006-07-25 20:13:53 UTC (rev 1672)
+++ trunk/main/bootstrap 2006-07-25 20:18:33 UTC (rev 1673)
@@ -100,9 +100,9 @@

depotAntBuilder()
{
- cd depot/tools/builder
+ cd depot/tools
build clean install
- cd ../../..
+ cd ../..
}

externalModules()

Modified: trunk/main/bootstrap.bat
===================================================================
--- trunk/main/bootstrap.bat 2006-07-25 20:13:53 UTC (rev 1672)
+++ trunk/main/bootstrap.bat 2006-07-25 20:18:33 UTC (rev 1673)
@@ -106,7 +106,7 @@
GOTO :EOF

:depot-ant-builder
-PUSHD depot\tools\builder
+PUSHD depot\tools
CALL :build clean install
POPD
GOTO :EOF

Modified: trunk/main/depot/module.xml
===================================================================
--- trunk/main/depot/module.xml 2006-07-25 20:13:53 UTC (rev 1672)
+++ trunk/main/depot/module.xml 2006-07-25 20:18:33 UTC (rev 1673)
@@ -71,7 +71,7 @@
</filters>
</project>

- <resource name="dpml-tools-builder" basedir="tools/builder">
+ <resource name="dpml-tools-builder" basedir="tools">
<types>
<type id="jar"/>
<part:plugin alias="true" class="net.dpml.tools.impl.StandardBuilder"/>

Copied: trunk/main/depot/tools/build.properties (from rev 1671,
trunk/main/depot/tools/builder/build.properties)

Copied: trunk/main/depot/tools/build.xml (from rev 1671,
trunk/main/depot/tools/builder/build.xml)
===================================================================
--- trunk/main/depot/tools/builder/build.xml 2006-07-25 20:09:20 UTC (rev
1671)
+++ trunk/main/depot/tools/build.xml 2006-07-25 20:18:33 UTC (rev 1673)
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="dpml-tools-builder" default="install" basedir="."
+ xmlns:transit="antlib:net.dpml.transit">
+
+ <property file="${basedir}/build.properties"/>
+ <property file="../../bootstrap.properties"/>
+ <transit:import
file="${dpml.prefs}/dpml/transit/templates/bootstrap.template"/>
+
+ <target name="init" depends="bootstrap.init">
+ <filter token="PART-XSD-URI"
value="link:xsd:dpml/lang/dpml-part#${dpml.xsd.version}"/>
+ <filter token="PROJECT-URI"
value="artifact:part:${project.group}/${project.name}#${project.version}" />
+ <filter token="PROJECT-LINK-URI"
value="link:part:${project.group}/${project.name}" />
+ <filter token="PROJECT-NAME" value="${project.name}" />
+ <filter token="PROJECT-GROUP" value="${project.group}"/>
+ <filter token="PROJECT-VERSION" value="${project.version}"/>
+ <filter token="ANT-VERSION" value="${tools.ant.version}"/>
+ <filter token="JUNIT-VERSION" value="${junit.version}"/>
+ <filter token="PLUGIN-CLASS"
value="net.dpml.tools.impl.StandardBuilder"/>
+ <filter token="DEPOT-CHECKSTYLE-PLUGIN-URI"
+
value="artifact:part:${project.group}/dpml-depot-checkstyle#${project.version}"/>
+ <filter token="DEPOT-CHECKSTYLE-PLUGIN-LINK-URI"
+ value="link:part:${project.group}/dpml-depot-checkstyle"/>
+ </target>
+
+ <target name="setup-path" depends="bootstrap.setup-path">
+ <transit:get property="junit.path" uri="${junit.uri}"/>
+ <transit:get property="library.path"
+ uri="artifact:jar:dpml/depot/dpml-library#${project.version}"/>
+ <transit:get property="transit.path"
+ uri="artifact:jar:dpml/transit/dpml-transit-main#${project.version}"/>
+ <path id="project.main.path">
+ <pathelement
+
location="${dpml.local.cache}/dpml/transit/jars/dpml-transit-main-${dpml.transit.version}.jar"/>
+ <pathelement location="${library.path}"/>
+ <pathelement location="${target.classes.dir}"/>
+ </path>
+ <path id="project.test.path">
+ <pathelement location="${junit.path}"/>
+ <pathelement location="${library.path}"/>
+ <pathelement location="${transit.path}"/>
+ <pathelement
location="${target.deliverables.jars.dir}/${project.filename}"/>
+ </path>
+ </target>
+
+ <target name="package" depends="bootstrap.package">
+ <move file="${target.deliverables.dir}/parts/builder.xml"
+
toFile="${target.deliverables.dir}/parts/${project.name}-${project.version}.part"/>
+ <move file="${target.deliverables.dir}/parts/builder.link"
+ toFile="${target.deliverables.dir}/parts/${project.name}.part.link"/>
+ </target>
+
+ <target name="install" depends="bootstrap.install">
+ <property name="tools.prefs" location="${dpml.prefs}/dpml/tools"/>
+ <mkdir dir="${tools.prefs}"/>
+ <copy toDir="${tools.prefs}">
+ <fileset dir="${target.dir}/prefs">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+</project>
+

Deleted: trunk/main/depot/tools/builder/build.properties
===================================================================
--- trunk/main/depot/tools/builder/build.properties 2006-07-25 20:13:53
UTC (rev 1672)
+++ trunk/main/depot/tools/builder/build.properties 2006-07-25 20:18:33
UTC (rev 1673)
@@ -1,7 +0,0 @@
-
-project.group = dpml/depot
-project.name = dpml-tools-builder
-tools.ant.version = 1.6.5
-junit.version = 3.8.1
-junit.filename = junit-${junit.version}.jar
-junit.uri = artifact:jar:junit/junit#${junit.version}

Deleted: trunk/main/depot/tools/builder/build.xml
===================================================================
--- trunk/main/depot/tools/builder/build.xml 2006-07-25 20:13:53 UTC (rev
1672)
+++ trunk/main/depot/tools/builder/build.xml 2006-07-25 20:18:33 UTC (rev
1673)
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<project name="dpml-tools-builder" default="install" basedir="."
- xmlns:transit="antlib:net.dpml.transit">
-
- <property file="${basedir}/build.properties"/>
- <property file="../../../bootstrap.properties"/>
- <transit:import
file="${dpml.prefs}/dpml/transit/templates/bootstrap.template"/>
-
- <target name="init" depends="bootstrap.init">
- <filter token="PART-XSD-URI"
value="link:xsd:dpml/lang/dpml-part#${dpml.xsd.version}"/>
- <filter token="PROJECT-URI"
value="artifact:part:${project.group}/${project.name}#${project.version}" />
- <filter token="PROJECT-LINK-URI"
value="link:part:${project.group}/${project.name}" />
- <filter token="PROJECT-NAME" value="${project.name}" />
- <filter token="PROJECT-GROUP" value="${project.group}"/>
- <filter token="PROJECT-VERSION" value="${project.version}"/>
- <filter token="ANT-VERSION" value="${tools.ant.version}"/>
- <filter token="JUNIT-VERSION" value="${junit.version}"/>
- <filter token="PLUGIN-CLASS"
value="net.dpml.tools.impl.StandardBuilder"/>
- <filter token="DEPOT-CHECKSTYLE-PLUGIN-URI"
-
value="artifact:part:${project.group}/dpml-depot-checkstyle#${project.version}"/>
- <filter token="DEPOT-CHECKSTYLE-PLUGIN-LINK-URI"
- value="link:part:${project.group}/dpml-depot-checkstyle"/>
- </target>
-
- <target name="setup-path" depends="bootstrap.setup-path">
- <transit:get property="junit.path" uri="${junit.uri}"/>
- <transit:get property="library.path"
- uri="artifact:jar:dpml/depot/dpml-library#${project.version}"/>
- <transit:get property="transit.path"
- uri="artifact:jar:dpml/transit/dpml-transit-main#${project.version}"/>
- <path id="project.main.path">
- <pathelement
-
location="${dpml.local.cache}/dpml/transit/jars/dpml-transit-main-${dpml.transit.version}.jar"/>
- <pathelement location="${library.path}"/>
- <pathelement location="${target.classes.dir}"/>
- </path>
- <path id="project.test.path">
- <pathelement location="${junit.path}"/>
- <pathelement location="${library.path}"/>
- <pathelement location="${transit.path}"/>
- <pathelement
location="${target.deliverables.jars.dir}/${project.filename}"/>
- </path>
- </target>
-
- <target name="package" depends="bootstrap.package">
- <move file="${target.deliverables.dir}/parts/builder.xml"
-
toFile="${target.deliverables.dir}/parts/${project.name}-${project.version}.part"/>
- <move file="${target.deliverables.dir}/parts/builder.link"
- toFile="${target.deliverables.dir}/parts/${project.name}.part.link"/>
- </target>
-
- <target name="install" depends="bootstrap.install">
- <property name="tools.prefs" location="${dpml.prefs}/dpml/tools"/>
- <mkdir dir="${tools.prefs}"/>
- <copy toDir="${tools.prefs}">
- <fileset dir="${target.dir}/prefs">
- <include name="**/*"/>
- </fileset>
- </copy>
- </target>
-
-</project>
-

Copied: trunk/main/depot/tools/etc (from rev 1671,
trunk/main/depot/tools/builder/etc)

Copied: trunk/main/depot/tools/src (from rev 1671,
trunk/main/depot/tools/builder/src)




  • r1673 - in trunk/main: . depot depot/tools depot/tools/builder, mcconnell at BerliOS, 07/25/2006

Archive powered by MHonArc 2.6.24.

Top of Page