mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2025-12-06 09:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

8209064: Make intellij support more robust after changes for 2018.2

Browse Source 
Do not treat build.xml wrapper as a template file

Reviewed-by: erikj, ihse
This commit is contained in:
Maurizio Cimadamore
2018-08-29 11:25:51 +01:00
parent 13c1bb691b
commit d91630f948
25 changed files with 16 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
make/langtools/build.xml
View File

@@ -76,7 +76,6 @@
<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"/>
@@ -270,14 +269,11 @@
<target name="idea" depends="-check-langtools.jdk.home">
<mkdir dir=".idea"/>
<copy todir=".idea" >
<fileset dir="${make.dir}/intellij">
<fileset dir="${make.dir}/intellij/template">
<exclude name="**/src/**"/>
<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>
@@ -293,7 +289,7 @@
<mkdir dir=".idea/classes"/>
<javac source="${javac.build.source}"
target="${javac.build.target}"
srcdir="${make.dir}/intellij/src"
srcdir="${make.dir}/intellij/template/src"
destdir=".idea/classes"/>
</target>