comparison pytools/commands.py @ 3625:019c1951cb04

fixes for build process
author Michael Haupt <michael.haupt@oracle.com>
date Wed, 09 Nov 2011 17:29:14 +0100
parents e81927755129
children c773cc740d4a
comparison
equal deleted inserted replaced
3624:e81927755129 3625:019c1951cb04
138 f.write('-graal KNOWN\n') 138 f.write('-graal KNOWN\n')
139 139
140 fix_jvm_cfg(env, env.jdk7) 140 fix_jvm_cfg(env, env.jdk7)
141 141
142 if env.get_os() != 'windows': 142 if env.get_os() != 'windows':
143 javaLink = join(env.graal_home, 'graal', 'hotspot', 'java') 143 javaLink = join(env.graal_home, 'hotspot', 'java')
144 if not exists(javaLink): 144 if not exists(javaLink):
145 javaExe = join(env.jdk7, 'jre', 'bin', 'java') 145 javaExe = join(env.jdk7, 'jre', 'bin', 'java')
146 env.log('Creating link: ' + javaLink + ' -> ' + javaExe) 146 env.log('Creating link: ' + javaLink + ' -> ' + javaExe)
147 os.symlink(javaExe, javaLink) 147 os.symlink(javaExe, javaLink)
148 148
149 graalVmDir = join(env.jdk7, 'jre', 'lib', 'amd64', 'graal') 149 graalVmDir = join(env.jdk7, 'jre', 'lib', 'amd64', 'graal')
150 if not exists(graalVmDir): 150 if not exists(graalVmDir):
151 env.log('Creating Graal directory in JDK7: ' + graalVmDir) 151 env.log('Creating Graal directory in JDK7: ' + graalVmDir)
152 os.makedirs(graalVmDir) 152 os.makedirs(graalVmDir)
153 153
154 os.environ.update(ARCH_DATA_MODEL='64', LANG='C', HOTSPOT_BUILD_JOBS='4', ALT_BOOTDIR=env.jdk7g, INSTALL='y') 154 os.environ.update(ARCH_DATA_MODEL='64', LANG='C', HOTSPOT_BUILD_JOBS='4', ALT_BOOTDIR=env.jdk7, INSTALL='y')
155 env.run(['gmake', 'jvmggraal'], cwd=join(env.graal_home, 'make')) 155 env.run(['gmake', 'jvmggraal'], cwd=join(env.graal_home, 'make'))
156 156
157 os.environ.update(ARCH_DATA_MODEL='64', LANG='C', HOTSPOT_BUILD_JOBS='4', ALT_BOOTDIR=env.jdk7, INSTALL='y') 157 os.environ.update(ARCH_DATA_MODEL='64', LANG='C', HOTSPOT_BUILD_JOBS='4', ALT_BOOTDIR=env.jdk7, INSTALL='y')
158 env.run(['gmake', 'productgraal'], cwd=join(env.graal_home, 'make')) 158 env.run(['gmake', 'productgraal'], cwd=join(env.graal_home, 'make'))
159 159