MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-95949

Browse Source
This commit is contained in:
Vladimir Orlov
2014-06-11 11:25:23 +04:00
parent e19681ee57
commit 3c042302d7
5 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/conf/mac/Contents/Info.plist
+3 -1
View File
@@ -79,13 +79,15 @@
<key>idea.java.redist</key>
<string>NoJavaDistribution</string>
<key>idea.home.path</key>
<string>$APP_PACKAGE/Contents</string>
</dict>
<key>VMOptions</key>
<string>@@vmoptions@@ -Xbootclasspath/a:../lib/boot.jar</string>
<key>WorkingDirectory</key>
<string>$APP_PACKAGE/bin</string>
<string>$APP_PACKAGE/Contents/bin</string>
</dict>
</dict>
</plist>
build/conf/mac/Contents/MacOS/idea
BIN
View File
Binary file not shown.
build/scripts/dist.gant
+2 -2
View File
@@ -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)
build/scripts/utils.gant
+10 -10
View File
@@ -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 = """
<key>LSArchitecturePriority</key>
@@ -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)
}
native/MacLauncher/Launcher.m
+2 -2
View File
@@ -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);