File tree Expand file tree Collapse file tree 3 files changed +17
-7
lines changed
nbbuild/antsrc/org/netbeans/nbbuild Expand file tree Collapse file tree 3 files changed +17
-7
lines changed Original file line number Diff line number Diff line change 2525
2626 <target name =" absolute-layout" depends =" build-init" >
2727 <mkdir dir =" ${ build.dir } /absolutelayoutclasses" />
28- <javac srcdir =" release/sources" target =" ${ javac.target } " source = " ${ javac.source } " destdir =" ${ build.dir } /absolutelayoutclasses" />
28+ <javac srcdir =" release/sources" release =" ${ absolutelayout. javac.release } " destdir =" ${ build.dir } /absolutelayoutclasses" />
2929 <mkdir dir =" ${ cluster } /modules/ext" />
3030 <nb-ext-jar jarfile =" ${ cluster } /modules/ext/AbsoluteLayout.jar" >
3131 <manifest >
Original file line number Diff line number Diff line change 1515# specific language governing permissions and limitations
1616# under the License.
1717
18+
19+ # 'error: exporting a package from system module java.desktop is not allowed with --release'
20+ javac.source =17
21+ javac.target =17
22+
23+ absolutelayout.javac.release =8
1824extra.module.files =modules/ext/AbsoluteLayout.jar
19- javac.source =1.8
25+
26+ # see o.n.m.form.fakepeer package
27+ javac.compilerargs =--add-exports=java.desktop/java.awt.peer=ALL-UNNAMED
28+
2029javadoc.arch =${basedir}/arch.xml
2130spec.version.base =1.88.0
2231test-unit-sys-prop.org.netbeans.modules.form.layoutdesign.test =0
Original file line number Diff line number Diff line change @@ -78,7 +78,7 @@ public void execute() throws BuildException {
7878 if (tgr .matches ("\\ d+" )) {
7979 tgr = "1." + tgr ;
8080 }
81- if (! isBootclasspathOptionUsed ()) {
81+ if (canUseRelease ()) {
8282 setRelease (tgr .substring (2 ));
8383 }
8484 String src = getSource ();
@@ -135,13 +135,14 @@ protected void compile() {
135135 super .compile ();
136136 }
137137
138- private boolean isBootclasspathOptionUsed () {
138+ private boolean canUseRelease () {
139+ // 'error: exporting a package from system module java.desktop is not allowed with --release'
139140 for (String arg : getCurrentCompilerArgs ()) {
140- if (arg .contains ("-Xbootclasspath" )) {
141- return true ;
141+ if (arg .contains ("-Xbootclasspath" ) || arg . contains ( "--add-exports=java." ) ) {
142+ return false ;
142143 }
143144 }
144- return false ;
145+ return true ;
145146 }
146147
147148 /**
You can’t perform that action at this time.
0 commit comments