Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Sievers2015-10-05 11:25:48 -0400
committerJan Sievers2015-10-05 11:25:48 -0400
commitd8bd5c55fd2589718c27bded1d7cab02401a2e88 (patch)
tree90df952229145257f5bc8ec72cb834bc7d1a6f69
parent7d1b1b863bedec59bb75308992985eea16fdcf9a (diff)
downloadorg.eclipse.tycho-d8bd5c55fd2589718c27bded1d7cab02401a2e88.tar.gz
org.eclipse.tycho-d8bd5c55fd2589718c27bded1d7cab02401a2e88.tar.xz
org.eclipse.tycho-d8bd5c55fd2589718c27bded1d7cab02401a2e88.zip
Bug 461606: always force product folder ending with .app on MacOSX
If no root folder is configured, use "Eclipse.app" as the default for MacOSX. Change-Id: I59cd3c2d47837da3af2a495a33079de585e579e0 Signed-off-by: Jan Sievers <jan.sievers@sap.com>
-rw-r--r--tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/Product.java17
1 files changed, 14 insertions, 3 deletions
diff --git a/tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/Product.java b/tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/Product.java
index 07c3a563b..3efcb1c57 100644
--- a/tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/Product.java
+++ b/tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/Product.java
@@ -16,6 +16,7 @@ import java.util.List;
import java.util.Map;
import org.eclipse.tycho.core.resolver.shared.DependencySeed;
+import org.eclipse.tycho.core.resolver.shared.PlatformPropertiesUtils;
/**
* Value object for the configuration of this Maven plug-in. Used to select products to be
@@ -79,15 +80,25 @@ public final class Product {
}
public String getRootFolder(String os) {
+ String result = null;
if (rootFolders == null) {
- return rootFolder;
+ result = rootFolder;
} else {
if (rootFolders.get(os) == null) {
- return rootFolder;
+ result = rootFolder;
} else {
- return rootFolders.get(os);
+ result = rootFolders.get(os);
}
}
+ // bug 461606 - always force folder ending with .app on MacOSX
+ if (PlatformPropertiesUtils.OS_MACOSX.equals(os)) {
+ if (result == null) {
+ result = "Eclipse.app";
+ } else if (!result.endsWith(".app")) {
+ result = result + ".app";
+ }
+ }
+ return result;
}
public String getArchiveFileName() {

Back to the top