Merge

Author: theaoqi

make/modules/java.desktop/Java.gmk

@@ -141,8 +141,7 @@ endif
 # pick them up since they aren't generated when the source dirs are
 # searched and they aren't referenced by any other classes so they won't
 # be picked up by implicit compilation. On a rebuild, they are picked up
-# and compiled. Exclude them here to produce the same rt.jar as the old
-# build does when building just once.
+# and compiled.
 EXCLUDE_FILES += \
     javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
     javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \

src/demo/share/nbproject/jfc/FileChooserDemo/build.properties

@@ -1,6 +1,6 @@
 main.dir=${basedir}/../../../jfc/FileChooserDemo
 
-src.dir=${main.dir}/src
+src.dir=${main.dir}/
 
 build.dir=build
 classes.dir=${build.dir}/classes

src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/netbeans-targets.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -41,10 +41,7 @@
         </nbjpdastart>
         <java classname="${main.class}" failonerror="true" fork="true">
             <classpath path="${run.cp}"/>
-            <jvmarg value="-Xdebug"/>
-            <jvmarg value="-Xnoagent"/>
-            <jvmarg value="-Djava.compiler=none"/>
-            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+            <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=n,suspend=n,address=${jpda.address}"/>
         </java>
     </target>
 

src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/project.xml

@@ -39,7 +39,6 @@
             <properties>
                 <property-file>user.build.properties</property-file>
                 <property-file>build.properties</property-file>
-                <property name="nbjdk.bootclasspath">${nbjdk.home}/jre/lib/rt.jar</property>
             </properties>
             <folders>
                 <source-folder>

src/demo/share/nbproject/jfc/Font2DTest/build.properties

@@ -1,6 +1,6 @@
 main.dir=${basedir}/../../../jfc/Font2DTest
 
-src.dir=${main.dir}/src
+src.dir=${main.dir}/
 
 build.dir=build
 classes.dir=${build.dir}/classes

src/demo/share/nbproject/jfc/Font2DTest/nbproject/netbeans-targets.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -41,10 +41,7 @@
         </nbjpdastart>
         <java classname="${main.class}" failonerror="true" fork="true">
             <classpath path="${run.cp}"/>
-            <jvmarg value="-Xdebug"/>
-            <jvmarg value="-Xnoagent"/>
-            <jvmarg value="-Djava.compiler=none"/>
-            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+            <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=n,suspend=n,address=${jpda.address}"/>
         </java>
     </target>
 

src/demo/share/nbproject/jfc/Metalworks/build.properties

@@ -1,6 +1,6 @@
 main.dir=${basedir}/../../../jfc/Metalworks
 
-src.dir=${main.dir}/src
+src.dir=${main.dir}/
 
 build.dir=build
 classes.dir=${build.dir}/classes

src/demo/share/nbproject/jfc/Metalworks/nbproject/netbeans-targets.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -41,10 +41,7 @@
         </nbjpdastart>
         <java classname="${main.class}" failonerror="true" fork="true">
             <classpath path="${run.cp}"/>
-            <jvmarg value="-Xdebug"/>
-            <jvmarg value="-Xnoagent"/>
-            <jvmarg value="-Djava.compiler=none"/>
-            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+            <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=n,suspend=n,address=${jpda.address}"/>
         </java>
     </target>
 

src/demo/share/nbproject/jfc/Notepad/build.properties

@@ -1,6 +1,6 @@
 main.dir=${basedir}/../../../jfc/Notepad
 
-src.dir=${main.dir}/src
+src.dir=${main.dir}/
 
 build.dir=build
 classes.dir=${build.dir}/classes

src/demo/share/nbproject/jfc/Notepad/nbproject/jdk.xml

@@ -42,7 +42,6 @@
         <property name="nbjdk.java" value="${nbjdk.home}/bin/java${.exe}"/>
         <property name="nbjdk.javadoc" value="${nbjdk.home}/bin/javadoc${.exe}"/>
         <property name="nbjdk.appletviewer" value="${nbjdk.home}/bin/appletviewer${.exe}"/>
-        <property name="nbjdk.bootclasspath" value="${nbjdk.home}/jre/lib/rt.jar"/>
     </target>
 
     <target name="-jdk-presetdef-basic" depends="-jdk-preinit" unless="nbjdk.presetdef.basic.done">