Mercurial > hg > truffle
diff mx/commands.py @ 5680:87fc13b59258
Split _vmLibDirInJdk into _vmLibDirInJdk and _vmCfgInJdk to account for Windows jdk layout
In _runInDebugShell, use the platform's encoding for reading from the console
In _runInDebugShell, be able use the return code from the process to check for success, use this for the windows build
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Fri, 22 Jun 2012 11:35:11 +0200 |
parents | 14505f3e6b4c |
children | 9bb0ba9e8ba6 |
line wrap: on
line diff
--- a/mx/commands.py Thu Jun 21 17:33:45 2012 +0200 +++ b/mx/commands.py Fri Jun 22 11:35:11 2012 +0200 @@ -286,13 +286,23 @@ def _vmLibDirInJdk(jdk): """ - Get the directory within a JDK where jvm.cfg file and the server - and client subdirectories are located. + Get the directory within a JDK where the server and client + subdirectories are located. """ if platform.system() == 'Darwin': return join(jdk, 'jre', 'lib') + if platform.system() == 'Windows': + return join(jdk, 'jre', 'bin') return join(jdk, 'jre', 'lib', 'amd64') +def _vmCfgInJdk(jdk): + """ + Get the jvm.cfg file. + """ + if platform.system() == 'Windows': + return join(jdk, 'jre', 'lib', 'amd64', 'jvm.cfg') + return join(_vmLibDirInJdk(jdk), 'jvm.cfg') + def _jdk(build='product', create=False): """ Get the JDK into which Graal is installed, creating it first if necessary. @@ -315,7 +325,7 @@ # Make a copy of the default VM so that this JDK can be # reliably used as the bootstrap for a HotSpot build. - jvmCfg = join(_vmLibDirInJdk(jdk), 'jvm.cfg') + jvmCfg = _vmCfgInJdk(jdk) if not exists(jvmCfg): mx.abort(jvmCfg + ' does not exist') @@ -364,9 +374,9 @@ log = open(logFile, 'w') ret = False while True: - line = stdout.readline().decode() + line = stdout.readline().decode(sys.stdout.encoding) if logFile: - log.write(line) + log.write(line.encode('utf-8')) line = line.strip() mx.log(line) if line == STARTTOKEN: @@ -380,7 +390,14 @@ if match: ret = True if line == ENDTOKEN: - break + if not findInOutput: + stdin.write('echo ERR%errorlevel%' + newLine) + else: + break + if line.startswith('ERR'): + if line == 'ERR0': + ret = True + break; stdin.write('exit' + newLine) if logFile: log.close() @@ -495,8 +512,7 @@ mx.log('Error executing create command') return winBuildCmd = 'msbuild ' + _graal_home + r'\build\vs-amd64\jvm.vcxproj /p:Configuration=' + project_config + ' /p:Platform=x64' - winBuildSuccess = re.compile('Build succeeded.') - if not _runInDebugShell(winBuildCmd, _graal_home, compilelogfile, winBuildSuccess): + if not _runInDebugShell(winBuildCmd, _graal_home, compilelogfile): mx.log('Error building project') return else: @@ -516,7 +532,7 @@ mx.run([mx.gmake_cmd(), build + buildSuffix], cwd=join(_graal_home, 'make'), err=filterXusage) - jvmCfg = join(_vmLibDirInJdk(jdk), 'jvm.cfg') + jvmCfg = _vmCfgInJdk(jdk) found = False if not exists(jvmCfg): mx.abort(jvmCfg + ' does not exist')