make/ide/vscode/hotspot/CreateVSCodeProject.gmk

@@ -1,7 +1,7 @@
 #
-# Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2020, 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

@@ -33,11 +33,11 @@
 # Return the full path to an indexer-specific file fragment.
 #
 # Param 1: Fragment name
 ################################################################################
 GetIndexerFragment = \
-    $(TOPDIR)/make/vscode/indexers/$(VSCODE_INDEXER)-$(1).txt
+    $(TOPDIR)/make/ide/vscode/hotspot/indexers/$(VSCODE_INDEXER)-$(1).txt
 
 ################################################################################
 # Show indexer-specific notes if they exist, otherwise do nothing
 ################################################################################
 ifneq (,$(wildcard $(call GetIndexerFragment,notes)))

@@ -58,11 +58,11 @@
 ################################################################################
 # Return an additional configuration fragment if the WORKSPACE_ROOT is different
 # from TOPDIR.
 ################################################################################
 ifneq ($(WORKSPACE_ROOT),$(TOPDIR))
-  GetExtraWorkspaceRoot = $(TOPDIR)/make/vscode/template-workspace-folder.txt
+  GetExtraWorkspaceRoot = $(TOPDIR)/make/ide/vscode/hotspot/template-workspace-folder.txt
 else
   GetExtraWorkspaceRoot = /dev/null
 endif
 
 ################################################################################

@@ -94,18 +94,18 @@
             > $2
 endef
 
 $(OUTPUTDIR)/jdk.code-workspace:
         $(call LogWarn, Creating workspace $@)
-        $(call CreateFromTemplate, $(TOPDIR)/make/vscode/template-workspace.jsonc, $@)
+        $(call CreateFromTemplate, $(TOPDIR)/make/ide/vscode/hotspot/template-workspace.jsonc, $@)
         $(call ShowIndexerNotes)
 
 $(OUTPUTDIR)/.vscode/tasks.json:
-        $(call CreateFromTemplate, $(TOPDIR)/make/vscode/template-tasks.jsonc, $@)
+        $(call CreateFromTemplate, $(TOPDIR)/make/ide/vscode/hotspot/template-tasks.jsonc, $@)
 
 $(OUTPUTDIR)/.vscode/launch.json:
-        $(call CreateFromTemplate, $(TOPDIR)/make/vscode/template-launch.jsonc, $@)
+        $(call CreateFromTemplate, $(TOPDIR)/make/ide/vscode/hotspot/template-launch.jsonc, $@)
 
 TARGETS := $(OUTPUTDIR)/jdk.code-workspace $(OUTPUTDIR)/.vscode/tasks.json \
     $(OUTPUTDIR)/.vscode/launch.json
 
 all: $(TARGETS)