Mercurial > hg > graal-jvmci-8

comparison mx.jvmci/mx_jvmci.py @ 22335:8217ef77a80a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Work on Windows build
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Tue, 28 Jul 2015 08:46:37 -0700
parents aef178739a23
children 63e7eb179710
comparison
equal deleted inserted replaced
22334:aef178739a23 22335:8217ef77a80a
819 else: 819 else:
820 assert self.vm == 'jvmci', self.vm 820 assert self.vm == 'jvmci', self.vm
821 buildSuffix = 'jvmci' 821 buildSuffix = 'jvmci'
822 822
823 if isWindows: 823 if isWindows:
824 mx.abort('nyi') # TODO 824 t_compilelogfile = mx._cygpathU2W(os.path.join(_suite.dir, "graalCompile.log"))
825 # t_compilelogfile = mx._cygpathU2W(os.path.join(_suite.dir, "graalCompile.log")) 825 mksHome = mx.get_env('MKS_HOME', 'C:\\cygwin\\bin')
826 # mksHome = mx.get_env('MKS_HOME', 'C:\\cygwin\\bin') 826
827 827 variant = _hotspotGetVariant(self.vm)
828 # variant = _hotspotGetVariant(self.vm) 828 project_config = variant + '_' + self.vmbuild
829 # project_config = variant + '_' + build 829 jvmciHome = mx._cygpathU2W(_suite.dir)
830 # jvmciHome = mx._cygpathU2W(_suite.dir) 830 _runInDebugShell('msbuild ' + jvmciHome + r'\build\vs-amd64\jvm.vcproj /p:Configuration=' + project_config + ' /target:clean', jvmciHome)
831 # _runInDebugShell('msbuild ' + jvmciHome + r'\build\vs-amd64\jvm.vcproj /p:Configuration=' + project_config + ' /target:clean', jvmciHome) 831 winCompileCmd = r'set HotSpotMksHome=' + mksHome + r'& set JAVA_HOME=' + mx._cygpathU2W(mx.get_jdk().home) + r'& set path=%JAVA_HOME%\bin;%path%;%HotSpotMksHome%& cd /D "' + jvmciHome + r'\make\windows"& call create.bat ' + jvmciHome
832 # winCompileCmd = r'set HotSpotMksHome=' + mksHome + r'& set OUT_DIR=' + mx._cygpathU2W(jdk) + r'& set JAVA_HOME=' + mx._cygpathU2W(jdk) + r'& set path=%JAVA_HOME%\bin;%path%;%HotSpotMksHome%& cd /D "' + jvmciHome + r'\make\windows"& call create.bat ' + jvmciHome 832 print winCompileCmd
833 # print winCompileCmd 833 winCompileSuccess = re.compile(r"^Writing \.vcxproj file:")
834 # winCompileSuccess = re.compile(r"^Writing \.vcxproj file:") 834 if not _runInDebugShell(winCompileCmd, jvmciHome, t_compilelogfile, winCompileSuccess):
835 # if not _runInDebugShell(winCompileCmd, jvmciHome, t_compilelogfile, winCompileSuccess): 835 mx.abort('Error executing create command')
836 # mx.abort('Error executing create command') 836 winBuildCmd = 'msbuild ' + jvmciHome + r'\build\vs-amd64\jvm.vcxproj /p:Configuration=' + project_config + ' /p:Platform=x64'
837 # winBuildCmd = 'msbuild ' + jvmciHome + r'\build\vs-amd64\jvm.vcxproj /p:Configuration=' + project_config + ' /p:Platform=x64' 837 if not _runInDebugShell(winBuildCmd, jvmciHome, t_compilelogfile):
838 # if not _runInDebugShell(winBuildCmd, jvmciHome, t_compilelogfile): 838 mx.abort('Error building project')
839 # mx.abort('Error building project')
840 else: 839 else:
841 def filterXusage(line): 840 def filterXusage(line):
842 if not 'Xusage.txt' in line: 841 if not 'Xusage.txt' in line:
843 sys.stderr.write(line + os.linesep) 842 sys.stderr.write(line + os.linesep)
844 cpus = self.parallelism 843 cpus = self.parallelism