svn commit: rev 23110 - in avalon/trunk: . tools/magic

Author: niclas
Date: Tue Jul 20 21:11:33 2004
New Revision: 23110

Modified:
   avalon/trunk/build.xml
   avalon/trunk/tools/magic/build.xml
Log:
Fixed Magic build issues.

Modified: avalon/trunk/build.xml
==============================================================================
--- avalon/trunk/build.xml	(original)
+++ avalon/trunk/build.xml	Tue Jul 20 21:11:33 2004
@@ -31,7 +31,7 @@
     </path>
     <taskdef name="unbar" classpath="magic.path"
       classname="org.apache.avalon.tools.tasks.UnbarTask"/>
-    <property name="magic.cache" value="${magic.home}/cache"/>
+    <property name="magic.cache" value="${magic.home}/main"/>
     <unbar repository="${magic.cache}" 
       href="http://www.dpml.net/avalonx/supplemental/bars/avalonx-supplemental-1.0.bar"/>
   </target>

Modified: avalon/trunk/tools/magic/build.xml
==============================================================================
--- avalon/trunk/tools/magic/build.xml	(original)
+++ avalon/trunk/tools/magic/build.xml	Tue Jul 20 21:11:33 2004
@@ -1,79 +1,79 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<project name="avalon-tools-magic" default="install" basedir="." 
-    xmlns:x="antlib:org.apache.avalon.tools">
-
-  <property file="build.properties"/>
-  <import file="${project.system}/build/standard.xml"/>
-
-  <target name="javadoc" depends="prepare">
-    <x:javadoc title="Avalon Magic" id="avalon-tools-magic">
-      <x:link href="http://java.sun.com/j2se/1.4/docs/api" />
-    </x:javadoc>
-  </target>
-
-  <!--
-  <target name="test" depends="standard.test">
-    <mkdir dir="${basedir}/target/deliverables/demos"/>
-    <zip destfile="${basedir}/target/deliverables/demos/demo.zip"
-      basedir="etc/test/demo"/>
-  </target>
-  -->
-
-  <target name="package" depends="standard.package">
-    <x:bar/>
-  </target>
-
-  <target name="install" depends="standard.install">
-    <mkdir dir="${user.home}/.ant/lib"/>
-    <copy toDir="${user.home}/.ant/lib" 
-       file="${basedir}/target/deliverables/jars/${project.filename}"/>
-  </target>
-
-  <target name="properties" depends="info">
-    <echo>
-magic properties
-----------------
-magic.home:      ${magic.home}
-magic.cache:     ${magic.cache}
-magic.docs:      ${magic.docs}
-magic.templates: ${magic.templates}
-
-project properties
-------------------
-project.key:     ${project.key}
-project.home:    ${project.home}
-project.index:   ${project.index}
-project.group:   ${project.group}
-project.name:    ${project.name}
-project.filename: ${project.filename}
-project.short-filename: ${project.short-filename}
-project.path:    ${project.path}
-    </echo>
-  </target>
-
-  <!--
-  <target name="validate" depends="standard.test">
-    <ant dir="target/test/temp/demo" target="install"/>
-  </target>
-  -->
-
-  <target name="gump">
-    <x:home/>
-    <x:gump description="Magic Test Module" 
-         public="true" filename="gump.xml">
-      <x:url href="http://avalon.apache.org/"/>
-      <x:svn href="https://svn.apache.org/repos/asf/avalon/trunk/tools/magic"/>
-      <x:license file="../../central/system/license/LICENSE.TXT"/>
-    </x:gump>
-  </target>
-
-  <target name="unbar">
-    <x:unbar file="target/deliverables/bars/${project.short-filename}.bar"/>
-  </target>
-
-  <target name="unbar2">
-    <x:unbar href="http://www.dpml.net/avalon/tools/bars/${project.short-filename}.bar"/>
-  </target>
-
-</project>
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-tools-magic" default="install" basedir="." 
+    xmlns:x="antlib:org.apache.avalon.tools">
+
+  <property file="build.properties"/>
+  <import file="${project.system}/build/standard.xml"/>
+
+  <target name="javadoc" depends="prepare">
+    <x:javadoc title="Avalon Magic" id="avalon-tools-magic">
+      <x:link href="http://java.sun.com/j2se/1.4/docs/api" />
+    </x:javadoc>
+  </target>
+
+  <!--
+  <target name="test" depends="standard.test">
+    <mkdir dir="${basedir}/target/deliverables/demos"/>
+    <zip destfile="${basedir}/target/deliverables/demos/demo.zip"
+      basedir="etc/test/demo"/>
+  </target>
+  -->
+
+  <target name="package" depends="standard.package">
+    <x:bar/>
+  </target>
+  
+  <target name="update" depends="install">
+    <mkdir dir="${user.home}/.ant/lib"/>
+    <copy toDir="${user.home}/.ant/lib" 
+       file="${basedir}/target/deliverables/jars/${project.filename}"/>
+  </target>
+
+  <target name="properties" depends="info">
+    <echo>
+magic properties
+----------------
+magic.home:      ${magic.home}
+magic.cache:     ${magic.cache}
+magic.docs:      ${magic.docs}
+magic.templates: ${magic.templates}
+
+project properties
+------------------
+project.key:     ${project.key}
+project.home:    ${project.home}
+project.index:   ${project.index}
+project.group:   ${project.group}
+project.name:    ${project.name}
+project.filename: ${project.filename}
+project.short-filename: ${project.short-filename}
+project.path:    ${project.path}
+    </echo>
+  </target>
+
+  <!--
+  <target name="validate" depends="standard.test">
+    <ant dir="target/test/temp/demo" target="install"/>
+  </target>
+  -->
+
+  <target name="gump">
+    <x:home/>
+    <x:gump description="Magic Test Module" 
+         public="true" filename="gump.xml">
+      <x:url href="http://avalon.apache.org/"/>
+      <x:svn href="https://svn.apache.org/repos/asf/avalon/trunk/tools/magic"/>
+      <x:license file="../../central/system/license/LICENSE.TXT"/>
+    </x:gump>
+  </target>
+
+  <target name="unbar">
+    <x:unbar file="target/deliverables/bars/${project.short-filename}.bar"/>
+  </target>
+
+  <target name="unbar2">
+    <x:unbar href="http://www.dpml.net/avalon/tools/bars/${project.short-filename}.bar"/>
+  </target>
+
+</project>