[arch-commits] Commit in pycharm-community-edition/trunk (PKGBUILD)

[Leonidas Spyropoulos]

    Date: Monday, April 25, 2022 @ 15:28:43
  Author: artafinde
Revision: 1190022

pycharm-community-edition: upstream release 2022.1

Change of build system

Modified:
  pycharm-community-edition/trunk/PKGBUILD

----------+
 PKGBUILD |   32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-25 15:23:16 UTC (rev 1190021)
+++ PKGBUILD	2022-04-25 15:28:43 UTC (rev 1190022)
@@ -4,9 +4,8 @@
 # Contributor: David Keogh <davekeogh at archlinux.us>
 
 pkgname=pycharm-community-edition
-pkgver=2021.3.3
-_build=213.7172.26
-_gitcommit=5f5131338c845aa17374cea2ade8441dd3b86f60
+pkgver=2022.1
+_build=221.5080.212
 pkgrel=1
 pkgdesc='Python IDE for Professional Developers'
 arch=(x86_64)
@@ -27,7 +26,6 @@
   'ipython: IPython integration for Python 3'
 )
 makedepends=(
-  ant
   git
   java-environment=11
   python2-setuptools
@@ -34,8 +32,8 @@
   python-setuptools
 )
 source=(
-  "git+https://github.com/JetBrains/intellij-community.git#commit=${_gitcommit}"
-  idea-android::"git://git.jetbrains.org/idea/android.git#tag=idea/212.5457.46"
+  "git+https://github.com/JetBrains/intellij-community.git#tag=pycharm/${_build}"
+  idea-android::"git://git.jetbrains.org/idea/android.git#tag=pycharm/${_build}"
   pycharm.desktop
   pycharm.sh
 )
@@ -50,22 +48,16 @@
   echo ${_build} > build.txt
   mv "${srcdir}"/idea-android android
 
-  # https://youtrack.jetbrains.com/issue/IDEA-266631
-  sed '/intellij.cwm.plugin/d' -i python/build/plugin-list.txt
-  sed '/intellij.marketplace/d' -i python/build/plugin-list.txt
-
-  sed '/def targetOs =/c def targetOs = "linux"' -i build/dependencies/setupJbre.gradle
   sed '/String targetOS/c   String targetOS = OS_LINUX' -i platform/build-scripts/groovy/org/jetbrains/intellij/build/BuildOptions.groovy
-  sed -E 's|(<sysproperty key="jna.nosys")|<sysproperty key="intellij.build.target.os" value="linux" />\1|' -i build.xml
-  sed -E 's|(<sysproperty key="java.awt.headless")|<sysproperty key="intellij.build.target.os" value="linux" />\1|' -i python/build.xml
-  sed "s/-Xmx612m -XX:MaxPermSize=152m/-Xmx2048m -XX:MaxPermSize=512m/" -i python/build.xml
-  sed "s|-Didea.build.number=\${idea.build.number}|-Didea.build.number=\${idea.build.number} -Didea.home.path=|" -i python/build.xml
   sed 's|../build/plugins-autoupload.txt|plugins-autoupload.txt|' -i platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy
   touch plugins-autoupload.txt
+  # Fix pycharm python/installer.cmd & python/plugin.cmd
+  sed 's|intellij.pycharm.community.build|"$(cd "$(dirname "$0")"; pwd)/../" intellij.pycharm.community.build|' -i python/installers.cmd
+  sed 's|intellij.pycharm.community.build|"$(cd "$(dirname "$0")"; pwd)/../" intellij.pycharm.community.build|' -i python/plugin.cmd
 }
 
 build() {
-  cd intellij-community/python
+  cd intellij-community
 
   unset _JAVA_OPTIONS
   export JAVA_HOME=/usr/lib/jvm/java-11-openjdk
@@ -73,11 +65,13 @@
   export JDK_16_x64=/usr/lib/jvm/java-11-openjdk
   export JDK_18_x64=/usr/lib/jvm/java-11-openjdk
 
-  ant -Dintellij.build.target.os=linux build
-  tar -xf ../out/pycharm-ce/artifacts/pycharmPC-${_build}-no-jbr.tar.gz -C "${srcdir}"
+  ./python/installers.cmd -Dintellij.build.target.os=linux
+  ./python/plugin.cmd -Dintellij.build.target.os=linux
 
-  cd ../../pycharm-community-${pkgver}
+  tar -xf out/pycharm-ce/artifacts/pycharmPC-${_build}-no-jbr.tar.gz -C "${srcdir}"
 
+  cd ../pycharm-community-${pkgver}
+
   python2 plugins/python-ce/helpers/pydev/setup_cython.py build_ext --build-temp build --build-lib .
   python3 plugins/python-ce/helpers/pydev/setup_cython.py build_ext --build-temp build --build-lib .
 }