ajack 2003/12/01 12:48:12
Modified: python/gump/test/resources/full1 maven1.xml
profile gump.xml
python/gump/model ant.py project.py
python/gump/test maven.py
Added: project invicta.xml
Log:
1) Added invicta
2) Worked on Maven & Unit Tests
Revision Changes Path
1.1 jakarta-gump/project/invicta.xml
Index: invicta.xml
===================================================================
<?xml version="1.0"?>
<module name="invicta">
<url href="http://invicta.sourceforge.net/"/>
<description>
Open-source build management tool.
</description>
<cvs repository="sourceforge"
host-prefix="cvs.invicta"
dir="invicta"/>
<project name="invicta">
<package>net.sf.invicta</package>
<!-- Work dirs to be included in classpath -->
<work nested="target/antclasses"/>
<home nested="target/lib"/>
<ant target="pack">
<property name="ant.home" reference="home" project="ant"/>
<property name="invicta.jar.file" value="invicta-@@DATE@@.jar"/>
</ant>
<depend project="ant"/>
<depend project="ant-contrib"/>
<depend project="commons-logging"/>
<depend project="commons-digester"/>
<depend project="commons-lang"/>
<depend project="commons-beanutils"/>
<depend project="commons-collections"/>
<depend project="xml-xerces"/>
<jar name="invicta-@@DATE@@.jar"/>
<javadoc nested="doc/api" project="invicta"/>
</project>
</module>
1.2 +1 -0 jakarta-gump/python/gump/test/resources/full1/maven1.xml
Index: maven1.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/test/resources/full1/maven1.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven1.xml 1 Dec 2003 17:34:08 -0000 1.1
+++ maven1.xml 1 Dec 2003 20:48:12 -0000 1.2
@@ -12,6 +12,7 @@
<maven target="gump"/>
+ <depend project="project4"/>
<option project="random"/>
<home nested="dist"/>
1.284 +1 -0 jakarta-gump/profile/gump.xml
Index: gump.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/profile/gump.xml,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -r1.283 -r1.284
--- gump.xml 1 Dec 2003 17:46:24 -0000 1.283
+++ gump.xml 1 Dec 2003 20:48:12 -0000 1.284
@@ -138,6 +138,7 @@
<module href="project/hsqldb.xml"/>
<module href="project/httpunit.xml"/>
<module href="project/iso-relax.xml"/>
+ <module href="project/invicta.xml"/>
<module href="project/javagroups.xml"/>
<module href="project/javassist.xml"/>
<module href="project/jaxen.xml"/>
1.9 +1 -1 jakarta-gump/python/gump/model/ant.py
Index: ant.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/model/ant.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ant.py 1 Dec 2003 17:34:07 -0000 1.8
+++ ant.py 1 Dec 2003 20:48:12 -0000 1.9
@@ -226,7 +226,7 @@
AntBuilder.__init__(self,xml,project)
# Import the goal
- self.goal='gump'
+ self.goal='jar'
if xml.goal:
self.goal=xml.goal
1.19 +19 -8 jakarta-gump/python/gump/model/project.py
Index: project.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/model/project.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- project.py 1 Dec 2003 17:34:07 -0000 1.18
+++ project.py 1 Dec 2003 20:48:12 -0000 1.19
@@ -221,15 +221,15 @@
self.honoraryPackage=0
def hasAnt(self):
- if hasattr(self,'ant'): return 1
+ if hasattr(self,'ant') and self.ant: return 1
return 0
def hasMaven(self):
- if hasattr(self,'maven'): return 1
+ if hasattr(self,'maven') and self.maven: return 1
return 0
def hasScript(self):
- if hasattr(self,'script'): return 1
+ if hasattr(self,'script') and self.script: return 1
return 0
@@ -706,7 +706,7 @@
maven=self.xml.maven
# The ant goal (or none == ant default goal)
- goal=maven.goal or ''
+ goal=self.maven.getGoal()
# Optional 'verbose' or 'debug'
verbose=maven.verbose
@@ -752,13 +752,18 @@
if jvmargs:
cmd.addParameters(jvmargs)
- cmd.addParameter('org.apache.tools.ant.Main')
+ cmd.addParameter('org.apache.maven.cli.App')
#
- # Allow ant-level debugging...
+ # Allow maven-level debugging...
#
if debug: cmd.addParameter('--debug')
- if verbose: cmd.addParameter('--exception')
+ if verbose: cmd.addParameter('--exception')
+
+ #
+ # Suppress downloads
+ #
+ cmd.addParameter('--offline')
#
# This sets the *defaults*, a workspace could override them.
@@ -774,7 +779,13 @@
def getJVMArgs(self):
"""Get JVM arguments for a project"""
args=Parameters()
- for jvmarg in self.getAnt().xml.jvmarg:
+
+ if self.hasAnt():
+ jvmargs=self.getAnt().xml.jvmarg
+ elif self.hasMaven():
+ jvmargs=self.getMaven().xml.jvmarg
+
+ for jvmarg in jvmargs:
if jvmarg.value:
args.addParameter(jvmarg.value)
else:
1.2 +3 -0 jakarta-gump/python/gump/test/maven.py
Index: maven.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/test/maven.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.py 1 Dec 2003 17:34:08 -0000 1.1
+++ maven.py 1 Dec 2003 20:48:12 -0000 1.2
@@ -93,4 +93,7 @@
self.maven1.generateMavenProperties()
+ cmd=self.maven1.getMavenCommand()
+
+ cmd.dump()
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
