gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aj...@apache.org
Subject svn commit: r170979 - /gump/branches/Gump3/pygump/python/gump/plugins/java/builder.py
Date Thu, 19 May 2005 18:57:25 GMT
Author: ajack
Date: Thu May 19 11:57:23 2005
New Revision: 170979

URL: http://svn.apache.org/viewcvs?rev=170979&view=rev
Log:
Added $JAVA_HOME/lib/tools.jar to classpath, allowng dist-ant to build. :-)

 Project build log
 ==========================================================================
 <Project: bogus>: OK
 <Project: bogus2>: OK
 <Project: bogus3>: OK
 <Project: bogus4>: OK
 <Project: bootstrap-ant>: OK
 <Project: dist-ant>: OK
 <Project: gump-test1>: OK
 <Project: test-attempt-dir-management>: OK
 ==========================================================================


Modified:
    gump/branches/Gump3/pygump/python/gump/plugins/java/builder.py

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=170979&r1=170978&r2=170979&view=diff
==============================================================================
--- gump/branches/Gump3/pygump/python/gump/plugins/java/builder.py (original)
+++ gump/branches/Gump3/pygump/python/gump/plugins/java/builder.py Thu May 19 11:57:23 2005
@@ -96,11 +96,17 @@
 
     def _calculateClasspaths(self, project, ant):
         """Generate the classpath lists"""
-        #TODO This ought be under "java" not under "Ant".        
+        #TODO This ought be under "java & Ant" not under "Ant".        
 
+        # Ant requires to be told about a compiler, so (for now)
+        # we'll hardcode CLASSPATH to add $JAVA_HOME/lib/tools.jar
+        # IFF $JAVA_HOME exists.
+        if os.environ.has_key('JAVA_HOME'):
+            ant.classpath += ArtifactPath('Java Tools (e.g. Compiler)',os.path.join(os.environ['JAVA_HOME'],'lib','tools.jar'))
+        
         # Any internal build artifacts
         for work in project.workitems:
-            self.classpath += ArtifactPath(work.name,output.path.resolve(self.workdir)) 
+            ant.classpath += ArtifactPath(work.name,output.path.resolve(self.workdir)) 
             
         # Recurse into dependencies
         visited=[]
@@ -226,7 +232,8 @@
     def _do_ant(self, project, ant):                
         projectpath = get_project_directory(self.workdir,project)
         
-        # TODO get proper classpath
+        
+        #TODO get proper classpath
         self.log.debug('CLASSPATH %s' % ant.classpath)
         self.log.debug('BOOTCLASSPATH %s' % ant.boot_classpath)
         



Mime
View raw message