Local netbeans changes, 11.3 and jdk location. foreign-abi
authorNot Zed <notzed@gmail.com>
Thu, 30 Apr 2020 05:18:19 +0000 (14:48 +0930)
committerNot Zed <notzed@gmail.com>
Thu, 30 Apr 2020 05:18:19 +0000 (14:48 +0930)
nbproject/build-impl.xml
nbproject/genfiles.properties
nbproject/project.properties

index 9cc58e9..46a5edb 100644 (file)
@@ -1092,7 +1092,7 @@ is divided into following sections:
     <target depends="-pre-single-jar" if="module.jar.filename" name="-make-single-jar">
         <jar basedir="${module.dir}" compress="${jar.compress}" destfile="${dist.dir}/${module.jar.filename}" excludes="${dist.archive.excludes}" manifestencoding="UTF-8"/>
     </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-main-module-check-condition" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
         <property location="${build.modules.dir}" name="build.modules.dir.resolved"/>
         <dirset dir="${build.modules.dir.resolved}" id="do.jar.dirs" includes="*"/>
         <pathconvert property="do.jar.dir.list" refid="do.jar.dirs">
@@ -1108,6 +1108,17 @@ is divided into following sections:
                 <param location="${entry}" name="module.dir"/>
             </antcall>
         </j2semodularproject1:for-paths>
+        <condition property="named.module.internal">
+            <and>
+                <isset property="module.name"/>
+                <length length="0" string="${module.name}" when="greater"/>
+            </and>
+        </condition>
+        <condition property="unnamed.module.internal">
+            <not>
+                <isset property="named.module.internal"/>
+            </not>
+        </condition>
         <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
         <property location="${dist.jar}" name="dist.jar.resolved"/>
         <pathconvert property="run.classpath.with.dist.jar">
@@ -1118,7 +1129,7 @@ is divided into following sections:
             <path path="${run.modulepath}"/>
             <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
         </pathconvert>
-        <condition else="" property="jar.usage.message.module.path" value=" -modulepath ${run.modulepath.with.dist.jar}">
+        <condition else="" property="jar.usage.message.module.path" value=" --module-path ${run.modulepath.with.dist.jar}">
             <and>
                 <isset property="modules.supported.internal"/>
                 <length length="0" string="${run.modulepath.with.dist.jar}" when="greater"/>
@@ -1272,6 +1283,18 @@ is divided into following sections:
             </condition>
         </fail>
     </target>
+    <target depends="-main-module-set" if="main.class.available" name="-main-module-check-condition">
+        <fail message="Could not determine module of the main class and module.name is not set">
+            <condition>
+                <or>
+                    <not>
+                        <isset property="module.name"/>
+                    </not>
+                    <length length="0" string="${module.name}" when="equal"/>
+                </or>
+            </condition>
+        </fail>
+    </target>
     <target name="-do-not-recompile">
         <property name="javac.includes.binary" value=""/>
     </target>
index 29eae41..10ac352 100644 (file)
@@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=32069288@1.6.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=2c0455af
-nbproject/build-impl.xml.script.CRC32=68c8182d
-nbproject/build-impl.xml.stylesheet.CRC32=0f0529df@1.7
+nbproject/build-impl.xml.script.CRC32=0af0e4e8
+nbproject/build-impl.xml.stylesheet.CRC32=496e4d3b@1.9
index c05dc39..25a39d7 100644 (file)
@@ -75,7 +75,7 @@ jlink.additionalmodules=
 jlink.additionalparam=
 jlink.launcher=true
 jlink.launcher.name=notzed.zcl
-platform.active=JDK_15
+platform.active=JDK_15_panama
 project.license=gpl3-notzed
 run.classpath=
 # Space-separated list of JVM arguments used when running the project.