< prev index next >

make/hotspot/ide/CreateVSProject.gmk

Print this page

        

@@ -1,7 +1,7 @@
 #
-# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.  Oracle designates this

@@ -28,13 +28,12 @@
 
 include $(SPEC)
 include MakeBase.gmk
 include JavaCompilation.gmk
 include SetupJavaCompilers.gmk
-include Execute.gmk
 
-ifeq ($(call isTargetOs, windows), true)
+ifeq ($(OPENJDK_TARGET_OS), windows)
   # The next part is a bit hacky. We include the CompileJvm.gmk to be
   # able to extact flags, but we do not wish to execute the rules.
 
   # Use client as base for defines and includes
   JVM_VARIANT=client

@@ -45,21 +44,12 @@
   # Reset targets so we don't build libjvm.
   TARGETS :=
 
   # Helper macro to convert a unix path to a Windows path, suitable for
   # inclusion in a command line.
-  ifeq ($(call isBuildOsEnv, windows.cygwin), true)
-    FixPath = \
-        $(strip $(subst \,\\,$(shell $(CYGPATH) -w $1)))
-    FixLinuxExecutable = \
-        $(call FixPath, $1)
-  else ifeq ($(call isBuildOsEnv, windows.wsl), true)
-    FixPath = \
-        $(strip $(subst \,\\,$(shell $(WSLPATH) -w $1)))
-    FixLinuxExecutable = \
-        "%windir%\Sysnative\wsl.exe $1"
-  endif
+  FixPath = \
+    $(strip $(subst \,\\,$(shell $(CYGPATH) -w $1)))
 
   JVM_DEFINES_client := $(patsubst -D%,%, $(filter -D%, $(JVM_CFLAGS)))
   EXTRACTED_DEFINES_client := $(addprefix -define , $(JVM_DEFINES_client))
 
   JVM_INCLUDES_client := $(patsubst -I%,%, $(filter -I%, $(JVM_CFLAGS)))

@@ -129,11 +119,11 @@
       -compiler VC10 \
       -jdkTargetRoot $(call FixPath, $(JDK_OUTPUTDIR)) \
       -platformName x64 \
       -buildBase $(call FixPath, $(IDE_OUTPUTDIR)/vs-output) \
       -buildSpace $(call FixPath, $(IDE_OUTPUTDIR)) \
-      -makeBinary $(call FixLinuxExecutable, $(MAKE)) \
+      -makeBinary $(call FixPath, $(MAKE)) \
       -makeOutput $(call FixPath, $(JDK_OUTPUTDIR)/bin/server) \
       -absoluteInclude $(call FixPath, $(HOTSPOT_OUTPUTDIR)/variant-server/gensrc) \
       -absoluteSrcInclude $(call FixPath, $(HOTSPOT_OUTPUTDIR)/variant-server/gensrc) \
       $(EXTRACTED_DEFINES_client) \
       $(EXTRACTED_INCLUDES_client) \

@@ -143,20 +133,18 @@
 
   VCPROJ_VARDEPS := $(PROJECT_CREATOR_CLASS) $(PROJECT_CREATOR_ARGS)
   VCPROJ_VARDEPS_FILE := $(call DependOnVariable, VCPROJ_VARDEPS, \
     $(VCPROJ_FILE).vardeps)
 
-  $(eval $(call SetupExecute, vcproj_file, \
-      INFO := Generating Visual Studio project file, \
-      DEPS := $(BUILD_PROJECT_CREATOR) $(VCPROJ_VARDEPS_FILE), \
-      OUTPUT_FILE := $(VCPROJ_FILE), \
-      COMMAND := $(PROJECT_CREATOR_TOOL) $(PROJECT_CREATOR_CLASS) \
-          $(PROJECT_CREATOR_ARGS) -projectFileName $(call FixPath, $(VCPROJ_FILE)) \
-          $(LOG_INFO), \
-  ))
+  $(VCPROJ_FILE): $(BUILD_PROJECT_CREATOR) $(VCPROJ_VARDEPS_FILE)
+        $(call MakeDir, $(@D))
+        $(call ExecuteWithLog, $@, \
+            $(PROJECT_CREATOR_TOOL) $(PROJECT_CREATOR_CLASS) \
+            $(PROJECT_CREATOR_ARGS) -projectFileName $(call FixPath, $@)) \
+            $(LOG_INFO)
 
-  TARGETS += $(vcproj_file_TARGET)
+  TARGETS += $(VCPROJ_FILE)
 
   all: $(TARGETS)
 
 else
   all:
< prev index next >