You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by le...@apache.org on 2005/07/08 23:15:06 UTC
svn commit: r209891 - in /gump/branches/Gump3: gump metadata/vmgump.xml
pygump/python/gump/engine/objectifier.py
pygump/python/gump/plugins/builder.py
pygump/python/gump/plugins/java/builder.py
Author: leosimons
Date: Fri Jul 8 14:15:03 2005
New Revision: 209891
URL: http://svn.apache.org/viewcvs?rev=209891&view=rev
Log:
Expand on profile, find and fix more bugs because of it
Modified:
gump/branches/Gump3/gump
gump/branches/Gump3/metadata/vmgump.xml
gump/branches/Gump3/pygump/python/gump/engine/objectifier.py
gump/branches/Gump3/pygump/python/gump/plugins/builder.py
gump/branches/Gump3/pygump/python/gump/plugins/java/builder.py
Modified: gump/branches/Gump3/gump
URL: http://svn.apache.org/viewcvs/gump/branches/Gump3/gump?rev=209891&r1=209890&r2=209891&view=diff
==============================================================================
--- gump/branches/Gump3/gump (original)
+++ gump/branches/Gump3/gump Fri Jul 8 14:15:03 2005
@@ -1037,6 +1037,8 @@
# Load environment variables
setup_env
+echo Executing command: $1
+
# short circuit the help function because we don't really
# want to load complain about missing environment settings
# when the user is asking for help...
Modified: gump/branches/Gump3/metadata/vmgump.xml
URL: http://svn.apache.org/viewcvs/gump/branches/Gump3/metadata/vmgump.xml?rev=209891&r1=209890&r2=209891&view=diff
==============================================================================
--- gump/branches/Gump3/metadata/vmgump.xml (original)
+++ gump/branches/Gump3/metadata/vmgump.xml Fri Jul 8 14:15:03 2005
@@ -88,6 +88,14 @@
<url href="http://xml.apache.org/xerces2-j/index.html"/>
<description>Java XML Parser - the sequel with no equal</description>
</module>
+
+ <module name="xml-xalan">
+ <repository name="xml"/>
+
+ <url href="http://xml.apache.org/xalan-j/index.html"/>
+ <description>Release 2.x of the Xalan-Java XSLT processor</description>
+
+ </module>
</modules>
<projects>
@@ -139,20 +147,20 @@
<module name="xml-commons"/>
<!-- commands -->
- <ant basedir="java" buildfile="which.xml" target="jar" />
+ <ant basedir="java" buildfile="which.xml" target="jar"/>
<!-- outputs -->
<home nested="java/build"/>
<jar name="which.jar" id="which"/>
<!-- dependencies -->
- <depend project="xml-xerces" />
+ <depend project="xml-xerces"/>
<depend project="bootstrap-ant"/>
</project>
<project name="xml-commons-resolver">
<module name="xml-commons"/>
- <depend project="xml-resolver" inherit="jars" />
+ <depend project="xml-resolver" inherit="jars"/>
</project>
<project name="xml-resolver">
@@ -198,36 +206,76 @@
<!-- outputs -->
<home nested="java/build"/>
<jar name="xercesImpl.jar" id="xercesImpl"/>
- <license name="java/LICENSE"/>
<!-- dependencies -->
<depend project="xml-xerces"/>
</project>
- <project name="dist-xerces">
+ <project name="xjavac">
<module name="xml-xerces"/>
+
+ <!-- outputs -->
+ <home nested="java/tools"/>
+ <jar name="bin/xjavac.jar"/>
+ </project>
+ <project name="xalan">
+ <module name="xml"/>
+
<!-- commands -->
- <ant basedir="java" target="pack-bin">
- <sysproperty name="build.clonevm" value="true"/>
+ <ant basedir="java" target="unbundledjar">
+ <!-- todo: support properties -->
+ <property name="build.sysclasspath" value="last"/>
</ant>
+ <!-- outputs -->
+ <work nested="java/build/classes"/>
+ <work nested="java/build/serializer"/>
+ <home nested="java/build"/>
+ <jar name="xalan-unbundled.jar" type="boot" id="xalan"/>
+ <jar name="serializer.jar" id="serializer" type="boot"/>
+
<!-- dependencies -->
- <depend project="ant" inherit="runtime"/>
- <depend project="xjavac"/>
- <depend project="xalan"/>
+ <depend project="bootstrap-ant"/>
<depend project="xml-xerces"/>
- <depend project="xml-stylebook2"/>
- <depend project="xml-site"/>
+ <depend project="java_cup" runtime="true"/>
+ <depend project="jlex" runtime="true"/>
+ <depend project="bcel" runtime="true"/>
+ <depend project="xml-apis"/>
+ <depend project="jaxp"/>
</project>
-
- <project name="xjavac">
- <module name="xml-xerces"/>
-
+
+ <project name="xsltc">
+ <!-- commands -->
+ <ant basedir="java" target="xsltc.unbundledjar"/>
+
<!-- outputs -->
- <home nested="java/tools"/>
- <jar name="bin/xjavac.jar"/>
+ <work nested="java/build/classes"/>
+ <work nested="java/build/serializer"/>
+ <home nested="java/build"/>
+ <jar name="xsltc.jar" type="boot" id="xsltc"/>
+ <jar name="serializer.jar" id="serializer" type="boot"/>
+
+ <!-- dependencies -->
+ <depend project="bootstrap-ant"/>
+ <depend project="xml-xerces"/>
+ <depend project="java_cup" runtime="true"/>
+ <depend project="jlex" runtime="true"/>
+ <depend project="bcel" runtime="true"/>
+ <depend project="xml-apis"/>
</project>
+ <project name="java_cup">
+ <!-- outputs -->
+ <home nested="java"/>
+ <jar name="bin/java_cup.jar"/>
+ <jar name="bin/runtime.jar"/>
+ </project>
+
+ <project name="jlex">
+ <!-- outputs -->
+ <home nested="java"/>
+ <jar name="bin/JLex.jar"/>
+ </project>
</projects>
</workspace>
Modified: gump/branches/Gump3/pygump/python/gump/engine/objectifier.py
URL: http://svn.apache.org/viewcvs/gump/branches/Gump3/pygump/python/gump/engine/objectifier.py?rev=209891&r1=209890&r2=209891&view=diff
==============================================================================
--- gump/branches/Gump3/pygump/python/gump/engine/objectifier.py (original)
+++ gump/branches/Gump3/pygump/python/gump/engine/objectifier.py Fri Jul 8 14:15:03 2005
@@ -222,7 +222,7 @@
# Working directories for this project (containing java classes)
works = project_definition.getElementsByTagName("work")
for work in works:
- path = _extract_path(workdir, project_definition, work)
+ path = _extract_path(workdir, project, work)
project.add_output(Classdir(project, path))
# Jars
Modified: gump/branches/Gump3/pygump/python/gump/plugins/builder.py
URL: http://svn.apache.org/viewcvs/gump/branches/Gump3/pygump/python/gump/plugins/builder.py?rev=209891&r1=209890&r2=209891&view=diff
==============================================================================
--- gump/branches/Gump3/pygump/python/gump/plugins/builder.py (original)
+++ gump/branches/Gump3/pygump/python/gump/plugins/builder.py Fri Jul 8 14:15:03 2005
@@ -66,7 +66,6 @@
projectpath = get_project_directory(self.workdir,project)
scriptfile = abspath(join(projectpath, script.name))
- self.log.debug("Scriptfile seems to be %s" % scriptfile)
# No extension is ok, otherwise guess at one, platform appropriately
if not isfile(scriptfile):
@@ -78,7 +77,10 @@
if not isfile(scriptfile):
raise Error, "No script '%s' found!" % scriptfile
- args = [scriptfile] + script.args
+ self.log.debug("Scriptfile seems to be %s" % scriptfile)
+ args = []
+ args.append(scriptfile)
+ args.extend(script.args)
cmd = Popen(args,shell=True,cwd=projectpath,stdout=PIPE,stderr=STDOUT,env=project.env)
script.build_log = cmd.communicate()[0]
Modified: gump/branches/Gump3/pygump/python/gump/plugins/java/builder.py
URL: http://svn.apache.org/viewcvs/gump/branches/Gump3/pygump/python/gump/plugins/java/builder.py?rev=209891&r1=209890&r2=209891&view=diff
==============================================================================
--- gump/branches/Gump3/pygump/python/gump/plugins/java/builder.py (original)
+++ gump/branches/Gump3/pygump/python/gump/plugins/java/builder.py Fri Jul 8 14:15:03 2005
@@ -67,7 +67,7 @@
# Allow bootclasspath
if ant.boot_classpath:
- args += ['-X','bootclasspath/p',':'.join(ant.boot_classpath)]
+ args += ['-Xbootclasspath/p',':'.join(ant.boot_classpath)]
# Ant's entry point, and main options.
args += ["org.apache.tools.ant.Main"]