82 <property name="build.bin" location="${build.dir}/bin"/> |
82 <property name="build.bin" location="${build.dir}/bin"/> |
83 <property name="build.jtreg" location="${build.dir}/jtreg"/> |
83 <property name="build.jtreg" location="${build.dir}/jtreg"/> |
84 <property name="build.prevsrc" location="${build.dir}/prevsrc"/> |
84 <property name="build.prevsrc" location="${build.dir}/prevsrc"/> |
85 |
85 |
86 <pathconvert property="modules.names" pathsep=","> |
86 <pathconvert property="modules.names" pathsep=","> |
87 <globmapper from="${src.dir}/*" to="*" /> |
87 <globmapper from="${src.dir}/*" to="*" handledirsep="yes"/> |
88 <dirset dir="${src.dir}" includes="*.*"/> |
88 <dirset dir="${src.dir}" includes="*.*"/> |
89 </pathconvert> |
89 </pathconvert> |
90 |
90 |
91 <pathconvert property="xpatch.rest" pathsep=" --patch-module="> |
91 <pathconvert property="xpatch.rest" pathsep=" --patch-module="> |
92 <regexpmapper from="${file.separator}([^${file.separator}]+)$" to='\1="${build.modules}${file.separator}\1"' /> |
92 <regexpmapper from="/([^$/]+)$" |
|
93 to='\1="${build.modules}/\1"' |
|
94 handledirsep="yes"/> |
93 <dirset dir="${src.dir}" includes="*.*"/> |
95 <dirset dir="${src.dir}" includes="*.*"/> |
94 </pathconvert> |
96 </pathconvert> |
95 |
97 |
96 <pathconvert property="xpatch.noquotes.rest" pathsep=" --patch-module="> |
98 <pathconvert property="xpatch.noquotes.rest" pathsep=" --patch-module="> |
97 <regexpmapper from="${file.separator}([^${file.separator}]+)$" to="\1=${build.modules}${file.separator}\1" /> |
99 <regexpmapper from="/([^$/]+)$" |
|
100 to="\1=${build.modules}/\1" |
|
101 handledirsep="yes"/> |
98 <dirset dir="${src.dir}" includes="*.*"/> |
102 <dirset dir="${src.dir}" includes="*.*"/> |
99 </pathconvert> |
103 </pathconvert> |
100 |
104 |
101 <property name="xpatch.cmd" value="--patch-module=${xpatch.rest}"/> |
105 <property name="xpatch.cmd" value="--patch-module=${xpatch.rest}"/> |
102 <property name="xpatch.noquotes.cmd" value="--patch-module=${xpatch.noquotes.rest}"/> |
106 <property name="xpatch.noquotes.cmd" value="--patch-module=${xpatch.noquotes.rest}"/> |
205 <target name="build-all-classes" depends="generate-sources"> |
209 <target name="build-all-classes" depends="generate-sources"> |
206 <exec executable="${langtools.jdk.home}/bin/javac" failonerror="true"> |
210 <exec executable="${langtools.jdk.home}/bin/javac" failonerror="true"> |
207 <arg line="-source ${javac.source} -target ${javac.target}" /> |
211 <arg line="-source ${javac.source} -target ${javac.target}" /> |
208 <arg value="-d" /> |
212 <arg value="-d" /> |
209 <arg value="${build.modules}" /> |
213 <arg value="${build.modules}" /> |
210 <arg line="${javac.opts} --module-source-path ${src.dir}${file.separator}*${file.separator}share${file.separator}classes:${build.gensrc} -m ${modules.names}" /> |
214 <arg line="${javac.opts}" /> |
|
215 <arg line="--module-source-path ${src.dir}${file.separator}*${file.separator}share${file.separator}classes${path.separator}${build.gensrc}" /> |
|
216 <arg line="-m ${modules.names}" /> |
211 </exec> |
217 </exec> |
212 <delete> |
218 <delete> |
213 <fileset dir="${build.modules}" includes="**/module-info.class"/> |
219 <fileset dir="${build.modules}" includes="**/module-info.class"/> |
214 </delete> |
220 </delete> |
215 </target> |
221 </target> |