diff options
| -rw-r--r-- | build.xml | 15 | ||||
| -rw-r--r-- | src/com/ibm/ServerWizard2/Launcher.java | 11 |
2 files changed, 24 insertions, 2 deletions
@@ -62,7 +62,20 @@ <lib> <fileset file="lib/swt_win32.jar"/> <fileset file="lib/json-simple-1.1.1.jar"/> - <fileset file="${plugin.dir}/org.eclipse.jface_3.10.1.v20140813-1009.jar"/> + <fileset file="${plugin.dir}/org.eclipse.jface_3.10.2.v20141021-1035.jar"/> + <fileset file="${plugin.dir}/org.eclipse.core.runtime_3.10.0.v20140318-2214.jar"/> + <fileset file="${plugin.dir}/org.eclipse.core.commands_3.6.100.v20140528-1422.jar"/> + <fileset file="${plugin.dir}/org.eclipse.equinox.common_3.6.200.v20130402-1505.jar"/> + </lib> + </one-jar> + <one-jar destfile="build/serverwiz2_macosx64.jar" onejarmainclass="com.ibm.ServerWizard2.ServerWizard2"> + <main> + <fileset dir="build/classes"/> + </main> + <lib> + <fileset file="lib/swt_macosx.jar"/> + <fileset file="lib/json-simple-1.1.1.jar"/> + <fileset file="${plugin.dir}/org.eclipse.jface_3.10.2.v20141021-1035.jar"/> <fileset file="${plugin.dir}/org.eclipse.core.runtime_3.10.0.v20140318-2214.jar"/> <fileset file="${plugin.dir}/org.eclipse.core.commands_3.6.100.v20140528-1422.jar"/> <fileset file="${plugin.dir}/org.eclipse.equinox.common_3.6.200.v20130402-1505.jar"/> diff --git a/src/com/ibm/ServerWizard2/Launcher.java b/src/com/ibm/ServerWizard2/Launcher.java index fb795a1..f213ca6 100644 --- a/src/com/ibm/ServerWizard2/Launcher.java +++ b/src/com/ibm/ServerWizard2/Launcher.java @@ -65,8 +65,11 @@ public class Launcher { } LOGGER.config("======================================================================"); LOGGER.config("Retreiving ServerWiz..."); - + + boolean isMac = false; + if (getOSName() == "macosx") { isMac = true; } String jarName = getArchFilename("serverwiz2"); + LOGGER.info("JarName = "+jarName); GithubFile jar = new GithubFile(REPOSITORY,version,jarName,"jars",true,LOGGER); GithubFile zip = new GithubFile(REPOSITORY,version,ZIP_NAME,"jars",true,LOGGER); @@ -135,6 +138,9 @@ public class Launcher { for (String arg : args) { commandLine.add(arg); } + if (isMac) { + commandLine.add("-XstartOnFirstThread"); + } if (updated) { commandLine.add("-v"); commandLine.add(version); @@ -207,6 +213,9 @@ public class Launcher { } else if (osNameProperty.contains("linux") || osNameProperty.contains("nix")) { return "linux"; + } else if (osNameProperty.contains("mac")) + { + return "macosx"; } else { throw new RuntimeException("Unknown OS name: " + osNameProperty); } |
