DPML Notify

[mcconnell AT netcompartner.com]

Author: mcconnell
Date: Thu Feb 17 01:07:28 2005
New Revision: 1796

Modified:
   development/main/build.bat
   development/main/home/standard.xml
   development/main/magic/core/build.xml
Log:
Updated build.bat to do somewhat more intelligent building and also updated 
the magic core build procedure to handle transit build deps when building a 
number module with a clean cache.

Modified: development/main/build.bat
==============================================================================
--- development/main/build.bat  (original)
+++ development/main/build.bat  Thu Feb 17 01:07:28 2005
@@ -1,3 +1,49 @@
 
-del %USERPROFILE%\.ant\lib\dpml-*.*
-cd home&ant clean install&cd ..\magic&ant clean install&cd ..\metro&ant 
clean install&cd C:\dev\osm\depot\installer&ant clean install
+echo off
+
+set ID=%2
+set TARGET=%1
+IF "%TARGET%" == "" set TARGET="all"
+CALL %TARGET%
+
+:all
+CALL :home
+IF ERRORLEVEL 1 goto fail
+CALL :magic
+IF ERRORLEVEL 1 goto fail
+CALL :metro
+if ERRORLEVEL 1 goto fail
+GOTO :EOF
+
+:fail
+set ID=""
+GOTO :EOF
+
+:end
+set ID=""
+GOTO :EOF
+
+:home
+PUSHD home
+CALL :build clean install
+POPD
+GOTO :EOF
+
+:magic
+PUSHD magic
+CALL :build clean install
+POPD
+GOTO :EOF
+
+:metro
+PUSHD metro
+CALL :build clean install
+POPD
+GOTO :EOF
+
+:build
+IF not "%ID%" == "" set BUILD_ID=-Ddpml.release.signature=%ID%
+ECHO building project with release ID [%ID%]
+CALL ant %BUILD_ID% %*
+set BUILD_ID=""
+goto :EOF

Modified: development/main/home/standard.xml
==============================================================================
--- development/main/home/standard.xml  (original)
+++ development/main/home/standard.xml  Thu Feb 17 01:07:28 2005
@@ -184,10 +184,12 @@
 
   <target name="setupReleaseFilename" if="signature.declared">
     <property name="project.version" value="${dpml.release.signature}"/>
+    <property name="dpml.build.signature" value="${dpml.release.signature}"/>
   </target>
 
   <target name="init" depends="setup,setupReleaseFilename">
     <property name="project.version" value="SNAPSHOT"/>
+    <property name="dpml.build.signature" value="SNAPSHOT"/>
     <property name="project.filename" 
value="${project.name}-${project.version}.${project.type}"/>
     <property name="dpml-transit-handler.filename" 
value="dpml-transit-main-${project.version}.jar"/>
     <property name="dpml-transit-antlib.filename" 
value="dpml-transit-antlib-${project.version}.jar"/>

Modified: development/main/magic/core/build.xml
==============================================================================
--- development/main/magic/core/build.xml       (original)
+++ development/main/magic/core/build.xml       Thu Feb 17 01:07:28 2005
@@ -32,10 +32,9 @@
 
   <target name="setup-path" depends="standard.setup-path">
     <transit:get property="checkstyle.path" uri="${checkstyle.uri}"/>
-    <echo>CACHE: ${dpml.cache}</echo>
     <path id="project.main.path">
-      <pathelement 
location="${dpml.cache}/dpml/transit/jars/dpml-transit-main-${dpml.home.version}.jar"/>
-      <pathelement 
location="${dpml.cache}/dpml/transit/jars/dpml-transit-tools-${dpml.home.version}.jar"/>
+      <pathelement 
location="${dpml.cache}/dpml/transit/jars/dpml-transit-main-${dpml.build.signature}.jar"/>
+      <pathelement 
location="${dpml.cache}/dpml/transit/jars/dpml-transit-tools-${dpml.build.signature}.jar"/>
       <pathelement location="${checkstyle.path}"/>
       <pathelement location="${basedir}/target/classes"/>
     </path>