darlinghq/darling-openjdk
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-openjdk.git synced 2024-11-23 12:29:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

8208524: IntelliJ support broken since 2018.2

Browse Source 
Move build.xml out of .idea folder

Reviewed-by: stuefe
This commit is contained in:
Maurizio Cimadamore 2018-07-31 16:49:51 +01:00
parent 7d04a31fc8
commit 9d25c65fda
8 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/idea.sh
View File

@ -68,9 +68,12 @@ mkdir $IDEA_OUTPUT || exit 1
cd $IDEA_OUTPUT; IDEA_OUTPUT=`pwd`
MAKE_DIR="$SCRIPT_DIR/../make"
SUPPORT_DIR="$SCRIPT_DIR/../build/.idea-support"
IDEA_MAKE="$MAKE_DIR/idea"
IDEA_TEMPLATE="$IDEA_MAKE/template"
mkdir -p $SUPPORT_DIR
cp -r "$IDEA_TEMPLATE"/* "$IDEA_OUTPUT"
#init template variables
@ -124,6 +127,11 @@ if [ "x$SPEC" = "x" ] ; then
echo "FATAL: SPEC is empty" >&2; exit 1
fi
# move build.xml out of .idea, see IDEA-189915
IDEA_BUILD_OLD=$IDEA_BUILD
IDEA_BUILD=$SUPPORT_DIR/build.xml
mv $IDEA_BUILD_OLD $IDEA_BUILD
SOURCE_FOLDER=" <sourceFolder url=\"file://\$MODULE_DIR\$/####\" isTestSource=\"false\" />"
SOURCE_FOLDERS_DONE="false"

2
make/idea/template/ant.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AntConfiguration">
<buildFile url="file://$PROJECT_DIR$/.idea/build.xml">
<buildFile url="file://$PROJECT_DIR$/build/.idea-support/build.xml">
<properties>
<property name="intellij.ismake" value="$IsMake$" />
<property name="build.target.dir" value="specDir" /> <!-- this will be replaced -->

2
make/idea/template/build.xml
View File

@ -1,5 +1,5 @@
<!-- importing.xml -->
<project name="jdk" basedir="..">
<project name="jdk" basedir="../..">
<script language="javascript" classpath=".idea/classes">
var JdkLogger = Java.type("idea.JdkIdeaAntLogger");

4
make/idea/template/misc.xml
View File

@ -9,10 +9,10 @@
<jre alt="true" value="images_jdk" /> <!-- this will be replaced -->
<options></options>
<ant>
<target file="file://$PROJECT_DIR$/.idea/build.xml" name="images" />
<target file="file://$PROJECT_DIR$/build/.idea-support/build.xml" name="images" />
</ant>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_9" assert-keyword="true" jdk-15="true">
<output url="file://$PROJECT_DIR$/build/idea/out" />
<output url="file://$PROJECT_DIR$/build/.idea-support/out" />
</component>
</project>

4
make/langtools/build.xml
View File

@ -76,6 +76,7 @@
<property name="make.conf.dir" location="${make.dir}/conf"/>
<property name="make.tools.dir" location="${make.dir}/tools"/>
<property name="build.dir" location="build/langtools"/>
<property name="idea.support.dir" location="build/.idea-support"/>
<property name="build.modules" location="${build.dir}/modules"/>
<property name="build.gensrc" location="${build.dir}/gensrc"/>
<property name="build.tools" location="${build.dir}/toolclasses"/>
@ -274,6 +275,9 @@
<exclude name="**/utils/**"/>
</fileset>
</copy>
<!-- move build.xml out of .idea, see IDEA-189915 -->
<mkdir dir="${idea.support.dir}"/>
<move todir="${idea.support.dir}" file=".idea/build.xml"/>
<condition property="idea.jtreg.home" value="${jtreg.home}" else = "[jtreg.home]">
<isset property="jtreg.home"/>
</condition>

2
make/langtools/intellij/ant.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AntConfiguration">
<buildFile url="file://$PROJECT_DIR$/.idea/build.xml">
<buildFile url="file://$PROJECT_DIR$/build/.idea-support/build.xml">
<properties>
<property name="langtools.jdk.home" value="@IDEA_TARGET_JDK@" />
<property name="intellij.ismake" value="$IsMake$" />

4
make/langtools/intellij/build.xml
View File

@ -1,12 +1,12 @@
<!-- importing.xml -->
<project name="langtools" basedir="..">
<project name="langtools" basedir="../..">
<script language="javascript" classpath=".idea/classes">
var LangtoolsLogger = Java.type("idea.LangtoolsIdeaAntLogger");
new LangtoolsLogger(project)
</script>
<import file="../make/langtools/build.xml"/>
<import file="../../make/langtools/build.xml"/>
<target name="cond-clean" unless="${intellij.ismake}">
<antcall target="clean"/>

6
make/langtools/intellij/misc.xml
View File

@ -9,12 +9,10 @@
<jre alt="true" value="@IDEA_TARGET_JDK@" />
<options>@XPATCH@</options>
<ant>
<target file="file://$PROJECT_DIR$/.idea/build.xml" name="build-all-classes" />
<target file="file://$PROJECT_DIR$/build/.idea-support/build.xml" name="build-all-classes" />
</ant>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/.idea/out" />
<output url="file://$PROJECT_DIR$/build/.idea-support/out" />
</component>
</project>