jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* ./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.
This commit is contained in:
Jean-Paul Chaput 2010-03-22 14:13:40 +00:00
parent 860485d7b8
commit c42c79a190
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bootstrap/buildCoriolis.py
View File

@ -78,7 +78,7 @@ class ProjectBuilder:
return return
if attribute == "svnTag": self._svnTag = value 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 == "quiet": self._quiet = value
elif attribute == "buildMode": self._buildMode = value elif attribute == "buildMode": self._buildMode = value
elif attribute == "doBuild": self._doBuild = value elif attribute == "doBuild": self._doBuild = value
@ -179,9 +179,11 @@ class ProjectBuilder:
os.chdir ( toolBuildDir ) os.chdir ( toolBuildDir )
if self._noCache: 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", "BUILD_DOC:STRING=%s" % self._enableDoc
, "-D", "CHECK_DATABASE:STRING=%s" % self._checkDatabase , "-D", "CHECK_DATABASE:STRING=%s" % self._checkDatabase
, "-D", "CHECK_DETERMINISM:STRING=%s" % self._checkDeterminism , "-D", "CHECK_DETERMINISM:STRING=%s" % self._checkDeterminism
@ -282,7 +284,7 @@ class ProjectBuilder:
if not self._quiet: if not self._quiet:
print "Setting %s = \"%s\"." % (topVariable ,self._environment[topVariable]) print "Setting %s = \"%s\"." % (topVariable ,self._environment[topVariable])
if self._environment.has_key(topUserVariable): if self._environment.has_key(topUserVariable):
print "Setting %s = \"%s\"." % (topUserVariable,self._environment[topUserVariable]) print "Transmitting %s = \"%s\"." % (topUserVariable,self._environment[topUserVariable])
if projectName: if projectName:
project = self.getProject ( projectName ) project = self.getProject ( projectName )