notify-dpml AT lists.ibiblio.org
Subject: DPML Notify
List archive
r1447 - in trunk/main: . lang planet planet/process planet/process/etc
- From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
- To: notify-dpml AT lists.ibiblio.org
- Subject: r1447 - in trunk/main: . lang planet planet/process planet/process/etc
- Date: Fri, 19 May 2006 17:20:30 +0200
Author: mcconnell
Date: 2006-05-19 17:20:29 +0200 (Fri, 19 May 2006)
New Revision: 1447
Added:
trunk/main/planet/process/
trunk/main/planet/process/etc/deliverables/
Removed:
trunk/main/lang/process/
trunk/main/planet/process/build.xml
Modified:
trunk/main/bootstrap
trunk/main/bootstrap.bat
trunk/main/lang/module.xml
trunk/main/planet/module.xml
Log:
move process to planet
Modified: trunk/main/bootstrap
===================================================================
--- trunk/main/bootstrap 2006-05-19 15:02:39 UTC (rev 1446)
+++ trunk/main/bootstrap 2006-05-19 15:20:29 UTC (rev 1447)
@@ -105,13 +105,6 @@
cd ../..
}
-dpmlLangProcess()
-{
- cd lang/process
- build clean install
- cd ../..
-}
-
dpmlLibrary()
{
cd depot/library
@@ -166,7 +159,6 @@
dpmlApplication
transitMain
transitTools
-dpmlLangProcess
dpmlLibrary
depotAntBuilder
externalModules
Modified: trunk/main/bootstrap.bat
===================================================================
--- trunk/main/bootstrap.bat 2006-05-19 15:02:39 UTC (rev 1446)
+++ trunk/main/bootstrap.bat 2006-05-19 15:20:29 UTC (rev 1447)
@@ -33,8 +33,6 @@
IF ERRORLEVEL 1 GOTO :exit
CALL :transit-tools
IF ERRORLEVEL 1 GOTO :exit
-CALL :dpml-lang-process
-IF ERRORLEVEL 1 GOTO :exit
CALL :dpml-library
IF ERRORLEVEL 1 GOTO :exit
CALL :depot-ant-builder
@@ -117,13 +115,6 @@
POPD
GOTO :EOF
-:dpml-lang-process
-PUSHD lang\process
-CALL :build clean install
-POPD
-GOTO :EOF
-
-
:dpml-library
PUSHD depot\library
CALL :build clean install
Modified: trunk/main/lang/module.xml
===================================================================
--- trunk/main/lang/module.xml 2006-05-19 15:02:39 UTC (rev 1446)
+++ trunk/main/lang/module.xml 2006-05-19 15:20:29 UTC (rev 1447)
@@ -10,17 +10,6 @@
</types>
</resource>
- <resource name="dpml-process" version="1.0">
- <types>
- <type id="xsd"/>
- </types>
- <dependencies>
- <build>
- <include ref="dpml/transit/dpml-transit-main"/>
- </build>
- </dependencies>
- </resource>
-
<resource name="dpml-part" version="1.0">
<types>
<type id="xsd"/>
@@ -68,7 +57,7 @@
<dependencies>
<build>
<include key="dpml-common"/>
- <include key="dpml-process"/>
+ <include key="dpml-part"/>
</build>
</dependencies>
</resource>
Modified: trunk/main/planet/module.xml
===================================================================
--- trunk/main/planet/module.xml 2006-05-19 15:02:39 UTC (rev 1446)
+++ trunk/main/planet/module.xml 2006-05-19 15:20:29 UTC (rev 1447)
@@ -5,4 +5,20 @@
<module file="http/module.xml"/>
+ <project name="dpml-process" basedir="process">
+ <types>
+ <type id="xsd"/>
+ </types>
+ <dependencies>
+ <build>
+ <include ref="dpml/transit/dpml-transit-main"/>
+ </build>
+ </dependencies>
+ <filters>
+ <feature token="PROJECT-XSD-URI" id="uri" type="xsd"/>
+ <feature token="PART-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-part"/>
+ <feature token="COMMON-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-common"/>
+ </filters>
+ </project>
+
</module>
Copied: trunk/main/planet/process (from rev 1446, trunk/main/lang/process)
Deleted: trunk/main/planet/process/build.xml
===================================================================
--- trunk/main/lang/process/build.xml 2006-05-19 15:02:39 UTC (rev 1446)
+++ trunk/main/planet/process/build.xml 2006-05-19 15:20:29 UTC (rev 1447)
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Copyright 2004-2005 Stephen J McConnell
- Copyright 2004 Niclas Hedhman
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied.
-
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<project name="dpml-process" default="install" basedir=".">
-
- <property name="project.group" value="dpml/lang"/>
- <property name="project.name" value="dpml-process"/>
- <property name="resource.name" value="process"/>
-
- <property file="${basedir}/build.properties"/>
- <property name="home" value="../.."/>
- <import file="${home}/bootstrap.xml"/>
-
- <target name="setup-path" depends="init">
- <echo message="TRANSIT: ${project.version}.jar"/>
- <path id="project.main.path">
- <pathelement
location="${dpml.local.cache}/dpml/transit/jars/dpml-transit-main-${project.version}.jar"/>
- <pathelement location="${target.classes.dir}"/>
- <pathelement location="${ENV.ANT_HOME}/lib/ant.jar"/>
- <pathelement location="${ENV.ANT_HOME}/lib/ant-junit.jar"/>
- <pathelement
location="${dpml.local.cache}/junit/jars/${junit.filename}"/>
- </path>
- </target>
-
- <target name="init" depends="bootstrap.init">
- <filter token="PROJECT-XSD-URI"
value="artifact:xsd:${project.group}/${project.name}#${project.version}"/>
- <filter token="PART-XSD-URI"
value="artifact:xsd:${project.group}/dpml-part#1.0"/>
- <filter token="COMMON-XSD-URI"
value="artifact:xsd:dpml/lang/dpml-common#1.0"/>
- </target>
-
- <target name="package" depends="bootstrap.package">
- <property name="targetDir" location="${target.deliverables.dir}/xsds"/>
- <mkdir dir="${targetDir}"/>
- <property name="filename"
value="${project.name}-${project.version}.xsd"/>
- <copy toFile="${targetDir}/${filename}" preservelastmodified="true"
overwrite="true"
- file="${target.dir}/${resource.name}.xsd"/>
- <checksum fileext=".md5" file="${targetDir}/${filename}"/>
- </target>
-
-</project>
- r1447 - in trunk/main: . lang planet planet/process planet/process/etc, mcconnell at BerliOS, 05/19/2006
Archive powered by MHonArc 2.6.24.