8140333: Tweak langtools IntelliJ project to better support Kulla changes
Add support for target.java.home option to the idea target Reviewed-by: jlahoda
This commit is contained in:
parent
b84f19e870
commit
8ba15f464a
langtools/make
@ -418,10 +418,14 @@
|
||||
<copy todir=".idea" >
|
||||
<fileset dir="make/intellij" excludes="**/src/**"/>
|
||||
</copy>
|
||||
<condition property="jtreg.idea.home" value="${jtreg.home}" else = "[jtreg.home]">
|
||||
<condition property="idea.jtreg.home" value="${jtreg.home}" else = "[jtreg.home]">
|
||||
<isset property="jtreg.home"/>
|
||||
</condition>
|
||||
<replace file=".idea/ant.xml" token="@@@" value="${jtreg.idea.home}"/>
|
||||
<condition property="idea.target.jdk" value="${target.java.home}" else = "$JDKPath$">
|
||||
<isset property="target.java.home"/>
|
||||
</condition>
|
||||
<replace file=".idea/ant.xml" token="@IDEA_JTREG_HOME@" value="${idea.jtreg.home}"/>
|
||||
<replace file=".idea/ant.xml" token="@IDEA_TARGET_JDK@" value="${idea.target.jdk}"/>
|
||||
<replace file=".idea/workspace.xml" token="@FILE_SEP@" value="${file.separator}"/>
|
||||
<replace file=".idea/workspace.xml" token="@PATH_SEP@" value="${path.separator}"/>
|
||||
<mkdir dir=".idea/classes"/>
|
||||
|
@ -5,8 +5,8 @@
|
||||
<properties>
|
||||
<property name="boot.java.home" value="$JDKPath$" />
|
||||
<property name="jtreg.tests" value="$FilePath$" />
|
||||
<property name="target.java.home" value="$JDKPath$" />
|
||||
<property name="jtreg.home" value="@@@" />
|
||||
<property name="target.java.home" value="@IDEA_TARGET_JDK@" />
|
||||
<property name="jtreg.home" value="@IDEA_JTREG_HOME@" />
|
||||
<property name="javac.debuglevel" value="source,lines,vars" />
|
||||
<property name="jtreg.jpda.jvmargs" value="-agentlib:jdwp=transport=dt_socket,server=n,address=localhost:5900,suspend=y" />
|
||||
</properties>
|
||||
|
@ -110,7 +110,6 @@
|
||||
<option name="PROGRAM_PARAMETERS" value="" />
|
||||
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||
<option name="ALTERNATIVE_JRE_PATH" value="$PROJECT_DIR$/../../dev/build/linux-x86_64-normal-server-release/images/jre" />
|
||||
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
||||
<option name="ENV_VARIABLES" />
|
||||
<option name="PASS_PARENT_ENVS" value="true" />
|
||||
|
Loading…
x
Reference in New Issue
Block a user