From 3c042302d776d199c2e81120eb098f86b9443bba Mon Sep 17 00:00:00 2001 From: Vladimir Orlov Date: Wed, 11 Jun 2014 11:25:23 +0400 Subject: [PATCH] IDEA-95949 --- build/conf/mac/Contents/Info.plist | 4 +++- build/conf/mac/Contents/MacOS/idea | Bin 85548 -> 85592 bytes build/scripts/dist.gant | 4 ++-- build/scripts/utils.gant | 20 ++++++++++---------- native/MacLauncher/Launcher.m | 4 ++-- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/build/conf/mac/Contents/Info.plist b/build/conf/mac/Contents/Info.plist index 0345101de5f6..d13854c5f77a 100644 --- a/build/conf/mac/Contents/Info.plist +++ b/build/conf/mac/Contents/Info.plist @@ -79,13 +79,15 @@ idea.java.redist NoJavaDistribution + idea.home.path + $APP_PACKAGE/Contents VMOptions @@vmoptions@@ -Xbootclasspath/a:../lib/boot.jar WorkingDirectory - $APP_PACKAGE/bin + $APP_PACKAGE/Contents/bin diff --git a/build/conf/mac/Contents/MacOS/idea b/build/conf/mac/Contents/MacOS/idea index 3f5d2c46a401d95a6dd7c4c948c6318c72c41b2e..dd2b1ac710995aa72f92d0a76874e3b684422e99 100755 GIT binary patch delta 25143 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 diff --git a/build/scripts/dist.gant b/build/scripts/dist.gant index fef520364283..a79fb54395d0 100644 --- a/build/scripts/dist.gant +++ b/build/scripts/dist.gant @@ -126,8 +126,8 @@ def layoutAll(Map args, String home, String out, Paths _paths = null, buildJps = buildWinZip("$paths.artifacts/idea${args.buildNumber}.win.zip", [paths.distAll, paths.distWin]) def macAppRoot = isEap() ? - "IntelliJ IDEA ${p("component.version.major")} CE EAP.app" : - "IntelliJ IDEA ${p("component.version.major")} CE.app" + "IntelliJ IDEA ${p("component.version.major")} CE EAP.app/Contents" : + "IntelliJ IDEA ${p("component.version.major")} CE.app/Contents" String macZip = "$paths.artifacts/idea${args.buildNumber}.mac.zip" buildMacZip(macAppRoot, macZip, [paths.distAll], paths.distMac) diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant index e1f0571b9a5f..2ac5d37aaa07 100644 --- a/build/scripts/utils.gant +++ b/build/scripts/utils.gant @@ -310,7 +310,7 @@ binding.setVariable("layoutMacApp", { String path, String ch, Map args -> } ant.copy(todir: path) { - fileset(dir: "$ch/build/conf/mac") + fileset(dir: "$ch/build/conf/mac/Contents") } ant.tstamp() { @@ -320,14 +320,14 @@ binding.setVariable("layoutMacApp", { String path, String ch, Map args -> String executable = args.executable != null ? args.executable : p("component.names.product").toLowerCase() String helpId = args.help_id != null ? args.help_id : "IJ" String icns = "idea.icns" - String helpIcns = "$path/Contents/Resources/${helpId}.help/Contents/Resources/Shared/product.icns" + String helpIcns = "$path/Resources/${helpId}.help/Contents/Resources/Shared/product.icns" if (args.icns != null) { - ant.delete(file: "$path/Contents/Resources/idea.icns") - ant.copy(file: args.icns, todir: "$path/Contents/Resources") + ant.delete(file: "$path/Resources/idea.icns") + ant.copy(file: args.icns, todir: "$path/Resources") ant.copy(file: args.icns, tofile: helpIcns) icns = new File((String)args.icns).getName(); } else { - ant.copy(file: "$path/Contents/Resources/idea.icns", tofile: helpIcns) + ant.copy(file: "$path/Resources/idea.icns", tofile: helpIcns) } String fullName = args.fullName != null ? args.fullName : p("component.names.fullname") @@ -356,7 +356,7 @@ binding.setVariable("layoutMacApp", { String path, String ch, Map args -> new File("$path/bin/idea.properties").text = effectiveProperties.toString() new File("$path/bin/idea.vmoptions").text = "$mem64 -XX:+UseCompressedOops".split(" ").join("\n") - String classPath = classPathLibs.collect {"\$APP_PACKAGE/lib/${it}" }.join(":") + String classPath = classPathLibs.collect {"\$APP_PACKAGE/Contents/lib/${it}" }.join(":") String archs = """ LSArchitecturePriority @@ -389,7 +389,7 @@ binding.setVariable("layoutMacApp", { String path, String ch, Map args -> """ } - ant.replace(file: "$path/Contents/Info.plist") { + ant.replace(file: "$path/Info.plist") { replacefilter(token: "@@build@@", value: args.buildNumber) replacefilter(token: "@@doc_types@@", value: ifNull(args.doc_types, "")) replacefilter(token: "@@executable@@", value: executable) @@ -408,7 +408,7 @@ binding.setVariable("layoutMacApp", { String path, String ch, Map args -> } if (executable != "idea") { - ant.move(file: "$path/Contents/MacOS/idea", tofile: "$path/Contents/MacOS/$executable") + ant.move(file: "$path/MacOS/idea", tofile: "$path/MacOS/$executable") } ant.replace(file: "$path/bin/inspect.sh") { @@ -710,7 +710,7 @@ binding.setVariable("buildMacZip", { String zipRoot, String zipPath, List paths, exclude(name: "bin/*.py") exclude(name: "bin/fsnotifier") exclude(name: "bin/restarter") - exclude(name: "Contents/MacOS/*") + exclude(name: "MacOS/*") extraBins.each { exclude(name: it) } @@ -724,7 +724,7 @@ binding.setVariable("buildMacZip", { String zipRoot, String zipPath, List paths, include(name: "bin/*.py") include(name: "bin/fsnotifier") include(name: "bin/restarter") - include(name: "Contents/MacOS/*") + include(name: "MacOS/*") extraBins.each { include(name: it) } diff --git a/native/MacLauncher/Launcher.m b/native/MacLauncher/Launcher.m index 716f8b7a02de..354a15c5b44e 100644 --- a/native/MacLauncher/Launcher.m +++ b/native/MacLauncher/Launcher.m @@ -106,9 +106,9 @@ NSArray *allVms() { } if (! jvmBundlePaths.count > 0 ) { NSBundle *bundle = [NSBundle mainBundle]; - NSString *appDir = bundle.bundlePath; + NSString *appDir = [bundle.bundlePath stringByAppendingPathComponent:@"Contents"]; - appendJvmBundlesAt([appDir stringByAppendingPathComponent:@"jre"], jvmBundlePaths); + appendJvmBundlesAt([appDir stringByAppendingPathComponent:@"/jre"], jvmBundlePaths); if (jvmBundlePaths.count > 0) return jvmBundlePaths; appendJvmBundlesAt([NSHomeDirectory() stringByAppendingPathComponent:@"Library/Java/JavaVirtualMachines"], jvmBundlePaths);