Adjusting to javac.release.

apache · Apr 9, 2024 · a7e81d3 · a7e81d3
1 parent efbbcde
commit a7e81d3
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/nbbuild/templates/projectized.xml b/nbbuild/templates/projectized.xml
@@ -97,19 +97,22 @@
     </target>
 
     <target name="-check-source-over-8" depends="basic-init">
-        <condition property="javac.source.8" value="true">
+        <condition property="limitmodules.release" value="${javac.target}" else="${javac.release}">
+            <equals arg1="${javac.release}" arg2=""/>
+        </condition>
+        <condition property="javac.source.is.8" value="true">
             <or>
-                <equals arg1="${javac.source}" arg2="1.6" />
-                <equals arg1="${javac.source}" arg2="1.7" />
-                <equals arg1="${javac.source}" arg2="1.8" />
+                <equals arg1="${limitmodules.release}" arg2="1.6" />
+                <equals arg1="${limitmodules.release}" arg2="1.7" />
+                <equals arg1="${limitmodules.release}" arg2="1.8" />
             </or>
         </condition>
     </target>
 
-    <target name="-init-compile-limit-modules-nb" depends="basic-init,jdk-8-check,set-buildnumber,-define-custom-javac-task,-check-source-over-8" unless="javac.source.8">
+    <target name="-init-compile-limit-modules-nb" depends="basic-init,jdk-8-check,set-buildnumber,-define-custom-javac-task,-check-source-over-8" unless="javac.source.is.8">
         <taskdef name="setuplimitmodules" classname="org.netbeans.nbbuild.extlibs.SetupLimitModules" classpath="${nbantext.jar}"/>
         <setuplimitmodules limitModulesProperty="nb.javac.limit.modules.nb"
-                           releaseVersion="${javac.source}"
+                           releaseVersion="${limitmodules.release}"
                            excludedModules="java.compiler,jdk.compiler"
                            nbjdkHome="${nbjdk.home}"
                            cacheFile="${nb_all}/nbbuild/build/limit-modules-cache.properties" />
@@ -119,14 +122,14 @@
         <condition property="bootclasspath.prepend" value="${bootclasspath.prepend.nb}">
             <and>
                 <istrue value="${requires.nb.javac}"/>
-                <istrue value="${javac.source.8}"/>
+                <istrue value="${javac.source.is.8}"/>
             </and>
         </condition>
         <condition property="limit.modules.option.list" value="${nb.javac.limit.modules.nb}">
             <and>
                 <istrue value="${requires.nb.javac}"/>
                 <not>
-                    <istrue value="${javac.source.8}"/>
+                    <istrue value="${javac.source.is.8}"/>
                 </not>
             </and>
         </condition>