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

8243000: javac only build fails after removal of Nashorn

Browse Source 
Adjusting langtools ant build and Idea project to Nashorn removal.

Co-authored-by: Maurizio Cimadamore <maurizio.cimadamore@oracle.com>
Reviewed-by: mcimadamore, jlahoda
This commit is contained in:
Jan Lahoda
2020-04-28 10:43:29 +02:00
parent 9cea1a5179
commit 65344142d3
6 changed files with 40 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
make/langtools/build.xml
View File

@@ -88,21 +88,11 @@
<pathconvert pathsep="," property="src.module.dirs" refid="src.module.dirset"/>
<pathconvert property="xpatch.rest" pathsep=" --patch-module=" refid="src.module.dirset">
<scriptmapper language="javascript">
fs = project.getProperty("file.separator");
path = project.getProperty("build.modules");
mod = source.substr(source.lastIndexOf(fs)+1);
self.addMappedName(mod + "=\"" + path + fs + mod + "\"");
</scriptmapper>
<regexpmapper from="^.*(/|\\)([^/\\]*)$" to='\2="${build.modules}\1\2"' />
</pathconvert>
<pathconvert property="xpatch.noquotes.rest" pathsep=" --patch-module=" refid="src.module.dirset">
<scriptmapper language="javascript">
fs = project.getProperty("file.separator");
path = project.getProperty("build.modules");
mod = source.substr(source.lastIndexOf(fs)+1);
self.addMappedName(mod + "=" + path + fs + mod);
</scriptmapper>
<regexpmapper from="^([^/\\]*)(/|\\).*" to="\1=${build.modules}\2\1" />
</pathconvert>
<property name="xpatch.cmd" value="--patch-module=${xpatch.rest}"/>
@@ -212,14 +202,7 @@
<target name="build-all-classes" depends="generate-sources">
<pathconvert property="xpatch.src.rest" pathsep=" --patch-module=" refid="src.module.dirset">
<scriptmapper language="javascript">
fs = project.getProperty("file.separator");
path_src = project.getProperty("src.dir");
path_sep = project.getProperty("path.separator");
path_gensrc = project.getProperty("build.gensrc");
mod = source.substr(source.lastIndexOf(fs)+1);
self.addMappedName(mod + "=" + path_src + fs + mod + path_sep + path_gensrc + fs + mod);
</scriptmapper>
<regexpmapper from="^.*(/|\\)([^/\\]*)$" to="\2=${src.dir}\1\2/share/classes${path.separator}${build.gensrc}\1\2" />
</pathconvert>
<property name="xpatch.src.cmd" value="--patch-module=${xpatch.src.rest}"/>
<pathconvert pathsep="," property="gensrc.module.dirs">