This is an automated email from the ASF dual-hosted git repository.
neilcsmith 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 192d969 [NETBEANS-3106] Add javahome property to groovyc task
new 6e4d083 Merge pull request #1513 from graben/NETBEANS-3106
192d969 is described below
commit 192d969bfaaa707b3674d014dd062cc2374d71c0
Author: Benjamin Graf <[email protected]>
AuthorDate: Tue Sep 17 18:17:03 2019 +0200
[NETBEANS-3106] Add javahome property to groovyc task
---
.../netbeans/modules/groovy/antproject/resources/groovy-build-ejb.xsl | 1 +
.../netbeans/modules/groovy/antproject/resources/groovy-build-j2se.xsl | 1 +
.../netbeans/modules/groovy/antproject/resources/groovy-build-web.xsl | 1 +
3 files changed, 3 insertions(+)
diff --git
a/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/resources/groovy-build-ejb.xsl
b/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/resources/groovy-build-ejb.xsl
index 717ac97..086acca 100644
---
a/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/resources/groovy-build-ejb.xsl
+++
b/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/resources/groovy-build-ejb.xsl
@@ -94,6 +94,7 @@
<property name="empty.dir"
location="${{build.dir}}/empty"/>
<mkdir dir="${{empty.dir}}"/>
<groovyc>
+ <xsl:attribute
name="javahome">${platform.home}</xsl:attribute>
<xsl:attribute
name="srcdir">@{srcdir}</xsl:attribute>
<xsl:attribute
name="sourcepath">@{sourcepath}</xsl:attribute>
<xsl:attribute
name="destdir">@{destdir}</xsl:attribute>
diff --git
a/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/resources/groovy-build-j2se.xsl
b/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/resources/groovy-build-j2se.xsl
index 161b596..a87ffb3 100644
---
a/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/resources/groovy-build-j2se.xsl
+++
b/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/resources/groovy-build-j2se.xsl
@@ -106,6 +106,7 @@
<property name="empty.dir"
location="${{build.dir}}/empty"/><!-- #157692 -->
<mkdir dir="${{empty.dir}}"/>
<groovyc>
+ <xsl:attribute
name="javahome">${platform.home}</xsl:attribute>
<xsl:attribute
name="srcdir">@{srcdir}</xsl:attribute>
<xsl:attribute
name="sourcepath">@{sourcepath}</xsl:attribute>
<xsl:attribute
name="destdir">@{destdir}</xsl:attribute>
diff --git
a/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/resources/groovy-build-web.xsl
b/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/resources/groovy-build-web.xsl
index cb1265b..0ce3609 100644
---
a/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/resources/groovy-build-web.xsl
+++
b/groovy/groovy.antproject/src/org/netbeans/modules/groovy/antproject/resources/groovy-build-web.xsl
@@ -94,6 +94,7 @@
<property name="empty.dir"
location="${{build.dir}}/empty"/>
<mkdir dir="${{empty.dir}}"/>
<groovyc>
+ <xsl:attribute
name="javahome">${platform.home}</xsl:attribute>
<xsl:attribute
name="srcdir">@{srcdir}</xsl:attribute>
<xsl:attribute
name="sourcepath">@{sourcepath}</xsl:attribute>
<xsl:attribute
name="destdir">@{destdir}</xsl:attribute>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
