build.xml diff files
"David Leangen" <[email protected]>
| Newsgroups | gmane.comp.jakarta.avalon.user |
|---|---|
| Message-ID | <[email protected]> |
At Steve's request, here are the diffs for the build.xml files. I noticed something, though... the build.xml used for the magic build may not have been correct. Not sure, but I may not have saved the changes before running the build. But it may also just have been nothing... hard to say. In any case, it may be prudent to run another test. Sorry about that!! Cheers!
build.xml.diff
(application/octet-stream, 3.4 KB)
Comparing: Z:\apps\avalon\build.xml
To: Z:\apps\avalon\build.old.xml
====
1 <?xml version="1.0" encoding="UTF-8" ?>
2
3 <project name="avalon" default="install" basedir="."
4 xmlns:x="antlib:org.apache.avalon.tools">
5
6 <available property="magic.available" classname="org.apache.avalon.tools.model.Home"/>
7
8 <property environment="ENV"/>
9 <property name="magic.dir" value="${basedir}/tools/magic"/>
10 <property file="${basedir}/user.properties"/>
11 <property file="${basedir}/build.properties"/>
12 <property name="reactor.xml"
13 value="${project.system}/build/reactor.xml"/>
14
15 <condition property="magic.env.declared" value="false">
16 <isset property="ENV.MAGIC_HOME"/>
17 </condition>
18
19 <target name="declare-magic-home" if="magic.env.declared">
20 <property name="magic.home" value="${ENV.MAGIC_HOME}"/>
21 </target>
22
23 <target name="check-magic-home" unless="magic.env.declared">
24 <property name="magic.home" value="${user.home}/.magic"/>
25 </target>
26
27 <target name="setup" depends="check-magic-home,declare-magic-home">
28 <ant dir="." antfile="${magic.dir}/setup.xml"/>
29 <path id="magic.path">
30 <pathelement location="${user.dir}/.ant/lib/avalon-tools-magic.jar"/>
31 </path>
32 <taskdef name="unbar" classpath="magic.path"
33 classname="org.apache.avalon.tools.tasks.UnbarTask"/>
====
34 <! <property name="magic.cache" value="${magic.home}/main"/>
!> <property name="magic.cache" value="${magic.home}/cache"/>
====
35 <unbar repository="${magic.cache}"
36 href="http://www.dpml.net/avalonx/supplemental/bars/avalonx-supplemental-1.0.bar"/>
37 </target>
38
39 <target name="clean" depends="verify">
40 <ant dir="." antfile="${reactor.xml}" target="clean"/>
41 </target>
42
43 <target name="info" depends="verify">
44 <ant dir="." antfile="${reactor.xml}" target="info"/>
45 </target>
46
47 <target name="install" depends="default"/>
48
49 <target name="default" depends="verify">
50 <ant dir="." antfile="${reactor.xml}" target="default"/>
51 </target>
52
53 <target name="verify" unless="magic.available">
54 <echo>
55 #--------------------------------------------------------------------------------
56 # Please invoke the bootstrap target in order to install prerequisite resources
57 # and tools necessary to build avalon.
58 #
59 # $ ant setup
60 #
61 # Once the bootstrap resources have been build you can proceed with any of the
62 # classic build targets.
63 #--------------------------------------------------------------------------------
64 </echo>
65 <fail message="Bootstrap resources not present."/>
66 </target>
67
68 <target name="gump">
69 <x:home/>
70 <x:gump description="Magic Test Module"
71 public="true" filename="gump.xml">
72 <x:url href="http://avalon.apache.org/"/>
73 <x:svn repository="avalon-svn" dir="trunk"/>
74 <x:license file="central/system/license/LICENSE.TXT"/>
75 <x:nag to="[email protected]"/>
76 </x:gump>
77 </target>
78
79 </project>
magic.build.xml.diff
(application/octet-stream, 2.9 KB)
Comparing: Z:\apps\avalon\tools\magic\build.old.xml
To: Z:\apps\avalon\tools\magic\build.xml
====
1 <?xml version="1.0" encoding="UTF-8" ?>
2
3 <project name="avalon-tools-magic" default="install" basedir="."
4 xmlns:x="antlib:org.apache.avalon.tools">
5
6 <property file="build.properties"/>
7 <import file="${project.system}/build/standard.xml"/>
8
9 <target name="javadoc" depends="prepare">
10 <x:javadoc title="Avalon Magic" id="avalon-tools-magic">
11 <x:link href="http://java.sun.com/j2se/1.4/docs/api" />
12 </x:javadoc>
13 </target>
14
15 <!--
16 <target name="test" depends="standard.test">
17 <mkdir dir="${basedir}/target/deliverables/demos"/>
18 <zip destfile="${basedir}/target/deliverables/demos/demo.zip"
19 basedir="etc/test/demo"/>
20 </target>
21 -->
22
23 <target name="package" depends="standard.package">
24 <x:bar/>
25 </target>
26
====
27 <! <target name="install" depends="standard.install">
!> <target name="update" depends="install">
====
28 <mkdir dir="${user.home}/.ant/lib"/>
29 <copy toDir="${user.home}/.ant/lib"
30 file="${basedir}/target/deliverables/jars/${project.filename}"/>
31 </target>
32
33 <target name="properties" depends="info">
34 <echo>
35 magic properties
36 ----------------
37 magic.home: ${magic.home}
38 magic.cache: ${magic.cache}
39 magic.docs: ${magic.docs}
40 magic.templates: ${magic.templates}
41
42 project properties
43 ------------------
44 project.key: ${project.key}
45 project.home: ${project.home}
46 project.index: ${project.index}
47 project.group: ${project.group}
48 project.name: ${project.name}
49 project.filename: ${project.filename}
50 project.short-filename: ${project.short-filename}
51 project.path: ${project.path}
52 </echo>
53 </target>
54
55 <!--
56 <target name="validate" depends="standard.test">
57 <ant dir="target/test/temp/demo" target="install"/>
58 </target>
59 -->
60
61 <target name="gump">
62 <x:home/>
63 <x:gump description="Magic Test Module"
64 public="true" filename="gump.xml">
65 <x:url href="http://avalon.apache.org/"/>
66 <x:svn href="https://svn.apache.org/repos/asf/avalon/trunk/tools/magic"/>
67 <x:license file="../../central/system/license/LICENSE.TXT"/>
68 </x:gump>
69 </target>
70
71 <target name="unbar">
72 <x:unbar file="target/deliverables/bars/${project.short-filename}.bar"/>
73 </target>
74
75 <target name="unbar2">
76 <x:unbar href="http://www.dpml.net/avalon/tools/bars/${project.short-filename}.bar"/>
77 </target>
78
79 </project>
smime.p7s
(application/x-pkcs7-signature, 2 KB) - not displayed