From 63e7f747690e3da5ae22f7fc77c75dadb4f979e6 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 17 Sep 2013 19:47:45 +0200
Subject: [PATCH] launcher for pycharm community; extract layout to allow
 calling from main build

---
 python/build/pycharm_community_build.gant     | 56 ++++++++++---------
 .../pycharm_community_launcher.properties     |  3 +
 2 files changed, 32 insertions(+), 27 deletions(-)
 create mode 100644 python/build/pycharm_community_launcher.properties

diff --git a/python/build/pycharm_community_build.gant b/python/build/pycharm_community_build.gant
index 84f6a53b5556..dcef5ac8f66f 100644
--- a/python/build/pycharm_community_build.gant
+++ b/python/build/pycharm_community_build.gant
@@ -1,6 +1,7 @@
 import org.jetbrains.jps.LayoutInfo
 
 import static org.jetbrains.jps.idea.IdeaProjectLoader.guessHome
+
 setProperty("home", guessHome(this as Script))
 
 includeTargets << new File("${guessHome(this as Script)}/community/build/scripts/utils.gant")
@@ -108,6 +109,28 @@ target('default': "Build artifacts") {
   def approvedJars = ["$normalizedHome/lib/", "$normalizedPythonHome/lib/", "$normalizedHome/xml/relaxng/lib/"]
   def usedJars = buildModulesAndCollectUsedJars(modules, approvedJars, [])
 
+  layoutCommunity(paths, usedJars)
+
+
+  buildWinZip("${paths.artifacts}/pycharm${buildName}.zip", [paths.distAll, paths.distWin])
+  /*
+  buildNSIS([paths.distAll, paths.distWin],
+            "$home/python/build/strings.nsi", "$home/python/build/paths.nsi",
+            "pycharm", false, true, system_selector)
+  */
+
+  String tarRoot = isEap() ? "pycharm-community-$buildNumber" : "pycharm-community-${p("component.version.major")}.${p("component.version.minor")}"
+  buildTarGz(tarRoot, "$paths.artifacts/pycharm${buildName}.tar", [paths.distAll, paths.distUnix])
+
+  /*
+  String macAppRoot = isEap() ? "PyCharm ${p("component.version.major")}.${p("component.version.minor")} EAP.app" : "PyCharm.app"
+  buildMacZip(macAppRoot, "${paths.artifacts}/pycharm${buildName}.sit", [paths.distAll], paths.distMac)
+  signMacZip("pycharm")
+  buildDmg("pycharm", "${home}/python/build/DMG_background.png")
+  */
+}
+
+public layoutCommunity(Paths paths, Set usedJars) {
   buildSearchableOptions("${projectBuilder.moduleOutput(findModule("platform-resources"))}/search", [], {
     projectBuilder.moduleRuntimeClasspath(findModule("main_pycharm_ce"), false).each {
       ant.pathelement(location: it)
@@ -127,43 +150,22 @@ target('default': "Build artifacts") {
   generateLicensesTable("$paths.artifacts/third-party-libraries.txt", layoutInfo.usedModules);
 
   def egg = buildDebuggerEgg(paths.sandbox, "$home/python", buildName)
-  ant.copy(file: egg, todir: paths.distAll)
+  ant.copy(file: egg, todir: target)
   def eggPy3k = buildDebuggerEggPy3K(paths.sandbox, "$home/python", buildName)
-  ant.copy(file: eggPy3k, todir: paths.distAll)
+  ant.copy(file: eggPy3k, todir: target)
 
   layoutWin(args, paths.distWin)
   layoutUnix(args, paths.distUnix)
   layoutMac(args, paths.distMac)
 
-  ant.echo(message: buildName, file: "${paths.sandbox}/layout/build.txt")
+  ant.echo(message: buildName, file: "${paths.distAll}/build.txt")
 
-  /*
   def launcher = "${paths.distWin}/bin/pycharm.exe"
   List resourcePaths = ["$home/community/community-resources/src",
     "$home/community/platform/icons/src",
-    "$home/python/resources",
-    "$home/python/community/resources"]
-  buildWinLauncher("$home/community", "$home/community/bin/WinLauncher/WinLauncher.exe", launcher,
-                   appInfoFile(), "$home/python/build/pycharm_launcher.properties", system_selector, resourcePaths)
-  signExe(launcher)
-  */
-
-  buildWinZip("${paths.artifacts}/pycharm${buildName}.zip", [paths.distAll, paths.distWin])
-  /*
-  buildNSIS([paths.distAll, paths.distWin],
-            "$home/python/build/strings.nsi", "$home/python/build/paths.nsi",
-            "pycharm", false, true, system_selector)
-  */
-
-  String tarRoot = isEap() ? "pycharm-community-$buildNumber" : "pycharm-community-${p("component.version.major")}.${p("component.version.minor")}"
-  buildTarGz(tarRoot, "$paths.artifacts/pycharm${buildName}.tar", [paths.distAll, paths.distUnix])
-
-  /*
-  String macAppRoot = isEap() ? "PyCharm ${p("component.version.major")}.${p("component.version.minor")} EAP.app" : "PyCharm.app"
-  buildMacZip(macAppRoot, "${paths.artifacts}/pycharm${buildName}.sit", [paths.distAll], paths.distMac)
-  signMacZip("pycharm")
-  buildDmg("pycharm", "${home}/python/build/DMG_background.png")
-  */
+    "$pythonCommunityHome/resources"]
+  buildWinLauncher("$ch", "$ch/bin/WinLauncher/WinLauncher.exe", launcher,
+                   appInfoFile(), "$pythonCommunityHome/build/pycharm_community_launcher.properties", system_selector, resourcePaths)
 }
 
 private layoutPlugins(layouts) {
diff --git a/python/build/pycharm_community_launcher.properties b/python/build/pycharm_community_launcher.properties
new file mode 100644
index 000000000000..45401043671d
--- /dev/null
+++ b/python/build/pycharm_community_launcher.properties
@@ -0,0 +1,3 @@
+IDS_JDK_ENV_VAR=PYCHARM_JDK
+IDS_JDK_ONLY=false
+IDS_VM_OPTIONS=-Didea.platform.prefix=PythonCore -Didea.no.jre.check=true -Didea.paths.selector=__PRODUCT_PATHS_SELECTOR__