This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new cb6076e Make sure VSNetBeans codelens like Run and Debug work
new 1f9c3c6 Merge pull request #3212 from
JaroslavTulach/jtulach/CodeLensRunDebugWorks
cb6076e is described below
commit cb6076e901c22f6ccad95d748730d0b50d0a0e72
Author: Jaroslav Tulach <jaroslav.tul...@oracle.com>
AuthorDate: Wed Oct 6 18:21:10 2021 +0200
Make sure VSNetBeans codelens like Run and Debug work
---
.../htmlui/resources/desktop_build.gradle.fmk | 6 +++-
...ld.gradle.fmk => desktop_gradle.properties.fmk} | 32 ++--------------------
.../modules/gradle/htmlui/resources/layer.xml | 6 ++++
.../gradle/htmlui/resources/src_main_java_Demo.fmk | 2 +-
.../gradle/htmlui/resources/web_build.gradle.fmk | 10 +++++--
..._build.gradle.fmk => web_gradle.properties.fmk} | 32 ++--------------------
6 files changed, 23 insertions(+), 65 deletions(-)
diff --git
a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/desktop_build.gradle.fmk
b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/desktop_build.gradle.fmk
index 71b86b0..e879caf 100644
---
a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/desktop_build.gradle.fmk
+++
b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/desktop_build.gradle.fmk
@@ -27,7 +27,11 @@ plugins {
def commonProject = project.parent
def jdk8 = System.getProperty("java.version").startsWith("1.8")
-mainClassName = '${packageBase}.DesktopMain'
+if (hasProperty("runClassName")) {
+ mainClassName = runClassName
+} else {
+ mainClassName = '${packageBase}.DesktopMain'
+}
<#noparse>
distributions {
diff --git
a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/web_build.gradle.fmk
b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/desktop_gradle.properties.fmk
similarity index 56%
copy from
java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/web_build.gradle.fmk
copy to
java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/desktop_gradle.properties.fmk
index 43ee3ab..cc24011 100644
---
a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/web_build.gradle.fmk
+++
b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/desktop_gradle.properties.fmk
@@ -18,35 +18,7 @@
under the License.
-->
-buildscript {
- repositories {
- mavenCentral()
- }
- dependencies {
- classpath "org.apidesign.bck2brwsr:bck2brwsr-maven-plugin:0.51"
- }
-}
-
-apply plugin: 'java'
-apply plugin: 'bck2brwsr'
-
-targetCompatibility = '1.8'
-sourceCompatibility = '1.8'
-
-mainClassName = '${packageBase}.BrowserMain'
-
<#noparse>
-
-def commonProject = project.parent
-
-dependencies {
- implementation commonProject
- implementation "com.dukescript.api:javafx.beaninfo:0.5"
- runtimeOnly "com.dukescript.api:javafx.base:8.60.11"
-}
-
-bck2brwsrPages.from {
- fileTree("${commonProject.projectDir}/src/main/webapp/pages")
-}
-bck2brwsrAot.dependsOn(bck2brwsrPages)
+action.debug.single.args=-PrunClassName=${selectedClass} run --debug-jvm
${javaExec.jvmArgs} ${javaExec.args}
+action.run.single.args=-PrunClassName=${selectedClass} run ${javaExec.jvmArgs}
${javaExec.args}
</#noparse>
diff --git
a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/layer.xml
b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/layer.xml
index 2345148..3d27299 100644
---
a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/layer.xml
+++
b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/layer.xml
@@ -61,6 +61,9 @@
<file name="build.gradle"
url="desktop_build.gradle.fmk">
<attr name="javax.script.ScriptEngine"
stringvalue="freemarker"/>
</file>
+ <file name="gradle.properties"
url="desktop_gradle.properties.fmk">
+ <attr name="javax.script.ScriptEngine"
stringvalue="freemarker"/>
+ </file>
<folder name="src">
<folder name="main">
<folder name="java">
@@ -77,6 +80,9 @@
<file name="build.gradle" url="web_build.gradle.fmk">
<attr name="javax.script.ScriptEngine"
stringvalue="freemarker"/>
</file>
+ <file name="gradle.properties"
url="web_gradle.properties.fmk">
+ <attr name="javax.script.ScriptEngine"
stringvalue="freemarker"/>
+ </file>
<folder name="src">
<folder name="main">
<folder name="java">
diff --git
a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/src_main_java_Demo.fmk
b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/src_main_java_Demo.fmk
index 5d96631..fa2ee7b 100644
---
a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/src_main_java_Demo.fmk
+++
b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/src_main_java_Demo.fmk
@@ -43,7 +43,7 @@ public final class Demo extends DemoBeanInfo {
public static void onPageLoad() {
Demo model = new Demo();
- model.desc.setValue("Try Java in browser @ " +
System.currentTimeMillis());
+ model.desc.setValue("Try Java in browser!");
applyBindings(model);
}
}
\ No newline at end of file
diff --git
a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/web_build.gradle.fmk
b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/web_build.gradle.fmk
index 43ee3ab..09c80b9 100644
---
a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/web_build.gradle.fmk
+++
b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/web_build.gradle.fmk
@@ -23,7 +23,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath "org.apidesign.bck2brwsr:bck2brwsr-maven-plugin:0.51"
+ classpath "org.apidesign.bck2brwsr:bck2brwsr-maven-plugin:0.54"
}
}
@@ -33,7 +33,11 @@ apply plugin: 'bck2brwsr'
targetCompatibility = '1.8'
sourceCompatibility = '1.8'
-mainClassName = '${packageBase}.BrowserMain'
+if (hasProperty("runClassName")) {
+ mainClassName = runClassName
+} else {
+ mainClassName = '${packageBase}.BrowserMain'
+}
<#noparse>
@@ -41,7 +45,7 @@ def commonProject = project.parent
dependencies {
implementation commonProject
- implementation "com.dukescript.api:javafx.beaninfo:0.5"
+ implementation "com.dukescript.api:javafx.beaninfo:0.6"
runtimeOnly "com.dukescript.api:javafx.base:8.60.11"
}
diff --git
a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/web_build.gradle.fmk
b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/web_gradle.properties.fmk
similarity index 56%
copy from
java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/web_build.gradle.fmk
copy to
java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/web_gradle.properties.fmk
index 43ee3ab..f1251ef 100644
---
a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/web_build.gradle.fmk
+++
b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/web_gradle.properties.fmk
@@ -18,35 +18,7 @@
under the License.
-->
-buildscript {
- repositories {
- mavenCentral()
- }
- dependencies {
- classpath "org.apidesign.bck2brwsr:bck2brwsr-maven-plugin:0.51"
- }
-}
-
-apply plugin: 'java'
-apply plugin: 'bck2brwsr'
-
-targetCompatibility = '1.8'
-sourceCompatibility = '1.8'
-
-mainClassName = '${packageBase}.BrowserMain'
-
<#noparse>
-
-def commonProject = project.parent
-
-dependencies {
- implementation commonProject
- implementation "com.dukescript.api:javafx.beaninfo:0.5"
- runtimeOnly "com.dukescript.api:javafx.base:8.60.11"
-}
-
-bck2brwsrPages.from {
- fileTree("${commonProject.projectDir}/src/main/webapp/pages")
-}
-bck2brwsrAot.dependsOn(bck2brwsrPages)
+action.debug.single.args=-PrunClassName=${selectedClass} bck2BrwsrShow
+action.run.single.args=-PrunClassName=${selectedClass} bck2BrwsrShow -t
</#noparse>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
