graal-jvmci-8: src/os/windows/vm/os

6981484: Update development launcher Summary: Add new development launcher called hotspot(.exe) Reviewed-by: coleenp

comparison

equal deleted inserted replaced

-:2968675b413e
+:cb2d0a362639
 if (saved_jvm_path[0] != 0) {
 strcpy(buf, saved_jvm_path);
 return;
 }
+buf[0] = '\0';
+if (strcmp(Arguments::sun_java_launcher(), "gamma") == 0) {
+// Support for the gamma launcher. Check for an
+// ALT_JAVA_HOME or JAVA_HOME environment variable
+// and fix up the path so it looks like
+// libjvm.so is installed there (append a fake suffix
+// hotspot/libjvm.so).
+char* java_home_var = ::getenv("ALT_JAVA_HOME");
+if (java_home_var == NULL) {
+java_home_var = ::getenv("JAVA_HOME");
+}
+if (java_home_var != NULL && java_home_var[0] != 0) {
+strncpy(buf, java_home_var, buflen);
+// determine if this is a legacy image or modules image
+// modules image doesn't have "jre" subdirectory
+size_t len = strlen(buf);
+char* jrebin_p = buf + len;
+jio_snprintf(jrebin_p, buflen-len, "\\jre\\bin\\");
+if (0 != _access(buf, 0)) {
+jio_snprintf(jrebin_p, buflen-len, "\\bin\\");
+}
+len = strlen(buf);
+jio_snprintf(buf + len, buflen-len, "hotspot\\jvm.dll");
+}
+}
+if(buf[0] == '\0') {
 GetModuleFileName(vm_lib_handle, buf, buflen);
+}
 strcpy(saved_jvm_path, buf);
 }
 void os::print_jni_name_prefix_on(outputStream* st, int args_size) {

Mercurial > hg > graal-jvmci-8