Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2013-10-23 16:17:09 +0000
committerEike Stepper2013-10-23 16:42:07 +0000
commit4e6889c0b2a89ab4d7a861dd9c8cfaaa06bc8001 (patch)
tree8ba1bca77ff1641ed1a21707c1bff8b1bd076add
parentb790187eb1dc7d56fa6e7bd064452959b0fc124f (diff)
downloadcdo-4e6889c0b2a89ab4d7a861dd9c8cfaaa06bc8001.tar.gz
cdo-4e6889c0b2a89ab4d7a861dd9c8cfaaa06bc8001.tar.xz
cdo-4e6889c0b2a89ab4d7a861dd9c8cfaaa06bc8001.zip
Fix setup for MacOS
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.product/src/org/eclipse/emf/cdo/releng/setup/product/SetupDialog.java15
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/util/OS.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/build.xml7
3 files changed, 18 insertions, 6 deletions
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/src/org/eclipse/emf/cdo/releng/setup/product/SetupDialog.java b/plugins/org.eclipse.emf.cdo.releng.setup.product/src/org/eclipse/emf/cdo/releng/setup/product/SetupDialog.java
index bb67c78183..16676a87ac 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/src/org/eclipse/emf/cdo/releng/setup/product/SetupDialog.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.product/src/org/eclipse/emf/cdo/releng/setup/product/SetupDialog.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
@@ -616,7 +616,7 @@ public class SetupDialog extends TitleAreaDialog
private URI getSetupURI(Branch branch, String installFolder)
{
File projectFolder = new File(installFolder, branch.getProject().getName().toLowerCase());
- File branchFolder = new File(projectFolder, branch.getName());
+ File branchFolder = new File(projectFolder, branch.getName().toLowerCase());
File setupFile = new File(branchFolder, "setup.xmi");
return URI.createFileURI(setupFile.getAbsolutePath());
}
@@ -676,9 +676,14 @@ public class SetupDialog extends TitleAreaDialog
{
saveEObject(setup);
- SetupTaskPerformer performer = new SetupTaskPerformer(new File(installFolder, setup.getBranch().getProject()
- .getName()
- + "/" + setup.getBranch().getName()));
+ Branch branch = setup.getBranch();
+ Project project = branch.getProject();
+
+ String branchFolder = branch.getName().toLowerCase();
+ String projectFolder = project.getName().toLowerCase();
+ File branchDir = new File(installFolder, projectFolder + "/" + branchFolder);
+
+ SetupTaskPerformer performer = new SetupTaskPerformer(branchDir);
performer.getWorkspaceDir().mkdirs();
performer.perform();
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/util/OS.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/util/OS.java
index 158e84f017..e8897a9c71 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/util/OS.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/util/OS.java
@@ -194,7 +194,7 @@ public abstract class OS
@Override
public String getEclipseIni()
{
- return "Contents/MacOS/eclipse.ini";
+ return "Eclipse.app/Contents/MacOS/eclipse.ini";
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.releng/build.xml b/plugins/org.eclipse.emf.cdo.releng/build.xml
index 1be37110b8..b81f9bf824 100644
--- a/plugins/org.eclipse.emf.cdo.releng/build.xml
+++ b/plugins/org.eclipse.emf.cdo.releng/build.xml
@@ -487,6 +487,13 @@
</fileset>
</delete>
+ <if>
+ <available file="${temp.products}/@{profile}-@{platform}/@{profile}-eclipse.app/Contents/MacOS/@{profile}-eclipse" />
+ <then>
+ <chmod perm="700" file="${temp.products}/@{profile}-@{platform}/@{profile}-eclipse.app/Contents/MacOS/@{profile}-eclipse" />
+ </then>
+ </if>
+
<copy todir="${temp.products}/@{profile}-@{platform}" failonerror="true">
<fileset dir="${git.clone}/features/org.eclipse.emf.cdo.license-feature/rootfiles">
<include name="epl-v10.html" />

Back to the top