DPML Notify

[mcconnell at BerliOS <mcconnell AT mail.berlios.de>]

Author: mcconnell
Date: 2006-07-26 17:35:33 +0200 (Wed, 26 Jul 2006)
New Revision: 1684

Modified:
   trunk/main/bootstrap
   trunk/main/bootstrap.bat
   trunk/main/bootstrap.xml
Log:
fix bootstrap handlers to support version prefix

Modified: trunk/main/bootstrap
===================================================================
--- trunk/main/bootstrap        2006-07-26 14:25:16 UTC (rev 1683)
+++ trunk/main/bootstrap        2006-07-26 15:35:33 UTC (rev 1684)
@@ -6,9 +6,9 @@
 #
 # $ bootstrap
 #
-# Versioned builds can be invoked using the following command (where '123' 
is the version to build):
+# Versioned builds can be invoked using the following command (where '1.0.0' 
is the prefix and '123' is the version postfix):
 # 
-# $ bootstrap 123
+# $ bootstrap 1.0.0 123
 #
 
 build()
@@ -20,8 +20,13 @@
       else
         BUILD_ID=""
       fi
-      echo "building project with release ID [$ID]"
-      ant $BUILD_ID "$@"
+      if [ -n "$SPEC" ] ; then
+        SPEC_ID="-Dbuild.decimal=$SPEC"
+      else
+        SPEC_ID=""
+      fi
+      echo "building project with with spec [$SPEC] and release ID [$ID]"
+      ant $SPEC_ID $BUILD_ID "$@"
       STATUS="$?"
     done
     if [ "$STATUS" == 0 ] ; then
@@ -134,6 +139,7 @@
 }
 
 ID=$1
+SPEC=$2
 antlibCleanup
 xmlSetup
 dpmlModule

Modified: trunk/main/bootstrap.bat
===================================================================
--- trunk/main/bootstrap.bat    2006-07-26 14:25:16 UTC (rev 1683)
+++ trunk/main/bootstrap.bat    2006-07-26 15:35:33 UTC (rev 1684)
@@ -7,8 +7,18 @@
 REM the transit main protocol handler, transit antlib, the tools index and 
 REM ant plugin, and the console CLI handler.
 REM
+REM Usage:
+REM ------
+REM bootstrap 1.0.0 1234
+REM
+REM or
+REM
+REM bootstrap
+REM
 
-set ID=%1
+
+set SPEC=%1
+set ID=%2
 CALL :antlib-cleanup
 IF ERRORLEVEL 1 GOTO :exit
 CALL :xml-setup
@@ -134,15 +144,18 @@
 GOTO :EOF
 
 :build
-IF "%ID%" == "" set ID=SNAPSHOT
-set BUILD_ID=-Dbuild.signature=%ID%
+SET SPEC_ID=""
+IF "%ID%" == "" SET ID=SNAPSHOT
+SET BUILD_ID=-Dbuild.signature=%ID%
+IF NOT "%SPEC%" == "" SET SPEC_ID=-Dbuild.decimal=%SPEC%
 ECHO ### START BUILD ###
 @echo on
-cd
+CD
 @echo off
-ECHO building project with release ID [%BUILD_ID%]
-CALL ant %BUILD_ID% %*
-set BUILD_ID=""
+ECHO building project with [%SPEC_ID%] and [%BUILD_ID%]
+CALL ant %SPEC_ID% %BUILD_ID% %*
+SET SPEC_ID=""
+SET BUILD_ID=""
 goto :EOF
 
 

Modified: trunk/main/bootstrap.xml
===================================================================
--- trunk/main/bootstrap.xml    2006-07-26 14:25:16 UTC (rev 1683)
+++ trunk/main/bootstrap.xml    2006-07-26 15:35:33 UTC (rev 1684)
@@ -146,6 +146,10 @@
     <isset property="build.signature"/>
   </condition>
 
+  <condition property="decimal.declared" value="true">
+    <isset property="build.decimal"/>
+  </condition>
+
   <property name="src" value="src"/>
   <property name="src.main" value="main"/>
   <property name="src.main.dir" value="${src}/${src.main}"/>
@@ -173,10 +177,15 @@
   <property name="target.deliverables.dir" 
location="${target.dir}/deliverables"/>
   <property name="target.deliverables.jars.dir" 
location="${target.deliverables.dir}/jars"/>
 
-  <target name="setupReleaseFilename" if="signature.declared">
-    <property name="project.version" value="${build.signature}"/>
+  <target name="setupReleasePrefix" if="signature.declared">
+    <property name="project.prefix" value="${build.decimal}-"/>
   </target>
 
+  <target name="setupReleaseFilename" depends="setupReleasePrefix" 
if="signature.declared">
+    <property name="project.prefix" value=""/>
+    <property name="project.version" 
value="${project.prefix}${build.signature}"/>
+  </target>
+
   <target name="init" depends="setup,setupReleaseFilename">
     <property name="project.version" value="SNAPSHOT"/>
     <property name="build.signature" value="SNAPSHOT"/>