From 3be226a3c2b0b11de4f6668df70fca96cef3dcd4 Mon Sep 17 00:00:00 2001 From: Maxim Shafirov Date: Sun, 6 Feb 2011 00:52:17 +0300 Subject: [PATCH] Common Info.plist for all products. --- python/build/Info.plist | 86 --------------------------------- python/build/pycharm_build.gant | 75 +++++----------------------- 2 files changed, 13 insertions(+), 148 deletions(-) delete mode 100644 python/build/Info.plist diff --git a/python/build/Info.plist b/python/build/Info.plist deleted file mode 100644 index 4b2ee13ad597..000000000000 --- a/python/build/Info.plist +++ /dev/null @@ -1,86 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleDocumentTypes - - - CFBundleExecutable - pycharm - CFBundleIconFile - PyCharm.icns - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - PyCharm - CFBundlePackageType - APPL - CFBundleIdentifier - com.jetbrains.pycharm - CFBundleSignature - ???? - CFBundleGetInfoString - PyCharm @@version@@, build @@build@@. Copyright JetBrains s.r.o., (c) 2000-@@year@@ - CFBundleShortVersionString - @@version@@ - CFBundleVersion - @@build@@ - - LSArchitecturePriority - - x86_64 - i386 - - LSRequiresNativeExecution - YES - - Java - - ClassPath - $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 - - JVMVersion - @@jdk_req@@ - - MainClass - com.intellij.idea.Main - Properties - - CVS_PASSFILE - ~/.cvspass - com.apple.mrj.application.live-resize - false - idea.config.path - ~/Library/Preferences/@@system_selector@@/ - idea.system.path - ~/Library/Caches/@@system_selector@@/ - idea.plugins.path - ~/Library/Application Support/@@system_selector@@/ - idea.log.path - ~/Library/Logs/@@system_selector@@/ - java.endorsed.dirs - - idea.smooth.progress - false - apple.laf.useScreenMenuBar - true - apple.awt.graphics.UseQuartz - true - idea.use.native.mac.filechooser - false - apple.awt.fullscreencapturealldisplays - false - idea.platform.prefix - Python - - - VMOptions - @@vmoptions@@ -Xbootclasspath/a:../lib/boot.jar - - WorkingDirectory - $APP_PACKAGE/bin - - - diff --git a/python/build/pycharm_build.gant b/python/build/pycharm_build.gant index b79c0b886e24..b27f26c4bebe 100644 --- a/python/build/pycharm_build.gant +++ b/python/build/pycharm_build.gant @@ -62,10 +62,6 @@ def includeFile(String filepath) { s } -boolean isEap() { - return "true" == p("component.version.eap") -} - class Paths { final sandbox final distAll @@ -166,10 +162,9 @@ target('default': "Build artifacts") { format(property: "todayYear", pattern: "yyyy") } - ant.xmlproperty(file: "$home/python/resources/idea/PythonApplicationInfo.xml", collapseAttributes: "true") - setProperty("isEap", isEap()) + ant.xmlproperty(file: "$home/CIDR/resources/idea/CIDRApplicationInfo.xml", collapseAttributes: "true") - if (isEap) { + if (isEap()) { setProperty("vmoptions", vmoptions + " -agentlib:yjpagent=disablej2ee,disablecounts,disablealloc,sessionname=PyCharm") } @@ -240,14 +235,14 @@ target('default': "Build artifacts") { version: "1.0", system_selector: "PyCharm10", jdk_req: "1.6*", - vmoptions: "-Xms128m -Xmx512m -XX:MaxPermSize=250m -ea" + (isEap ? " -agentlib:yjpagent=disablej2ee,sessionname=pycharm" : ""), + vmoptions: "-Xms128m -Xmx512m -XX:MaxPermSize=250m -ea" + (isEap() ? " -agentlib:yjpagent=disablej2ee,sessionname=pycharm" : ""), paths.distMac) buildExe() ant.echo(message: buildName, file: "$sandbox/layout/build.txt") - def root = isEap ? "PyCharm-${buildNumber}.app" : "PyCharm ${p("component.version.major")}.${p("component.version.minor")}.app" + def root = isEap() ? "PyCharm-${buildNumber}.app" : "PyCharm ${p("component.version.major")}.${p("component.version.minor")}.app" ant.zip(zipfile: "${paths.artifacts}/pycharm${buildName}.sit") { tarfileset(dir: paths.distAll, prefix: root) @@ -511,68 +506,24 @@ def layoutFull(String target, Set usedJars) { } } - ant.echo(file: "$target/bin/idea.properties", append: "true", message: - isEap() ? - """ - -#----------------------------------------------------------------------- -# Change to 'disabled' if you do not need to receive instant visual -# notifications about fatal errors that happen to PyCharm or plugins installed. -#----------------------------------------------------------------------- -idea.fatal.error.notification=enabled -""" - - : - """ - -#----------------------------------------------------------------------- -# Change to 'enabled' if you need to receive instant visual notifications about -# fatal errors that happen to PyCharm or plugins installed. -#----------------------------------------------------------------------- -idea.fatal.error.notification=disabled -""" - ) + patchPropertiesFile(target) } def layoutMac(Map args, String target) { layout(target) { dir("bin") { - fileset(dir: "$home/community/bin/mac") - fileset(dir: "$home/community/bin/nix") { - exclude(name: "idea.sh") - } - fileset(dir: "$home/bin") { - include(name: "*.jnilib") - } - fileset(dir: "$home/python/build") { - include(name: "pycharm.sh") - } - } - dir("lib") { - fileset(dir: "$home/community/build/conf/mac/lib") - } - dir("Contents") { - dir("MacOS") { - } - dir("Resources") { - fileset(dir: "$home/python/resources", includes: "PyCharm.icns") - } - fileset(dir: "$home/python/build", includes: "Info.plist") + fileset(dir: "$home/bin", includes: "*.jnilib") } } - ant.copy(file: "$home/community/build/conf/mac/Contents/MacOS/idea", tofile: "$target/Contents/MacOS/pycharm") + args.buildNumber = buildName + args["executable"] = "pycharm" + args["icns"] = "$home/python/resources/PyCharm.icns" + args["bundle_name"] = "PyCharm" + args["bundleIdentifier"] = "com.jetbrains.pycharm" + args["platform_prefix"] = "Python" - ant.replace(file: "$target/Contents/Info.plist") { - replacefilter(token: "@@build@@", value: args.buildName) - replacefilter(token: "@@year@@", value: "$todayYear") - - - replacefilter(token: "@@version@@", value: args.version) - replacefilter(token: "@@vmoptions@@", value: args.vmoptions + " -Xverify:none -XX:+UseCompressedOOPS -XX:+DoEscapeAnalysis") - replacefilter(token: "@@system_selector@@", value: args.system_selector) - replacefilter(token: "@@jdk_req@@", value: args.jdk_req) - } + layoutMacApp(target, "$home/community", args) ant.copy(file: "$home/python/help/pycharmhelp_mac.jar", tofile: "$target/help/pycharmhelp.jar") }