gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From leosim...@apache.org
Subject svn commit: r209635 - in /gump/branches/Gump3: metadata/vmgump.xml pygump/python/gump/engine/objectifier.py pygump/python/gump/plugins/builder.py pygump/python/gump/plugins/java/builder.py
Date Thu, 07 Jul 2005 19:10:15 GMT
Author: leosimons
Date: Thu Jul  7 12:10:14 2005
New Revision: 209635

URL: http://svn.apache.org/viewcvs?rev=209635&view=rev
Log:
Fix a bunch of bugs in builder parsing and the vmgump profile that makes it all actually run.

Modified:
    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/metadata/vmgump.xml
URL: http://svn.apache.org/viewcvs/gump/branches/Gump3/metadata/vmgump.xml?rev=209635&r1=209634&r2=209635&view=diff
==============================================================================
--- gump/branches/Gump3/metadata/vmgump.xml (original)
+++ gump/branches/Gump3/metadata/vmgump.xml Thu Jul  7 12:10:14 2005
@@ -66,56 +66,14 @@
     </module>
   </modules>
   
-  
   <projects>
     <project name="gump-unit-tests">
 <module name="gump"/>
-<script name="gump" args="test"/> 
+<script name="gump">
+  <arg name="" value="test"/>
+</script> 
     </project>
 
-    <project name="gump-test1">
-<module name="gump-test"/>
-<script name="gump-test1"/> 
-    </project>
-
-    <project name="bogus">
-      <module name="gump-test"/>
-      
-      <!-- test failure...<script name="doesnotexist"/>-->
-    </project>
-    
-    <project name="bogus2">
-      <module name="gump-test"/>
-      
-      <depend project="bogus"/>
-    </project>
-
-    <project name="bogus3">
-      <module name="gump-test"/>
-      
-      <depend project="bogus2"/>
-    </project>
-
-    <project name="bogus4">
-      <module name="gump-test"/>
-      
-      <depend project="bogus3"/>
-    </project>
-
-    <!-- project name="bogus5">
-      <module name="doesnotexist"/>
-      
-      <depend project="bogus3"/>
-    </project -->
-
-    <project name="test-attempt-dir-management">
-      <module name="gump-test"/>
-      
-      <!-- commands -->
-      <rmdir dir="some"/>
-      <mkdir dir="some/directory"/>
-    </project>
-   
     <project name="bootstrap-ant">
       <module name="ant"/>
       
@@ -126,9 +84,6 @@
       <home nested="bootstrap"/>
       <jar name="lib/ant.jar"/>
       <jar name="lib/ant-launcher.jar" id="ant-launcher"/>
-
-      <!-- dependencies -->
-      <depend project="bogus4"/>
     </project>
 
     <project name="dist-ant">

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=209635&r1=209634&r2=209635&view=diff
==============================================================================
--- gump/branches/Gump3/pygump/python/gump/engine/objectifier.py (original)
+++ gump/branches/Gump3/pygump/python/gump/engine/objectifier.py Thu Jul  7 12:10:14 2005
@@ -230,9 +230,12 @@
         name = cmd.getAttribute("name")
         args = []
         for arg in cmd.getElementsByTagName("arg"):
-            name = arg.getAttribute("name")
-            value = arg.getAttribute("value")
-            args.append((name, value))
+            argname = arg.getAttribute("name")
+            argvalue = arg.getAttribute("value")
+            if argname:
+                args.append(argname)
+            if argvalue:
+                args.append(argvalue)
             
         project.add_command(Script(project, name, args))
 

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=209635&r1=209634&r2=209635&view=diff
==============================================================================
--- gump/branches/Gump3/pygump/python/gump/plugins/builder.py (original)
+++ gump/branches/Gump3/pygump/python/gump/plugins/builder.py Thu Jul  7 12:10:14 2005
@@ -66,6 +66,7 @@
         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):

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=209635&r1=209634&r2=209635&view=diff
==============================================================================
--- gump/branches/Gump3/pygump/python/gump/plugins/java/builder.py (original)
+++ gump/branches/Gump3/pygump/python/gump/plugins/java/builder.py Thu Jul  7 12:10:14 2005
@@ -54,14 +54,14 @@
         self.log.debug('BOOTCLASSPATH %s' % ant.boot_classpath)
         
         # Create an Environment
-        project.env['CLASSPATH'] = str(ant.classpath)
+        project.env['CLASSPATH'] = os.pathsep.join(ant.classpath)
         
         # TODO test this
         # TODO sysclasspath only
         # TODO more options
         
         # Build the command line.
-        args = ["java"]
+        args = [join(os.environ["JAVA_HOME"], "bin", "java")]
         
         # Allow bootclasspath
         if ant.boot_classpath:



Mime
View raw message