svn commit: rev 22117 - avalon/trunk/tools/magic

Author: mcconnell
Date: Fri Jun 25 22:07:13 2004
New Revision: 22117

Modified:
   avalon/trunk/tools/magic/setup.xml
Log:
fix setup.xml to read existing magic.properties in ${magic.home)

Modified: avalon/trunk/tools/magic/setup.xml
==============================================================================
--- avalon/trunk/tools/magic/setup.xml	(original)
+++ avalon/trunk/tools/magic/setup.xml	Fri Jun 25 22:07:13 2004
@@ -44,12 +44,12 @@
     <echo message="Using home directory: ${magic.home}"/>
     <mkdir dir="${magic.home}"/>
 
-    <property file="${magic.home}/magic.properties"/>
     <property file="${magic.home}/user.properties"/>
+    <property file="${magic.home}/magic.properties"/>
 
     <!-- Create the artifact cache. -->
-    <property name="magic.main" value="${magic.home}/main"/>
-    <mkdir dir="${magic.main}"/>
+    <property name="magic.cache" value="${magic.home}/main"/>
+    <mkdir dir="${magic.cache}"/>
 
     <!-- Create the docs cache. -->
     <property name="magic.docs" value="${magic.home}/docs"/>
@@ -57,7 +57,7 @@
 
     <!-- Create the magic group cache dir. -->
     <property name="magic.bar.destination" 
-      value="${magic.main}/${magic.group}"/>
+      value="${magic.cache}/${magic.group}"/>
     <mkdir dir="${magic.bar.destination}/bars"/>
 
     <!-- Pull down the latest version of magic. -->