Merge remote-tracking branch 'origin/master' rubymine/138.1466
authorVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Mon, 4 Aug 2014 10:17:14 +0000 (14:17 +0400)
committerVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Mon, 4 Aug 2014 10:17:14 +0000 (14:17 +0400)
python/build/paths.nsi
python/build/pycharm_community_build.gant

index cf4f769c5f9f3b8f6dc1e4d037d9b06a813ce6d7..6baf09644c8bbadd80e3bb77b7b4c3961037db9a 100644 (file)
@@ -2,5 +2,5 @@
 !define IMAGES_LOCATION ${COMMUNITY_DIR}\python\build\resources
 ;!define LICENSE_FILE ${BASE_DIR}\python\license\PyCharm_Preview_License
 !define PRODUCT_PROPERTIES_FILE ${BASE_DIR}\out\pycharmCE\layout\bin\idea.properties
-!define PRODUCT_VM_OPTIONS_NAME pycharm.exe.vmoptions
+!define PRODUCT_VM_OPTIONS_NAME pycharm*.exe.vmoptions
 !define PRODUCT_VM_OPTIONS_FILE ${BASE_DIR}\out\pycharmCE\win\bin\${PRODUCT_VM_OPTIONS_NAME}
index 90680aebc9f9322c9844ea0ff7a6817c5d1e5986..1d73b83048a8212052a4caf2b64facd77fa3f07e 100644 (file)
@@ -169,7 +169,7 @@ public layoutCommunity(String classesPath, Set usedJars) {
   buildWinLauncher("$ch", "$ch/bin/WinLauncher/WinLauncher.exe", launcher,
                    appInfo, "$pythonCommunityHome/build/pycharm_community_launcher.properties", system_selector, resourcePaths)
   buildWinLauncher("$ch", "$ch/bin/WinLauncher/WinLauncher64.exe", launcher64,
-                   appInfo, "$pythonCommunityHome/build/pycharm64_launcher.properties", system_selector, resourcePaths)
+                   appInfo, "$pythonCommunityHome/build/pycharm64_community_launcher.properties", system_selector, resourcePaths)
 
   buildWinZip("${paths.artifacts}/pycharmPC-${buildNumber}.zip", [paths.distAll, paths.distWin])