# HG changeset patch
# User Gilles Duboscq <gilles.m.duboscq@oracle.com>
# Date 1438098397 25200
# Node ID 8217ef77a80a64b8b773ba1a91363dbeb3d782e6
# Parent  aef178739a239a519e4238c74404db8c19e4c940
Work on Windows build

diff -r aef178739a23 -r 8217ef77a80a mx.jvmci/mx_jvmci.py
--- 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:
diff -r aef178739a23 -r 8217ef77a80a mx.jvmci/suite.py
--- a/mx.jvmci/suite.py	Mon Jul 27 17:19:42 2015 +0200
+++ b/mx.jvmci/suite.py	Tue Jul 28 08:46:37 2015 -0700
@@ -1,5 +1,5 @@
 suite = {
-  "mxversion" : "5.0",
+  "mxversion" : "5.1",
   "name" : "jvmci",
 
     # ------------- Libraries -------------
@@ -272,16 +272,34 @@
       "native" : True,
       "class" : "HotSpotProject",
       "output" : "build<nojvmci>",
-      "results" : [
-          '<os>/<os>_<arch>_<buildname>/generated/jvmtifiles/jvmti.h',
-          '<os>/<os>_<arch>_<buildname>/generated/sa-jdi.jar',
-          '<os>/<os>_<arch>_<buildname>/<vmbuild>/<lib:jvm>',
-          '<os>/<os>_<arch>_<buildname>/<vmbuild>/<libdebug:jvm>',
-          '<os>/<os>_<arch>_<buildname>/<vmbuild>/<lib:saproc>',
-          '<os>/<os>_<arch>_<buildname>/<vmbuild>/<libdebug:saproc>',
-          '<os>/<os>_<arch>_<buildname>/<vmbuild>/<lib:jsig>',
-          '<os>/<os>_<arch>_<buildname>/<vmbuild>/<libdebug:jsig>',
-      ]
+      # vs-<arch>/<buildname>/generated/jvmtifiles/jvmti.h
+      # vs-<arch>/<buildname>/<vmbuild>/<lib:jvm>
+      # vs-<arch>/<buildname>/<vmbuild>/<libdebug:jvm>
+      "os_arch" : {
+        "windows" : {
+          "<others>" : {
+            "results" : [
+              'vs-<arch>/<buildname>/generated/jvmtifiles/jvmti.h',
+              'vs-<arch>/<buildname>/<vmbuild>/<lib:jvm>',
+              'vs-<arch>/<buildname>/<vmbuild>/<libdebug:jvm>',
+            ]
+          }
+        },
+        "<others>": {
+          "<others>" : {
+            "results" : [
+              '<os>/<os>_<arch>_<buildname>/generated/jvmtifiles/jvmti.h',
+              '<os>/<os>_<arch>_<buildname>/generated/sa-jdi.jar',
+              '<os>/<os>_<arch>_<buildname>/<vmbuild>/<lib:jvm>',
+              '<os>/<os>_<arch>_<buildname>/<vmbuild>/<libdebug:jvm>',
+              '<os>/<os>_<arch>_<buildname>/<vmbuild>/<lib:saproc>',
+              '<os>/<os>_<arch>_<buildname>/<vmbuild>/<libdebug:saproc>',
+              '<os>/<os>_<arch>_<buildname>/<vmbuild>/<lib:jsig>',
+              '<os>/<os>_<arch>_<buildname>/<vmbuild>/<libdebug:jsig>',
+            ]
+          }
+        },
+      },
     }
   },