From 9724bd422bc294ed3e2229f73b4a804134157fe6 Mon Sep 17 00:00:00 2001 From: Maxim Shafirov Date: Thu, 15 Oct 2009 13:45:41 +0400 Subject: [PATCH] Use 1.6* for CE and 1.5* for UI JDK on Mac requirement --- build/conf/mac/Contents/Info.plist | 2 +- build/scripts/dist.gant | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build/conf/mac/Contents/Info.plist b/build/conf/mac/Contents/Info.plist index d650d2da29a6..5ac4640b0767 100644 --- a/build/conf/mac/Contents/Info.plist +++ b/build/conf/mac/Contents/Info.plist @@ -45,7 +45,7 @@ $APP_PACKAGE/lib/bootstrap.jar:$APP_PACKAGE/lib/extensions.jar:$APP_PACKAGE/lib/util.jar:$APP_PACKAGE/lib/jdom.jar:$APP_PACKAGE/lib/log4j.jar:/System/Library/Java JVMVersion - 1.5* + @@jdk_req@@ JVMArchs diff --git a/build/scripts/dist.gant b/build/scripts/dist.gant index 9c46a6838e32..8bb11757df12 100644 --- a/build/scripts/dist.gant +++ b/build/scripts/dist.gant @@ -70,6 +70,7 @@ target('default': 'The default target') { buildNumber: "IC-90.SNAPSHOT", version: "Maia", system_selector: "IntelliJIdeaCE90", + jdk_req: "1.6*", vmoptions: "-Xms32m -Xmx256m -XX:MaxPermSize=150m -ea", home, out) } @@ -144,6 +145,7 @@ private def layoutMac(Map args, String home, Paths paths) { replacefilter(token: "@@version@@", value: args.version) replacefilter(token: "@@vmoptions@@", value: args.vmoptions) replacefilter(token: "@@system_selector@@", value: args.system_selector) + replacefilter(token: "@@jdk_req@@", value: args.jdk_req) } def root = "$args.version-${args.buildNumber}.app"