equal
deleted
inserted
replaced
74 <property name="test.dir" location="test"/> |
74 <property name="test.dir" location="test"/> |
75 <property name="make.dir" location="make/langtools"/> |
75 <property name="make.dir" location="make/langtools"/> |
76 <property name="make.conf.dir" location="${make.dir}/conf"/> |
76 <property name="make.conf.dir" location="${make.dir}/conf"/> |
77 <property name="make.tools.dir" location="${make.dir}/tools"/> |
77 <property name="make.tools.dir" location="${make.dir}/tools"/> |
78 <property name="build.dir" location="build/langtools"/> |
78 <property name="build.dir" location="build/langtools"/> |
79 <property name="idea.support.dir" location="build/.idea-support"/> |
|
80 <property name="build.modules" location="${build.dir}/modules"/> |
79 <property name="build.modules" location="${build.dir}/modules"/> |
81 <property name="build.gensrc" location="${build.dir}/gensrc"/> |
80 <property name="build.gensrc" location="${build.dir}/gensrc"/> |
82 <property name="build.tools" location="${build.dir}/toolclasses"/> |
81 <property name="build.tools" location="${build.dir}/toolclasses"/> |
83 <property name="build.bin" location="${build.dir}/bin"/> |
82 <property name="build.bin" location="${build.dir}/bin"/> |
84 <property name="build.jtreg" location="${build.dir}/jtreg"/> |
83 <property name="build.jtreg" location="${build.dir}/jtreg"/> |
268 --> |
267 --> |
269 |
268 |
270 <target name="idea" depends="-check-langtools.jdk.home"> |
269 <target name="idea" depends="-check-langtools.jdk.home"> |
271 <mkdir dir=".idea"/> |
270 <mkdir dir=".idea"/> |
272 <copy todir=".idea" > |
271 <copy todir=".idea" > |
273 <fileset dir="${make.dir}/intellij"> |
272 <fileset dir="${make.dir}/intellij/template"> |
274 <exclude name="**/src/**"/> |
273 <exclude name="**/src/**"/> |
275 <exclude name="**/utils/**"/> |
274 <exclude name="**/utils/**"/> |
276 </fileset> |
275 </fileset> |
277 </copy> |
276 </copy> |
278 <!-- move build.xml out of .idea, see IDEA-189915 --> |
|
279 <mkdir dir="${idea.support.dir}"/> |
|
280 <move todir="${idea.support.dir}" file=".idea/build.xml"/> |
|
281 <condition property="idea.jtreg.home" value="${jtreg.home}" else = "[jtreg.home]"> |
277 <condition property="idea.jtreg.home" value="${jtreg.home}" else = "[jtreg.home]"> |
282 <isset property="jtreg.home"/> |
278 <isset property="jtreg.home"/> |
283 </condition> |
279 </condition> |
284 <condition property="idea.target.jdk" value="${langtools.jdk.home}" else = "$JDKPath$"> |
280 <condition property="idea.target.jdk" value="${langtools.jdk.home}" else = "$JDKPath$"> |
285 <isset property="langtools.jdk.home"/> |
281 <isset property="langtools.jdk.home"/> |
291 <replace file=".idea/misc.xml" token="@IDEA_TARGET_JDK@" value="${idea.target.jdk}"/> |
287 <replace file=".idea/misc.xml" token="@IDEA_TARGET_JDK@" value="${idea.target.jdk}"/> |
292 <replace file=".idea/misc.xml" token="@XPATCH@" value="${xpatch.cmd}"/> |
288 <replace file=".idea/misc.xml" token="@XPATCH@" value="${xpatch.cmd}"/> |
293 <mkdir dir=".idea/classes"/> |
289 <mkdir dir=".idea/classes"/> |
294 <javac source="${javac.build.source}" |
290 <javac source="${javac.build.source}" |
295 target="${javac.build.target}" |
291 target="${javac.build.target}" |
296 srcdir="${make.dir}/intellij/src" |
292 srcdir="${make.dir}/intellij/template/src" |
297 destdir=".idea/classes"/> |
293 destdir=".idea/classes"/> |
298 </target> |
294 </target> |
299 |
295 |
300 <!-- |
296 <!-- |
301 **** Utility definitions |
297 **** Utility definitions |