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

[Maxime Gauduin]

    Date: Thursday, March 29, 2018 @ 18:46:56
  Author: alucryd
Revision: 313420

updpkg: pycharm-community-edition 2018.1-1

Added:
  pycharm-community-edition/trunk/pycharm-build.patch
Modified:
  pycharm-community-edition/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   35 ++++++++++++++++++++++++++---------
 pycharm-build.patch |   40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-29 17:10:25 UTC (rev 313419)
+++ PKGBUILD	2018-03-29 18:46:56 UTC (rev 313420)
@@ -3,7 +3,8 @@
 # Contributor: David Keogh <davekeogh at archlinux.us>
 
 pkgname=pycharm-community-edition
-pkgver=2017.3.4
+pkgver=2018.1
+_build=181.4203.547
 pkgrel=1
 pkgdesc='Python IDE for Professional Developers'
 arch=('x86_64')
@@ -14,17 +15,34 @@
             'ipython: IPython integration for Python 3'
             'python2: Python 2 support'
             'python: Python 3 support')
-makedepends=('python2-setuptools' 'python-setuptools')
+makedepends=('apache-ant' 'java-environment=8' 'java-openjfx'
+             'python2-setuptools' 'python-setuptools')
 conflicts=('pycharm' 'pycharm-community' 'pycharm-professional')
 provides=('pycharm')
-source=("https://download.jetbrains.com/python/pycharm-community-${pkgver}.tar.gz"
-        'pycharm.desktop')
-sha256sums=('048810228293c41377bce069eba4905e1e0c12ea7ac83605adeac89cf138fc08'
-            '28e0d3200c721e61831d8246eba8f72485d3c8379d10bfa75ccb5331b6749480')
+source=("pycharm-${_build}.tar.gz::https://github.com/JetBrains/intellij-community/archive/pycharm/${_build}.tar.gz"
+        'pycharm.desktop'
+        'pycharm-build.patch')
+sha256sums=('1cd40a38535262771c8b69439a6b7c8f1607abfb5e89999c50b2cc575debaec1'
+            '28e0d3200c721e61831d8246eba8f72485d3c8379d10bfa75ccb5331b6749480'
+            '3793e8125abb05b1580919017469ada2563a2e5972a8d74666557df60d270cfd')
 
+prepare() {
+  cd intellij-community-pycharm-${_build}
+
+  patch -Np1 -i ../pycharm-build.patch
+  sed "s/SNAPSHOT/${_build}/" -i python/build.xml
+}
+
 build() {
-  cd pycharm-community-${pkgver}
+  cd intellij-community-pycharm-${_build}/python
 
+  unset _JAVA_OPTIONS
+
+  ant build
+  tar -xf ../out/pycharm-ce/artifacts/pycharmPC-${_build}-no-jdk.tar.gz -C "${srcdir}"
+
+  cd ../../pycharm-community-${pkgver}
+
   python2 helpers/pydev/setup_cython.py build_ext --build-temp build --build-lib .
   python3 helpers/pydev/setup_cython.py build_ext --build-temp build --build-lib .
   rm -rf bin/fsnotifier{,-arm} lib/libpty/linux/x86
@@ -33,9 +51,8 @@
 package() {
   cd pycharm-community-${pkgver}
 
-  install -dm 755 "${pkgdir}"/usr/{bin,share/{applications,doc,licenses,pixmaps,pycharm}}
+  install -dm 755 "${pkgdir}"/usr/{bin,share/{applications,licenses,pixmaps,pycharm}}
   cp -dr --no-preserve='ownership' bin helpers lib plugins "${pkgdir}"/usr/share/pycharm/
-  cp -dr --no-preserve='ownership' help "${pkgdir}"/usr/share/doc/pycharm/
   cp -dr --no-preserve='ownership' license "${pkgdir}"/usr/share/licenses/pycharm/
   ln -s /usr/share/pycharm/bin/pycharm.sh $pkgdir/usr/bin/pycharm
   ln -s /usr/share/pycharm/bin/pycharm.png "${pkgdir}"/usr/share/pixmaps/

Added: pycharm-build.patch
===================================================================
--- pycharm-build.patch	                        (rev 0)
+++ pycharm-build.patch	2018-03-29 18:46:56 UTC (rev 313420)
@@ -0,0 +1,40 @@
+diff -rupN intellij-community-pycharm-182.1177.orig/build/dependencies/setupJbre.gradle intellij-community-pycharm-182.1177/build/dependencies/setupJbre.gradle
+--- intellij-community-pycharm-182.1177.orig/build/dependencies/setupJbre.gradle	2018-03-29 19:26:20.265970726 +0200
++++ intellij-community-pycharm-182.1177/build/dependencies/setupJbre.gradle	2018-03-29 19:26:52.690160085 +0200
+@@ -1,7 +1,7 @@
+ task setupJbre {}
+ 
+ def jdkRepo = inJetBrainsNetwork ? 'http://repo.labs.intellij.net/intellij-jdk' : 'https://dl.bintray.com/jetbrains/intellij-jdk'
+-def targetOs = "${System.getProperty("intellij.build.target.os", "all")}"
++def targetOs = "${System.getProperty("intellij.build.target.os", "linux")}"
+ 
+ jrePlatformsToDownload(targetOs).each { platform ->
+   archToDownload(platform).each { arch ->
+diff -rupN intellij-community-pycharm-182.1177.orig/platform/build-scripts/groovy/org/jetbrains/intellij/build/BuildOptions.groovy intellij-community-pycharm-182.1177/platform/build-scripts/groovy/org/jetbrains/intellij/build/BuildOptions.groovy
+--- intellij-community-pycharm-182.1177.orig/platform/build-scripts/groovy/org/jetbrains/intellij/build/BuildOptions.groovy	2018-03-29 19:26:25.415841858 +0200
++++ intellij-community-pycharm-182.1177/platform/build-scripts/groovy/org/jetbrains/intellij/build/BuildOptions.groovy	2018-03-29 19:31:46.883868914 +0200
+@@ -33,7 +33,7 @@ class BuildOptions {
+   /**
+    * Specifies for which operating systems distributions should be built.
+    */
+-  String targetOS = System.getProperty("intellij.build.target.os", OS_ALL)
++  String targetOS = System.getProperty("intellij.build.target.os", OS_LINUX)
+   static final String OS_LINUX = "linux"
+   static final String OS_WINDOWS = "windows"
+   static final String OS_MAC = "mac"
+@@ -100,7 +100,7 @@ class BuildOptions {
+    * Build number without product code (e.g. '162.500.10'), if {@code null} '<baseline>.SNAPSHOT' will be used. Use {@link BuildContext#buildNumber} to
+    * get the actual build number in build scripts.
+    */
+-  String buildNumber = System.getProperty("build.number")
++  String buildNumber = System.getProperty("idea.build.number")
+ 
+   /**
+    * By default build process produces temporary and resulting files under projectHome/out/productName directory, use this property to
+@@ -115,4 +115,4 @@ class BuildOptions {
+    */
+   boolean isInDevelopmentMode = SystemProperties.getBooleanProperty("intellij.build.dev.mode",
+                                                                     System.getProperty("teamcity.buildType.id") == null)
+-}
+\ No newline at end of file
++}