You are viewing a plain text version of this content. The canonical link for it is here.
Posted to alexandria-dev@jakarta.apache.org by ru...@apache.org on 2001/12/10 16:48:09 UTC
cvs commit: jakarta-alexandria/proposal/gump/project gump.xml jakarta-alexandria.xml
rubys 01/12/10 07:48:09
Modified: proposal/gump/java Jenny.java Project.java
proposal/gump/project jakarta-alexandria.xml
Added: proposal/gump build.xml
proposal/gump/project gump.xml
Log:
Once bootstrapped, allow Gump to be built using gump
Revision Changes Path
1.1 jakarta-alexandria/proposal/gump/build.xml
Index: build.xml
===================================================================
<!--
Build the scripts and/or site for http://jakarta.apache.org/gump/
If you need to bootstrap this, see gen.sh or gen.bat.
Important targets:
scripts - generate the scripts
site - generate the web site
all - generate both the scripts and the site
-->
<project name="gump" default="scripts" basedir=".">
<!-- Build the code used to generate the merged xml scripts -->
<target name="compile">
<mkdir dir="classes"/>
<mkdir dir="work"/>
<javac srcdir="java" destdir="classes"/>
<jar file="jenny.jar" basedir="classes"/>
<uptodate property="uptodate" targetfile="work/merge.xml">
<srcfiles dir="." includes="${workspace}"/>
<srcfiles dir="profile" includes="*.xml"/>
<srcfiles dir="project" includes="*.xml"/>
<srcfiles dir="repository" includes="*.xml"/>
<srcfiles dir="stylesheet" includes="*.xsl"/>
</uptodate>
</target>
<!-- Merge the xml sources, resolving references -->
<target name="gen" depends="compile" unless="uptodate">
<java classname="Jenny" fork="yes">
<arg value="${workspace}"/>
</java>
</target>
<!-- Extract the info necessary to produce the update script -->
<target name="update" depends="gen">
<style in="work/merge.xml" out="work/update.def"
style="stylesheet/update.xsl"/>
</target>
<!-- Extract the info necessary to produce the build script -->
<target name="build" depends="gen">
<style in="work/merge.xml" out="work/build.def"
style="stylesheet/build.xsl"/>
</target>
<!-- Extract the info necessary to produce the xref script -->
<target name="xref" depends="gen">
<style in="work/merge.xml" out="work/xref.def"
style="stylesheet/xref.xsl"/>
</target>
<!-- Extract the info necessary to produce the publish script -->
<target name="publish" depends="gen">
<copy file="work/merge.xml" tofile="work/puball.site"/>
<style in="work/merge.xml" out="work/publish.def"
style="stylesheet/publish.xsl"/>
<style in="work/merge.xml" out="work/map.pl"
style="stylesheet/sedmap.xsl"/>
</target>
<!-- Add in the website information -->
<target name="website" depends="build,update,publish,xref">
<style basedir="work" destdir="work" includes="*.def" extension=".site"
style="${webstyle}"/>
</target>
<!-- Generate the scripts -->
<target name="scripts" depends="website">
<style basedir="work" destdir="work" includes="*.site"
extension=".${extension}" style="stylesheet/${target}.xsl"/>
</target>
<!-- Produce the gump web site -->
<target name="site">
<ant dir="site"/>
</target>
<!-- Do everything -->
<target name="all" depends="scripts,site"/>
<!-- Remove all outputs and intermediate results -->
<target name="clean">
<delete file="jenny.jar"/>
<delete dir="classes"/>
<delete dir="work"/>
<ant dir="site" target="clean"/>
</target>
</project>
1.5 +0 -1 jakarta-alexandria/proposal/gump/java/Jenny.java
Index: Jenny.java
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/java/Jenny.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Jenny.java 2001/11/02 16:16:27 1.4
+++ Jenny.java 2001/12/10 15:48:08 1.5
@@ -109,7 +109,6 @@
copy.removeAttribute("defined-in");
copyChildren(copy, parent);
} else {
-
parent.replaceChild(copy,node);
}
}
1.19 +7 -0 jakarta-alexandria/proposal/gump/java/Project.java
Index: Project.java
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/java/Project.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Project.java 2001/11/23 23:08:58 1.18
+++ Project.java 2001/12/10 15:48:08 1.19
@@ -73,6 +73,11 @@
} else if (child.getNodeName().equals("option")) {
dependsOn.put(((Element)child).getAttribute("project"), child);
} else if (child.getNodeName().equals("ant")) {
+ if (ant != null) {
+ // multiple ant children? Merge them!
+ Jenny.copyChildren(ant, (Element)child);
+ element.removeChild(ant);
+ }
ant = (Element)child;
} else if (child.getNodeName().equals("home")) {
home = (Element)child;
@@ -222,6 +227,8 @@
if (result.equals("")) result=srcdir;
element.setAttribute("home", result);
+ } else {
+ element.setAttribute("srcdir", result);
}
}
1.9 +0 -15 jakarta-alexandria/proposal/gump/project/jakarta-alexandria.xml
Index: jakarta-alexandria.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-alexandria.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jakarta-alexandria.xml 2001/11/01 13:03:09 1.8
+++ jakarta-alexandria.xml 2001/12/10 15:48:09 1.9
@@ -32,19 +32,4 @@
<home nested="proposal/maven"/>
<jar name="bin/maven-gump.jar"/>
</project>
-
- <project name="gump-site">
- <ant basedir="proposal/gump/site">
- <property name="site.dir" reference="srcdir" project="jakarta-site2"/>
- <property name="batik.dir" reference="home" project="xml-batik"/>
- </ant>
-
- <depend project="jakarta-ant"/>
- <depend project="commons-collections"/>
- <depend project="jakarta-velocity"/>
- <depend project="jakarta-avalon-logkit"/>
- <depend project="jdom"/>
- <depend project="xml-xerces"/>
- <depend project="xml-batik-rasterizer"/>
- </project>
</module>
1.1 jakarta-alexandria/proposal/gump/project/gump.xml
Index: gump.xml
===================================================================
<module name="gump">
<url href="http://java.apache.org/gump/"/>
<description>
Cross project build tool
</description>
<project name="gump">
<ant target="all">
<property name="site.dir" reference="srcdir" project="jakarta-site2"/>
<property name="batik.dir" reference="home" project="xml-batik"/>
</ant>
<depend project="jakarta-ant"/>
<depend project="commons-collections"/>
<depend project="jakarta-velocity"/>
<depend project="jakarta-avalon-logkit"/>
<depend project="jdom"/>
<depend project="xml-xerces"/>
<depend project="xml-xalan2"/>
<depend project="xml-batik-rasterizer"/>
<work nested="classes"/>
</project>
</module>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>