diff options
| author | Raphael Moll <ralf@android.com> | 2012-10-23 09:14:45 -0700 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-10-23 09:14:46 -0700 |
| commit | 861e8759d5fae62b67a4cb022453310bccf159a9 (patch) | |
| tree | 13fa791086dd3875ea73952ad7ef4f411c35cdc1 | |
| parent | 1da47876bd684949731ee712f022538abf7cea21 (diff) | |
| parent | b3c860079f2497af8a22dec32efa615be77b745e (diff) | |
| download | sdk-861e8759d5fae62b67a4cb022453310bccf159a9.zip sdk-861e8759d5fae62b67a4cb022453310bccf159a9.tar.gz sdk-861e8759d5fae62b67a4cb022453310bccf159a9.tar.bz2 | |
Merge "Eclipse Android MacOS fixes."
| -rw-r--r-- | adtproductbuild/Android.mk | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/adtproductbuild/Android.mk b/adtproductbuild/Android.mk index 75702f1..63cd000 100644 --- a/adtproductbuild/Android.mk +++ b/adtproductbuild/Android.mk @@ -85,10 +85,19 @@ $(5): $(ADT_IDE_JAVA_TARGET) rm -f $(V) $(5) && \ mkdir -p $(4) && \ unzip -q $(3) -d $(4) && \ + if [[ "$(1)" == "macosx.cocoa" ]]; then \ + mv $(4)/eclipse/eclipse.app/Contents/MacOS/eclipse.ini $(4)/eclipse/Eclipse.app/Contents/MacOS && \ + rm -rf $(4)/eclipse/eclipse.app && \ + rm -r $(4)/eclipse/eclipse && \ + chmod +x $(4)/eclipse/Eclipse.app/Contents/MacOS/eclipse && \ + cp $(4)/eclipse/plugins/com.android.ide.eclipse.adt.package*/icons/adt.icns \ + $(4)/eclipse/Eclipse.app/Contents/Resources && \ + sed -i -e 's/Eclipse.icns/adt.icns/g' $(4)/eclipse/Eclipse.app/Contents/MacOS/eclipse.ini; \ + fi && \ sed -i -e 's/org.eclipse.platform/com.android.ide.eclipse.adt.package.product/g' \ - $(4)/eclipse/$(if $(filter macosx.cocoa,$(1)),eclipse.app/Contents/MacOS/)eclipse.ini && \ + $(4)/eclipse/$(if $(filter macosx.cocoa,$(1)),Eclipse.app/Contents/MacOS/)eclipse.ini && \ echo "-Declipse.buildId=v$(ADT_VERSION)-$(ADT_IDE_ZIP_QUALIFIER)" >> \ - $(4)/eclipse/$(if $(filter macosx.cocoa,$(1)),eclipse.app/Contents/MacOS/)eclipse.ini && \ + $(4)/eclipse/$(if $(filter macosx.cocoa,$(1)),Eclipse.app/Contents/MacOS/)eclipse.ini && \ sed -i -e "s/buildId/v$(ADT_VERSION)-$(ADT_IDE_ZIP_QUALIFIER)/g" \ $(4)/eclipse/plugins/com.android.ide.eclipse.adt.package_*/about.mappings && \ sed -i -e 's/org.eclipse.platform.ide/com.android.ide.eclipse.adt.package.product/g' \ |