< prev index next >
modules/jdk.packager/src/antplugin/java/com/sun/javafx/tools/ant/DeployFXTask.java
Print this page
*** 238,270 ****
deployParams.setSwingAppWithEmbeddedJavaFX(app.get().embeddedIntoSwing);
deployParams.setVersion(app.get().version);
deployParams.setId(app.get().id);
deployParams.setServiceHint(app.get().daemon);
! if (runtime != null) {
! for (String s : runtime.getAddModules()) {
! deployParams.addAddModule(s);
! }
!
! for (String s : runtime.getLimitModules()) {
! deployParams.addLimitModule(s);
! }
!
! deployParams.setModulePath(runtime.getModulePath());
!
! Boolean stripNativeCommands = runtime.getStripNativeCommands();
!
! if (stripNativeCommands != null) {
! deployParams.setStripNativeCommands(stripNativeCommands);
! }
!
! Boolean detectModules = runtime.getDetectModules();
!
! if (detectModules != null) {
! deployParams.setDetectModules(detectModules);
! }
! }
}
if (appInfo != null) {
deployParams.setTitle(appInfo.title);
deployParams.setVendor(appInfo.vendor);
--- 238,248 ----
deployParams.setSwingAppWithEmbeddedJavaFX(app.get().embeddedIntoSwing);
deployParams.setVersion(app.get().version);
deployParams.setId(app.get().id);
deployParams.setServiceHint(app.get().daemon);
! setRuntime();
}
if (appInfo != null) {
deployParams.setTitle(appInfo.title);
deployParams.setVendor(appInfo.vendor);
*** 310,319 ****
--- 288,299 ----
deployParams.setFallback(app.get().fallbackApp);
deployParams.setSwingAppWithEmbeddedJavaFX(app.get().embeddedIntoSwing);
deployParams.setVersion(app.get().version);
deployParams.setId(app.get().id);
deployParams.setServiceHint(app.get().daemon);
+
+ setRuntime();
}
if (appInfo != null) {
deployParams.setTitle(appInfo.title);
deployParams.setVendor(appInfo.vendor);
*** 382,391 ****
--- 362,397 ----
} finally {
Log.setLogger(null);
}
}
+ private void setRuntime() {
+ if (runtime != null) {
+ for (String s : runtime.getAddModules()) {
+ deployParams.addAddModule(s);
+ }
+
+ for (String s : runtime.getLimitModules()) {
+ deployParams.addLimitModule(s);
+ }
+
+ deployParams.setModulePath(runtime.getModulePath());
+
+ Boolean stripNativeCommands = runtime.getStripNativeCommands();
+
+ if (stripNativeCommands != null) {
+ deployParams.setStripNativeCommands(stripNativeCommands);
+ }
+
+ Boolean detectModules = runtime.getDetectModules();
+
+ if (detectModules != null) {
+ deployParams.setDetectModules(detectModules);
+ }
+ }
+ }
+
/**
* Set to true if we are generating an 'extension' JNLP.
*
* @ant.not-required Default is false.
*/
< prev index next >