mcconnell 2003/02/19 02:21:35
Modified: merlin default.properties build.xml
Log:
Update to handle merlin family designator.
Revision Changes Path
1.22 +2 -0 avalon-sandbox/merlin/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/default.properties,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- default.properties 16 Feb 2003 10:51:59 -0000 1.21
+++ default.properties 19 Feb 2003 10:21:35 -0000 1.22
@@ -138,11 +138,13 @@
merlin.jar=${local.repository}/${merlin.name}
# ----- Merlin Bootstrap -----
+merlin.family = merlin
merlin-bootstrap.id = merlin-bootstrap
merlin-bootstrap.version = 1.0
merlin-bootstrap.key = Merlin
merlin-bootstrap.name =
${merlin-bootstrap.id}-${merlin-bootstrap.version}.jar
merlin-bootstrap.jar=${local.repository}/${merlin-bootstrap.name}
+merlin-bootstrap.path=${remote.repository}/${merlin.family}/jars/${merlin-bootstrap.name}
# --------------------------------------------------
1.24 +1 -1 avalon-sandbox/merlin/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/build.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- build.xml 16 Feb 2003 13:01:20 -0000 1.23
+++ build.xml 19 Feb 2003 10:21:35 -0000 1.24
@@ -260,7 +260,7 @@
<target name="check-bootstrap" depends="flags" unless="bootstrap.present">
<mkdir dir="${local.repository}"/>
- <get
src="${remote.repository}/${merlin-bootstrap.id}/jars/${merlin-bootstrap.name}"
+ <get src="${merlin-bootstrap.path}"
dest="${local.repository}/${merlin-bootstrap.name}"
verbose="true"
usetimestamp="true"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
