Skip to content

Commit 74f1e6d

Browse files
magicusmagicus
committed
8244093: Move all IDE support into coherent structure in make directory
Reviewed-by: mcimadamore, jlahoda, chegar, erikj
1 parent b6fde85 commit 74f1e6d

151 files changed

Lines changed: 88 additions & 7300 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎bin/idea.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ if [ "x$TOPLEVEL_DIR" = "x" ] ; then
7474
fi
7575

7676
MAKE_DIR="$SCRIPT_DIR/../make"
77-
IDEA_MAKE="$MAKE_DIR/idea"
77+
IDEA_MAKE="$MAKE_DIR/ide/idea/jdk"
7878
IDEA_TEMPLATE="$IDEA_MAKE/template"
7979

8080
cp -r "$IDEA_TEMPLATE"/* "$IDEA_OUTPUT"

‎make/Main.gmk‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ endef
261261
$(foreach v, $(JVM_VARIANTS), $(eval $(call DeclareHotspotLibsRecipe,$v)))
262262

263263
$(eval $(call SetupTarget, hotspot-ide-project, \
264-
MAKEFILE := hotspot/ide/CreateVSProject, \
264+
MAKEFILE := ide/visualstudio/hotspot/CreateVSProject, \
265265
DEPS := hotspot exploded-image, \
266266
ARGS := -I$(TOPDIR)/make/hotspot, \
267267
))
@@ -302,25 +302,25 @@ ALL_TARGETS += $(COMPILE_COMMANDS_TARGETS_HOTSPOT) $(COMPILE_COMMANDS_TARGETS_JD
302302
# VS Code projects
303303

304304
$(eval $(call SetupTarget, vscode-project, \
305-
MAKEFILE := CreateVSCodeProject, \
305+
MAKEFILE := ide/vscode/hotspot/CreateVSCodeProject, \
306306
ARGS := VSCODE_INDEXER=cpptools, \
307307
DEPS := compile-commands, \
308308
))
309309

310310
$(eval $(call SetupTarget, vscode-project-clangd, \
311-
MAKEFILE := CreateVSCodeProject, \
311+
MAKEFILE := ide/vscode/hotspot/CreateVSCodeProject, \
312312
ARGS := VSCODE_INDEXER=clangd, \
313313
DEPS := compile-commands, \
314314
))
315315

316316
$(eval $(call SetupTarget, vscode-project-rtags, \
317-
MAKEFILE := CreateVSCodeProject, \
317+
MAKEFILE := ide/vscode/hotspot/CreateVSCodeProject, \
318318
ARGS := VSCODE_INDEXER=rtags, \
319319
DEPS := compile-commands, \
320320
))
321321

322322
$(eval $(call SetupTarget, vscode-project-ccls, \
323-
MAKEFILE := CreateVSCodeProject, \
323+
MAKEFILE := ide/vscode/hotspot/CreateVSCodeProject, \
324324
ARGS := VSCODE_INDEXER=ccls, \
325325
DEPS := compile-commands, \
326326
))

make/idea/build.xml renamed to make/ide/idea/jdk/build.xml

File renamed without changes.

‎make/ide/idea/jdk/idea.gmk‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
#
2+
# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
3+
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
#
5+
# This code is free software; you can redistribute it and/or modify it
6+
# under the terms of the GNU General Public License version 2 only, as
7+
# published by the Free Software Foundation. Oracle designates this
8+
# particular file as subject to the "Classpath" exception as provided
9+
# by Oracle in the LICENSE file that accompanied this code.
10+
#
11+
# This code is distributed in the hope that it will be useful, but WITHOUT
12+
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13+
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
14+
# version 2 for more details (a copy is included in the LICENSE file that
15+
# accompanied this code).
16+
#
17+
# You should have received a copy of the GNU General Public License version
18+
# 2 along with this work; if not, write to the Free Software Foundation,
19+
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20+
#
21+
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22+
# or visit www.oracle.com if you need additional information or have any
23+
# questions.
24+
#
25+
26+
include Makefile
27+
include make/MainSupport.gmk
28+
29+
.PHONY: idea
30+
31+
ifeq ($(SPEC),)
32+
ifneq ($(words $(SPECS)),1)
33+
@echo "Error: Multiple build specification files found. Please select one explicitly."
34+
@exit 2
35+
endif
36+
idea:
37+
@cd $(topdir)
38+
@$(MAKE) $(MFLAGS) $(MAKE_LOG_FLAGS) -r -R -j 1 -f $(topdir)/make/ide/idea/jdk/idea.gmk SPEC=$(SPECS) HAS_SPEC=true ACTUAL_TOPDIR=$(topdir) MODULES="$(MODULES)" idea
39+
else #with SPEC
40+
include make/common/Modules.gmk
41+
42+
ifeq ($(MODULES),)
43+
SEL_MODULES := $(call FindAllModules)
44+
else
45+
SEL_MODULES := $(MODULES)
46+
endif
47+
48+
idea:
49+
$(ECHO) "SUPPORT=$(SUPPORT_OUTPUTDIR)" >> $(OUT)
50+
$(ECHO) "MODULE_ROOTS=\"$(foreach mod, $(SEL_MODULES), $(call FindModuleSrcDirs,$(mod)))\"" >> $(OUT)
51+
$(ECHO) "MODULE_NAMES=\"$(strip $(foreach mod, $(SEL_MODULES), $(mod)))\"" >> $(OUT)
52+
$(ECHO) "SEL_MODULES=\"$(SEL_MODULES)\"" >> $(OUT)
53+
$(ECHO) "BOOT_JDK=\"$(BOOT_JDK)\"" >> $(OUT)
54+
$(ECHO) "CYGPATH=\"$(CYGPATH)\"" >> $(OUT)
55+
$(ECHO) "SPEC=\"$(SPEC)\"" >> $(OUT)
56+
$(ECHO) "JT_HOME=\"$(JT_HOME)\"" >> $(OUT)
57+
58+
endif

make/idea/template/.name renamed to make/ide/idea/jdk/template/.name

File renamed without changes.

make/idea/template/ant.xml renamed to make/ide/idea/jdk/template/ant.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project version="4">
33
<component name="AntConfiguration">
4-
<buildFile url="file://###ROOT_DIR###/make/idea/build.xml">
4+
<buildFile url="file://###ROOT_DIR###/make/ide/idea/jdk/build.xml">
55
<properties>
66
<property name="intellij.ismake" value="$IsMake$" />
77
<property name="build.target.dir" value="###BUILD_DIR###" />

make/idea/template/compiler.xml renamed to make/ide/idea/jdk/template/compiler.xml

File renamed without changes.

make/idea/template/copyright/profiles_settings.xml renamed to make/ide/idea/jdk/template/copyright/profiles_settings.xml

File renamed without changes.

make/idea/template/jdk.iml renamed to make/ide/idea/jdk/template/jdk.iml

File renamed without changes.

make/idea/template/misc.xml renamed to make/ide/idea/jdk/template/misc.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<jre alt="true" value="###IMAGES_DIR###" />
1010
<options></options>
1111
<ant>
12-
<target file="file://###ROOT_DIR###/make/idea/build.xml" name="images" />
12+
<target file="file://###ROOT_DIR###/make/ide/idea/jdk/build.xml" name="images" />
1313
</ant>
1414
</component>
1515
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_9" assert-keyword="true" jdk-15="true">

0 commit comments

Comments
 (0)