This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git
commit 17e09ca2f91f0c83aa52feb4976c314674bb8ddb Author: Martin Desruisseaux <martin.desruisse...@geomatys.com> AuthorDate: Mon Sep 2 12:27:47 2019 +0200 Make the sis-javafx module optional. That module is built only if the PATH_TO_FX environment variable is set. See https://openjfx.io/openjfx-docs/#install-javafx for more information. --- application/pom.xml | 17 +++++++++++++++-- application/sis-javafx/pom.xml | 5 ++++- .../java/org/apache/sis/internal/gui/Resources.java | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/application/pom.xml b/application/pom.xml index 66f8f0c..a6ef1c1 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -112,12 +112,25 @@ <!-- =========================================================== - Sub-modules included in the build in dependency order + Sub-modules included in the build in dependency order. + JavaFX module is built only if PATH_TO_FX environment + variable is set. =========================================================== --> <modules> <module>sis-console</module> - <module>sis-javafx</module> <module>sis-webapp</module> <module>sis-openoffice</module> </modules> + <profiles> + <profile> + <activation> + <property> + <name>env.PATH_TO_FX</name> + </property> + </activation> + <modules> + <module>sis-javafx</module> + </modules> + </profile> + </profiles> </project> diff --git a/application/sis-javafx/pom.xml b/application/sis-javafx/pom.xml index 054ad0d..20d5ac0 100644 --- a/application/sis-javafx/pom.xml +++ b/application/sis-javafx/pom.xml @@ -40,6 +40,8 @@ <name>Apache SIS application for JavaFX</name> <description> Client application for JavaFX. + This module require the JavaFX environment to be pre-installed. + See https://openjfx.io/openjfx-docs/#install-javafx for details. </description> @@ -72,7 +74,8 @@ <configuration> <release>9</release> <compilerArgs> - <arg>--add-modules</arg> <arg>java.xml.bind,java.xml.ws.annotation,javafx.graphics</arg> + <arg>--module-path</arg> <arg>${env.PATH_TO_FX}</arg> + <arg>--add-modules</arg> <arg>javafx.graphics,javafx.controls,javafx.fxml,javafx.swing</arg> </compilerArgs> </configuration> </plugin> diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/Resources.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/Resources.java index 42b165c..678d1d9 100644 --- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/Resources.java +++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/Resources.java @@ -18,7 +18,7 @@ package org.apache.sis.internal.gui; import java.net.URL; import java.util.MissingResourceException; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import org.apache.sis.util.resources.KeyConstants; import org.apache.sis.util.resources.IndexedResourceBundle;