< prev index next >
modules/jdk.packager/src/main/java/com/sun/javafx/tools/ant/DeployFXTask.java
Print this page
*** 37,46 ****
--- 37,48 ----
import com.sun.javafx.tools.ant.Platform.Property;
import com.sun.javafx.tools.packager.DeployParams;
import com.oracle.tools.packager.Log;
import com.sun.javafx.tools.packager.PackagerException;
import com.sun.javafx.tools.packager.PackagerLib;
+ import com.sun.javafx.tools.packager.bundlers.Bundler;
+ import com.sun.javafx.tools.packager.bundlers.Bundler.Bundle;
import com.sun.javafx.tools.packager.bundlers.Bundler.BundleType;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DynamicAttribute;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.DataType;
*** 140,151 ****
--- 142,158 ----
deployParams = new DeployParams();
}
@Override
public void execute() {
+ boolean isModular = (app.getModule() != null) && !app.getModule().isEmpty();
deployParams.setOutfile(outfile);
deployParams.setOutdir(new File(outdir));
+
+ if (!isModular &&
+ (nativeBundles == BundleType.JNLP ||
+ nativeBundles == BundleType.ALL)) {
deployParams.setOfflineAllowed(offlineAllowed);
deployParams.setVerbose(verbose);
deployParams.setCodebase(codebase);
deployParams.setSignBundle(signBundle);
*** 164,179 ****
deployParams.setEmbedJNLP(embedJNLP);
if (perms != null) {
deployParams.setAllPermissions(perms.getElevated());
}
if (app != null) {
if (app.getModule() == null) {
deployParams.setApplicationClass(app.get().mainClass);
}
else {
- nativeBundles = BundleType.NATIVE;
int index = app.getModule().indexOf("/");
if (index > 0) {
deployParams.setModule(app.getModule());
}
--- 171,243 ----
deployParams.setEmbedJNLP(embedJNLP);
if (perms != null) {
deployParams.setAllPermissions(perms.getElevated());
}
+ deployParams.setUpdateMode(updateMode);
+ deployParams.setExtension(isExtension);
+ deployParams.setIncludeDT(includeDT);
+
+ if (platform != null) {
+ Platform pl = platform.get();
+ if (pl.j2se != null) {
+ deployParams.setJRE(pl.j2se);
+ }
+ if (pl.javafx != null) {
+ deployParams.setJavafx(pl.javafx);
+ }
+
+ //only pass it further if it was explicitly set
+ // as we do not want to override default
+ if (pl.javaRoot != null) {
+ if (Platform.USE_SYSTEM_JRE.equals(pl.javaRoot)) {
+ deployParams.setJavaRuntimeSource(null);
+ } else {
+ deployParams.setJavaRuntimeSource(new File(pl.javaRoot));
+ }
+ }
+
+ for (Property p: pl.properties) {
+ deployParams.addJvmProperty(p.name, p.value);
+ }
+ for (Jvmarg a: pl.jvmargs) {
+ deployParams.addJvmArg(a.value);
+ }
+ for (Property a: pl.jvmUserArgs) {
+ deployParams.addJvmUserArg(a.name, a.value);
+ }
+ }
+
+ if (callbacks != null) {
+ for (Callback cb: callbacks.callbacks) {
+ deployParams.addCallback(cb.getName(), cb.getCmd());
+ }
+ }
+
+ if (prefs != null) {
+ deployParams.setNeedShortcut(prefs.getShortcut());
+ deployParams.setNeedInstall(prefs.getInstall());
+ deployParams.setNeedMenu(prefs.getMenu());
+ deployParams.setSystemWide(prefs.getSystemInstall());
+ deployParams.setInstalldirChooser(prefs.getInstalldirChooser());
+ }
+
+ for (Template t: templateList) {
+ deployParams.addTemplate(t.infile, t.outfile);
+ }
+ }
+
+ if (isModular &&
+ (nativeBundles == BundleType.NATIVE ||
+ nativeBundles == BundleType.IMAGE ||
+ nativeBundles == BundleType.INSTALLER ||
+ nativeBundles == BundleType.ALL)) {
if (app != null) {
if (app.getModule() == null) {
deployParams.setApplicationClass(app.get().mainClass);
}
else {
int index = app.getModule().indexOf("/");
if (index > 0) {
deployParams.setModule(app.getModule());
}
*** 241,300 ****
deployParams.addBundleArgument(StandardBundlerParam.FILE_ASSOCIATIONS.getID(),
appInfo.fileAssociations.stream()
.map(FileAssociation::createLauncherMap)
.collect(Collectors.toList()));
}
-
- deployParams.setUpdateMode(updateMode);
- deployParams.setExtension(isExtension);
- deployParams.setIncludeDT(includeDT);
-
- if (platform != null) {
- Platform pl = platform.get();
- if (pl.j2se != null) {
- deployParams.setJRE(pl.j2se);
- }
- if (pl.javafx != null) {
- deployParams.setJavafx(pl.javafx);
- }
-
- //only pass it further if it was explicitly set
- // as we do not want to override default
- if (pl.javaRoot != null) {
- if (Platform.USE_SYSTEM_JRE.equals(pl.javaRoot)) {
- deployParams.setJavaRuntimeSource(null);
- } else {
- deployParams.setJavaRuntimeSource(new File(pl.javaRoot));
- }
- }
- for (Property p: pl.properties) {
- deployParams.addJvmProperty(p.name, p.value);
- }
- for (Jvmarg a: pl.jvmargs) {
- deployParams.addJvmArg(a.value);
- }
- for (Property a: pl.jvmUserArgs) {
- deployParams.addJvmUserArg(a.name, a.value);
- }
- }
-
- if (callbacks != null) {
- for (Callback cb: callbacks.callbacks) {
- deployParams.addCallback(cb.getName(), cb.getCmd());
- }
- }
-
- if (prefs != null) {
- deployParams.setNeedShortcut(prefs.getShortcut());
- deployParams.setNeedInstall(prefs.getInstall());
- deployParams.setNeedMenu(prefs.getMenu());
- deployParams.setSystemWide(prefs.getSystemInstall());
- deployParams.setInstalldirChooser(prefs.getInstalldirChooser());
- }
-
- for (Template t: templateList) {
- deployParams.addTemplate(t.infile, t.outfile);
}
for (BundleArgument ba : bundleArgumentList) {
deployParams.addBundleArgument(ba.arg, ba.value);
}
--- 305,314 ----
*** 346,368 ****
public void setExtension(boolean v) {
isExtension = v;
}
public void setNativeBundles(String v) {
! if ("false".equals(v) || "none".equals(v)) {
! nativeBundles = BundleType.NONE;
! } else if ("all".equals(v) || "true".equals(v)) {
! nativeBundles = BundleType.ALL;
! } else if ("image".equals(v)) {
! nativeBundles = BundleType.IMAGE;
! } else if ("installer".equals(v)) {
! nativeBundles = BundleType.INSTALLER;
! } else {
! //assume it is request to build only specific format (like exe or msi)
! nativeBundles = BundleType.INSTALLER;
! bundleFormat = (v != null) ? v.toLowerCase() : null;
! }
}
/**
* Indicates the preferences for when checks for application updates
* are performed. Supported modes are always, timeout and background.
--- 360,372 ----
public void setExtension(boolean v) {
isExtension = v;
}
public void setNativeBundles(String v) {
! Bundle bundle = Bundler.stringToBundle(v);
! this.nativeBundles = bundle.type;
! this.bundleFormat = bundle.format;
}
/**
* Indicates the preferences for when checks for application updates
* are performed. Supported modes are always, timeout and background.
< prev index next >