diff options
| author | Joseph Hunkeler <jhunkeler@gmail.com> | 2013-05-29 10:49:14 -0400 |
|---|---|---|
| committer | Joseph Hunkeler <jhunkeler@gmail.com> | 2013-05-29 10:49:14 -0400 |
| commit | 53f01e6c5c77479b232faa1835326c22aa52bce1 (patch) | |
| tree | 240f950ada66cff18eeb6a316498cbc6b547a9a2 /ipsutils/env.py | |
| parent | 59d459e84e4c83b69e2dd9bb2b2f2ff8d975fb09 (diff) | |
| download | ipsutils-53f01e6c5c77479b232faa1835326c22aa52bce1.tar.gz | |
Massive renaming of dictionary terms, and linux is now a supported test platform (for the sake of execution)
Diffstat (limited to 'ipsutils/env.py')
| -rw-r--r-- | ipsutils/env.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/ipsutils/env.py b/ipsutils/env.py index 6be69f0..4087b6f 100644 --- a/ipsutils/env.py +++ b/ipsutils/env.py @@ -21,9 +21,10 @@ from . import config class Environment(config.Config): def __init__(self, ipsfile): super(Environment, self).__init__(ipsfile) - + # Platform specific ipsbuild directory assignment if sys.platform == 'linux2' \ + or sys.platform == 'linux' \ or sys.platform == 'sunos5': self.__basepath = os.path.join(os.environ['HOME'], 'ipsbuild') else: @@ -45,7 +46,7 @@ class Environment(config.Config): # Dictionary of package-level directories self.env_pkg = { 'BUILDROOT': os.path.join(self.env['BUILDROOT'], self.complete_name), - 'BUILDPROTO': os.path.join(self.env['BUILDROOT'], self.complete_name, 'proto_install'), + 'BUILDPROTO': os.path.join(self.env['BUILDROOT'], self.complete_name, 'root'), 'BUILD': os.path.join(self.env['BUILD'], self.complete_name), 'SOURCES': os.path.join(self.env['SOURCES'], os.path.basename(self.key_dict['source_url'])), 'PKGS': os.path.join(self.env['PKGS'], self.complete_name), @@ -53,11 +54,11 @@ class Environment(config.Config): } self.env_meta = { - 'TRANS': os.path.join(self.env_pkg['BUILDROOT'], self.complete_name + '.mog'), - 'FILES': os.path.join(self.env_pkg['BUILDROOT'], self.complete_name + '.p5m.1'), - 'FILES_PASS2': os.path.join(self.env_pkg['BUILDROOT'], self.complete_name + '.p5m.2'), - 'DEPENDS': os.path.join(self.env_pkg['BUILDROOT'], self.complete_name + '.p5m.3'), - 'DEPENDSOLVE': os.path.join(self.env_pkg['BUILDROOT'], self.complete_name + '.p5m.3.res') + 'STAGE1': os.path.join(self.env_pkg['BUILDROOT'], self.complete_name + '.1'), + 'STAGE1_PASS2': os.path.join(self.env_pkg['BUILDROOT'], self.complete_name + '.1p2'), + 'STAGE2': os.path.join(self.env_pkg['BUILDROOT'], self.complete_name + '.2'), + 'STAGE3': os.path.join(self.env_pkg['BUILDROOT'], self.complete_name), + 'STAGE4': os.path.join(self.env_pkg['BUILDROOT'], self.complete_name + '.res') } # Generic utility mapping for platform specific configuration. # Note: This is mainly to test script functionality on different platforms @@ -73,7 +74,7 @@ class Environment(config.Config): 'pkgfmt': 'pkgfmt' } - # Oracle Solaris tar is ancient. GNU tar is preferrred. + # Oracle Solaris tar is ancient. GNU tar is preferred. if sys.platform == 'sunos5': self.tool['tar'] = 'gtar' |