jmartin 01/02/28 02:02:06
Modified: src/xml alexandria.xml
Log:
Changed ant file to allow -Dworkspace=workspacefile.xml to be used to overide
default workspace
Revision Changes Path
1.10 +16 -9 jakarta-alexandria/src/xml/alexandria.xml
Index: alexandria.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/src/xml/alexandria.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- alexandria.xml 2001/02/10 12:20:28 1.9
+++ alexandria.xml 2001/02/28 10:02:06 1.10
@@ -2,8 +2,7 @@
<project name="alexandria" default="all" >
<taskdef name="lock" classname="org.apache.tools.ant.taskdefs.Lock"/>
<property name="markup.dir" value="etc" />
- <property name="markup.file" value="global.xml" />
- <property name="workspace" value="var/${markup.file}" />
+ <property name="workspace" value="global.xml" />
<taskdef name="xstyle" classname="org.apache.tools.ant.xtaskdefs.XSLTProcess"/>
@@ -20,7 +19,12 @@
<target name="merge">
<echo message="Generating definition file"/>
- <xstyle in="${markup.dir}/${markup.file}" out="${workspace}"
style="xsl/merge.xsl" />
+ <echo file="logs/alexandria.log" append="no">
+ Generating definition file
+ </echo>
+
+ <xstyle in="${markup.dir}/${workspace}" out="var/${workspace}.tmp"
style="xsl/merge.xsl" />
+ <xstyle in="var/${workspace}.tmp" out="var/${workspace}"
style="xsl/sortdep.xsl" />
</target>
<!-- convience target to build everything -->
@@ -32,7 +36,7 @@
<!-- create main build.xml file to drive content building -->
<echo message="Generating cvs file"/>
- <xstyle in="${workspace}" out="var/build.cvs.xml" style="xsl/build.cvs.xsl" />
+ <xstyle in="var/${workspace}" out="var/build.cvs.xml" style="xsl/build.cvs.xsl"
/>
<ant antfile="var/build.cvs.xml"/>
<chmod perm="ug+rwX" type="both">
<fileset dir="${content.dir}"/>
@@ -43,7 +47,7 @@
<target name="javadoc" depends="lock,merge" description="Create javadocs">
<echo message="Generating javadoc file"/>
- <xstyle in="${workspace}" out="var/build.javadoc.xml"
style="xsl/build.javadoc.xsl" />
+ <xstyle in="var/${workspace}" out="var/build.javadoc.xml"
style="xsl/build.javadoc.xsl" />
<ant antfile="var/build.javadoc.xml"/>
<chmod perm="ug+rwX" type="both">
<fileset dir="${content.dir}"/>
@@ -54,7 +58,7 @@
<target name="build" depends="lock,merge" description="Build modules">
<echo message="Generating build file"/>
- <xstyle in="${workspace}" out="var/build.build.xml" style="xsl/build.build.xsl"
/>
+ <xstyle in="var/${workspace}" out="var/build.build.xml"
style="xsl/build.build.xsl" />
<ant antfile="var/build.build.xml"/>
<chmod perm="ug+rwX" type="both">
@@ -65,7 +69,7 @@
</target>
<target name="test" depends="lock,merge" description="Run tests">
<echo message="Generating test file"/>
- <xstyle in="${workspace}" out="var/build.test.xml" style="xsl/build.test.xsl" />
+ <xstyle in="var/${workspace}" out="var/build.test.xml"
style="xsl/build.test.xsl" />
<ant antfile="var/build.test.xml"/>
<chmod perm="ug+rwX" type="both">
<fileset dir="${content.dir}"/>
@@ -74,11 +78,14 @@
</chmod>
</target>
<target name="jxr" depends="lock,merge" description="Generate cross referenced
java code">
+ <echo file="logs/alexandria.log" append="yes"
+ message="Starting JXR"/>
+
<taskdef name="jxr" classname="org.apache.alexandria.AlexandriaTask"/>
<!-- Run JXR -->
<echo message="Running JXR" />
<mkdir dir="${content.dir}/html/jxr"/>
- <jxr markup="${workspace}" dest="${content.dir}/html/jxr"
cvsDir="${content.dir}/cvs"
+ <jxr markup="var/${workspace}" dest="${content.dir}/html/jxr"
cvsDir="${content.dir}/cvs"
imagefolder="${jxr.image.folder}"
imagefile="${jxr.image.file}"
/>
@@ -100,7 +107,7 @@
<fileset dir="content" />
</copy>
- <xstyle in="${workspace}" out="var/nav-page.xml" style="xsl/nav-page.xsl"/>
+ <xstyle in="var/${workspace}" out="var/nav-page.xml" style="xsl/nav-page.xsl"/>
<ant antfile="var/nav-page.xml"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
