diff options
| author | Pascal Rapicault | 2008-02-20 01:41:48 +0000 |
|---|---|---|
| committer | Pascal Rapicault | 2008-02-20 01:41:48 +0000 |
| commit | 5ad48a6f60c96a4174b381589da1893246c49a6c (patch) | |
| tree | 8dd869bc344201c6a5e68019be5cfacc2b2b4069 | |
| parent | 092385e752d4226341ee00cbbcf8de57f53f0dd3 (diff) | |
| download | rt.equinox.p2-5ad48a6f60c96a4174b381589da1893246c49a6c.tar.gz rt.equinox.p2-5ad48a6f60c96a4174b381589da1893246c49a6c.tar.xz rt.equinox.p2-5ad48a6f60c96a4174b381589da1893246c49a6c.zip | |
Change how we compute the root name
| -rw-r--r-- | bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java index 4fe8ada40..adf631104 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java @@ -613,21 +613,13 @@ public class Generator { Map touchpointData = new HashMap(); String configurationData = "unzip(source:@artifact, target:${installFolder});"; //$NON-NLS-1$ if (Constants.OS_MACOSX.equals(os)) { - //navigate down to the arch specific folder - // root = root.listFiles(new FileFilter() { - // public boolean accept(File pathname) { - // if (pathname.getName().equalsIgnoreCase(arch)) - // return true; - // return false; - // } - // })[0]; //navigate down to Contents/MacOs File[] launcherFiles = root.listFiles()[0].listFiles()[0].listFiles(); for (int i = 0; i < launcherFiles.length; i++) { if (launcherFiles[i].isDirectory()) { launcherFiles = launcherFiles[i].listFiles(); } - configurationData += " chmod(targetDir:${installFolder}/" + root.getName() + "/Contents/MacOS/, targetFile:" + launcherFiles[i].getName() + ", permissions:755);"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + configurationData += " chmod(targetDir:${installFolder}/" + root.listFiles()[0].getName() + "/Contents/MacOS/, targetFile:" + launcherFiles[i].getName() + ", permissions:755);"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ MetadataGeneratorHelper.generateLauncherSetter(new Path(launcherFiles[i].getName()).lastSegment().toString(), launcherId, launcherVersion, os, ws, arch, result.rootIUs); } } |