No longer sets the <PROJECT>_USER_TOP if it's not set in the environment.

This commit is contained in:
Jean-Paul Chaput 2010-03-19 16:02:35 +00:00
parent 2d0f027aee
commit 860485d7b8
1 changed files with 4 additions and 3 deletions

View File

@ -277,11 +277,12 @@ class ProjectBuilder:
topUserVariable = "%s_USER_TOP" % project.getName().upper() topUserVariable = "%s_USER_TOP" % project.getName().upper()
if not self._environment.has_key(topVariable): if not self._environment.has_key(topVariable):
self._environment[ topVariable ] = self._installDir self._environment[ topVariable ] = self._installDir
if not self._environment.has_key(topUserVariable): #if not self._environment.has_key(topUserVariable):
self._environment[ topUserVariable ] = self._installDir # self._environment[ topUserVariable ] = self._installDir
if not self._quiet: if not self._quiet:
print "Setting %s = \"%s\"." % (topVariable ,self._environment[topVariable]) print "Setting %s = \"%s\"." % (topVariable ,self._environment[topVariable])
print "Setting %s = \"%s\"." % (topUserVariable,self._environment[topUserVariable]) if self._environment.has_key(topUserVariable):
print "Setting %s = \"%s\"." % (topUserVariable,self._environment[topUserVariable])
if projectName: if projectName:
project = self.getProject ( projectName ) project = self.getProject ( projectName )