From 3deec2bc14c4efda29876ec04588d4b7c4ff94b1 Mon Sep 17 00:00:00 2001
From: Aleksey Rostovskiy <aleksey.rostovskiy@jetbrains.com>
Date: Wed, 27 Nov 2019 19:23:27 +0300
Subject: [PATCH] PY-39320 Incorrect PythonApplicationInfo.xml values for
 PyCharm with Anaconda plugin

*ApplicationInfo.xml files weren't patched well, so PYA/PCA product codes weren't be written at all and it leaded to
problem with updates. Fixed product code for PyCharm with Anaconda both Community and Professional.

GitOrigin-RevId: 315da5bb94452f370373d593bea026284dfdff36
---
 .../intellij/build/pycharm/PyCharmCommunityProperties.groovy    | 1 +
 python/ideCoreSrc/idea/PyCharmCoreApplicationInfo.xml           | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.groovy b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.groovy
index ee1f23f702d8..7e5069b28100 100644
--- a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.groovy
+++ b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.groovy
@@ -25,6 +25,7 @@ import static org.jetbrains.intellij.build.impl.PluginLayout.plugin
 class PyCharmCommunityProperties extends PyCharmPropertiesBase {
   PyCharmCommunityProperties(String communityHome) {
     platformPrefix = "PyCharmCore"
+    customProductCode = "PC"
     applicationInfoModule = "intellij.pycharm.community"
     brandingResourcePaths = ["$communityHome/python/resources"]
     scrambleMainJar = false
diff --git a/python/ideCoreSrc/idea/PyCharmCoreApplicationInfo.xml b/python/ideCoreSrc/idea/PyCharmCoreApplicationInfo.xml
index 08ae9338657e..a50e3c1516f7 100644
--- a/python/ideCoreSrc/idea/PyCharmCoreApplicationInfo.xml
+++ b/python/ideCoreSrc/idea/PyCharmCoreApplicationInfo.xml
@@ -4,7 +4,7 @@
            xsi:schemaLocation="http://jetbrains.org/intellij/schema/application-info http://jetbrains.org/intellij/schema/ApplicationInfo.xsd">
   <version major="2020" minor="1" eap="true" suffix="Snapshot"/>
   <company name="JetBrains s.r.o." url="https://www.jetbrains.com" copyrightStart="2010"/>
-  <build number="PC-__BUILD__" date="__BUILD_DATE__"/>
+  <build number="__BUILD_NUMBER__" date="__BUILD_DATE__"/>
   <logo url="/pycharm_core_logo.png" textcolor="ffffff" progressColor="ffffff" progressX="114" progressY="278" progressHeight="3"/>
   <about url="/pycharm_core_about.png" logoX="540" logoY="300" logoW="100" logoH="100" foreground="cccccc"
          copyrightForeground="cccccc" linkColor="ffffff"/>