Mercurial > hg > graal-jvmci-8

diff 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
line wrap: on
line diff
--- a/mx.jvmci/mx_jvmci.py	Mon Jul 27 17:19:42 2015 +0200
+++ b/mx.jvmci/mx_jvmci.py	Tue Jul 28 08:46:37 2015 -0700
@@ -821,22 +821,21 @@
             buildSuffix = 'jvmci'
 
         if isWindows:
-            mx.abort('nyi')  # TODO
-            # t_compilelogfile = mx._cygpathU2W(os.path.join(_suite.dir, "graalCompile.log"))
-            # mksHome = mx.get_env('MKS_HOME', 'C:\\cygwin\\bin')
+            t_compilelogfile = mx._cygpathU2W(os.path.join(_suite.dir, "graalCompile.log"))
+            mksHome = mx.get_env('MKS_HOME', 'C:\\cygwin\\bin')
 
-            # variant = _hotspotGetVariant(self.vm)
-            # project_config = variant + '_' + build
-            # jvmciHome = mx._cygpathU2W(_suite.dir)
-            # _runInDebugShell('msbuild ' + jvmciHome + r'\build\vs-amd64\jvm.vcproj /p:Configuration=' + project_config + ' /target:clean', jvmciHome)
-            # 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
-            # print winCompileCmd
-            # winCompileSuccess = re.compile(r"^Writing \.vcxproj file:")
-            # if not _runInDebugShell(winCompileCmd, jvmciHome, t_compilelogfile, winCompileSuccess):
-            #     mx.abort('Error executing create command')
-            # winBuildCmd = 'msbuild ' + jvmciHome + r'\build\vs-amd64\jvm.vcxproj /p:Configuration=' + project_config + ' /p:Platform=x64'
-            # if not _runInDebugShell(winBuildCmd, jvmciHome, t_compilelogfile):
-            #     mx.abort('Error building project')
+            variant = _hotspotGetVariant(self.vm)
+            project_config = variant + '_' + self.vmbuild
+            jvmciHome = mx._cygpathU2W(_suite.dir)
+            _runInDebugShell('msbuild ' + jvmciHome + r'\build\vs-amd64\jvm.vcproj /p:Configuration=' + project_config + ' /target:clean', jvmciHome)
+            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
+            print winCompileCmd
+            winCompileSuccess = re.compile(r"^Writing \.vcxproj file:")
+            if not _runInDebugShell(winCompileCmd, jvmciHome, t_compilelogfile, winCompileSuccess):
+                mx.abort('Error executing create command')
+            winBuildCmd = 'msbuild ' + jvmciHome + r'\build\vs-amd64\jvm.vcxproj /p:Configuration=' + project_config + ' /p:Platform=x64'
+            if not _runInDebugShell(winBuildCmd, jvmciHome, t_compilelogfile):
+                mx.abort('Error building project')
         else:
             def filterXusage(line):
                 if not 'Xusage.txt' in line: