You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by bo...@apache.org on 2010/04/25 07:43:23 UTC
svn commit: r937747 - /gump/trunk/python/gump/core/build/mvn.py
Author: bodewig
Date: Sun Apr 25 05:43:23 2010
New Revision: 937747
URL: http://svn.apache.org/viewvc?rev=937747&view=rev
Log:
move all local mvn repos under a common directory and clean up this common directory at the end, allowing 'separate' local repos to stay around until the end of the Gump run
Modified:
gump/trunk/python/gump/core/build/mvn.py
Modified: gump/trunk/python/gump/core/build/mvn.py
URL: http://svn.apache.org/viewvc/gump/trunk/python/gump/core/build/mvn.py?rev=937747&r1=937746&r2=937747&view=diff
==============================================================================
--- gump/trunk/python/gump/core/build/mvn.py (original)
+++ gump/trunk/python/gump/core/build/mvn.py Sun Apr 25 05:43:23 2010
@@ -27,7 +27,7 @@ from gump.util.file import FILE_TYPE_CON
from gump.util.process.command import Cmd, CMD_STATE_SUCCESS, \
CMD_STATE_TIMED_OUT, Parameters
from gump.util.process.launcher import execute
-from gump.util.tools import catFileToFileHolder, wipeDirectoryTree
+from gump.util.tools import catFileToFileHolder
from time import strftime
@@ -83,7 +83,7 @@ def getMavenCommand(project, languageHel
#
# Build a classpath (based upon dependencies)
#
- (classpath, bootclasspath) = languageHelper.getClasspaths(project)
+ (classpath, _bootclasspath) = languageHelper.getClasspaths(project)
# Run Maven...
cmd = Cmd('mvn', 'build_' + project.getModule().getName() + '_' + \
@@ -175,8 +175,6 @@ class Maven2Builder(RunSpecific):
if os.path.exists(pomFile):
project.addDebug('Maven POM in: ' + pomFile)
catFileToFileHolder(project, pomFile, FILE_TYPE_CONFIG)
-
- wipeDirectoryTree(self.locateLocalRepo(project), False)
# Do this even if not ok
@@ -225,8 +223,10 @@ class Maven2Builder(RunSpecific):
if self.needsSeparateLocalRepository(project):
localRepositoryDir = self.locateLocalRepo(project)
else:
- localRepositoryDir = \
- self.run.getWorkspace().getLocalRepositoryDirectory()
+ localRepositoryDir = os.path.abspath(\
+ os.path.join(self.run.getWorkspace()
+ .getLocalRepositoryDirectory(), "shared")
+ )
props = open(settingsFile, 'w')
@@ -267,9 +267,9 @@ class Maven2Builder(RunSpecific):
# Where to put the local repository
#
return os.path.abspath(os.path.join(self.run.getWorkspace()\
- .getBaseDirectory(),
+ .getLocalRepositoryDirectory(),
project.getName() \
- + ".mvnlocalrepo"))
+ + ".mvnlocalrepo"))
def needsSeparateLocalRepository(self, project):
return project.mvn.needsSeparateLocalRepository()