From c42c79a19044bdaea741ac526cbcb260931a0bf5 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Mon, 22 Mar 2010 14:13:40 +0000 Subject: [PATCH] * ./goodies : - Change: In builCoriolis.py, expand the '~' in the root path if needed. - Bug: Do not stop if the "--no-cache" option is given but the CMakeCache doesn't exists. --- bootstrap/buildCoriolis.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/bootstrap/buildCoriolis.py b/bootstrap/buildCoriolis.py index e0362bb1..27c1ac04 100755 --- a/bootstrap/buildCoriolis.py +++ b/bootstrap/buildCoriolis.py @@ -78,7 +78,7 @@ class ProjectBuilder: return if attribute == "svnTag": self._svnTag = value - elif attribute == "rootDir": self._rootDir = value + elif attribute == "rootDir": self._rootDir = os.path.expanduser(value) elif attribute == "quiet": self._quiet = value elif attribute == "buildMode": self._buildMode = value elif attribute == "doBuild": self._doBuild = value @@ -179,9 +179,11 @@ class ProjectBuilder: os.chdir ( toolBuildDir ) if self._noCache: - os.unlink ( os.path.join(toolBuildDir,"CMakeCache.txt") ) + cmakeCache = os.path.join(toolBuildDir,"CMakeCache.txt") + if os.isfile ( cmakeCache ): os.unlink ( cmakeCache ) - command = ["cmake", "-D", "BUILD_SHARED_LIBS:STRING=%s" % self._enableShared + command = ["cmake", "-D", "CMAKE_BUILD_TYPE:STRING=%s" % self._buildMode + , "-D", "BUILD_SHARED_LIBS:STRING=%s" % self._enableShared , "-D", "BUILD_DOC:STRING=%s" % self._enableDoc , "-D", "CHECK_DATABASE:STRING=%s" % self._checkDatabase , "-D", "CHECK_DETERMINISM:STRING=%s" % self._checkDeterminism @@ -282,7 +284,7 @@ class ProjectBuilder: if not self._quiet: print "Setting %s = \"%s\"." % (topVariable ,self._environment[topVariable]) if self._environment.has_key(topUserVariable): - print "Setting %s = \"%s\"." % (topUserVariable,self._environment[topUserVariable]) + print "Transmitting %s = \"%s\"." % (topUserVariable,self._environment[topUserVariable]) if projectName: project = self.getProject ( projectName )