[arch-commits] Commit in intellij-idea-community-edition/trunk (3 files)

[Levente Polyak]

    Date: Sunday, September 9, 2018 @ 18:00:49
  Author: anthraxx
Revision: 378923

upgpkg: intellij-idea-community-edition 2:2018.2.3-1

Modified:
  intellij-idea-community-edition/trunk/PKGBUILD
  intellij-idea-community-edition/trunk/idea.sh
Deleted:
  intellij-idea-community-edition/trunk/idea.install

--------------+
 PKGBUILD     |   36 +++++++++++++++---------------------
 idea.install |   10 ----------
 idea.sh      |    6 ++++--
 3 files changed, 19 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-09 17:43:27 UTC (rev 378922)
+++ PKGBUILD	2018-09-09 18:00:49 UTC (rev 378923)
@@ -1,51 +1,46 @@
-# $Id$
 # Maintainer: Lukas Jirkovsky <l.jirkovsky at gmail.com>
 # Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
 # Maintainer: Maxime Gauduin <alucryd at archlinux.org>
 
 pkgname=intellij-idea-community-edition
-pkgver=2018.2.2
-_build=182.4129.33
+pkgver=2018.2.3
+_build=182.4323.46
+_adt_tools_base_commit=70a9f8b3756d917717a04140b858a23eef5e60ca
 pkgrel=1
 epoch=2
 pkgdesc='IDE for Java, Groovy and other programming languages with advanced refactoring features'
+url='https://www.jetbrains.com/idea/'
 arch=('x86_64')
-url='https://www.jetbrains.com/idea/'
 license=('Apache')
 backup=('usr/share/idea/bin/idea.vmoptions'
         'usr/share/idea/bin/idea64.vmoptions')
 depends=('giflib' 'java-environment=8' 'python' 'sh' 'ttf-font')
 makedepends=('apache-ant' 'git' 'java-openjfx')
-install='idea.install'
-_android_commit='b3cd38efb0d8ca0ae5fb82edf27b82a31122c647'
-_adt_tools_base_commit='70a9f8b3756d917717a04140b858a23eef5e60ca'
-source=("idea-${_build}.tar.gz::https://github.com/JetBrains/intellij-community/archive/idea/${_build}.tar.gz"
-        "idea-android::git://git.jetbrains.org/idea/android.git#commit=${_android_commit}"
-        "idea-adt-tools-base::git://git.jetbrains.org/idea/adt-tools-base.git#commit=${_adt_tools_base_commit}"
-        'idea-build.patch'
-        'idea.desktop'
-        'idea.sh')
-sha256sums=('151b292adf956789a519e12701bf767181bd7cef95902e81a7b6d3c0a98aec90'
+source=(idea-${_build}.tar.gz::https://github.com/JetBrains/intellij-community/archive/idea/${_build}.tar.gz
+        idea-android-${_build}.tar.gz::https://github.com/JetBrains/android/archive/idea/${_build}.tar.gz
+        idea-adt-tools-base::"git://git.jetbrains.org/idea/adt-tools-base.git#commit=${_adt_tools_base_commit}"
+        idea-build.patch
+        idea.desktop
+        idea.sh)
+sha256sums=('0eae527f1cee3fe4ca0fd90ff67707e4e304bb71d3e1d4e773e0c4c0245e8643'
+            '3a8759e8ba508a16108f5b778739465333433fd9fb540414af0f46a1110131fd'
             'SKIP'
-            'SKIP'
             '3793e8125abb05b1580919017469ada2563a2e5972a8d74666557df60d270cfd'
             'fa9e3cba5e26a7e01cecda867f23467322db123c5553dfbb4f14aae034ccbed7'
-            '9e2155dd4d352b2410fc689236b15d5c3cb9937d82b50d39ec8b8dbcdfa40de1')
+            'c021dba82f75a18be6ffdc2fe70d616496bbe3a14e7a5efef30c06b4cbd915c3')
 
 prepare() {
   cd intellij-community-idea-${_build}
-
   patch -Np1 -i ../idea-build.patch
   echo ${_build} > build.txt
-  ln -s "${srcdir}"/idea-android android
+  ln -s "${srcdir}"/android-idea-${_build} android
+  ls -lah android/
   ln -s "${srcdir}"/idea-adt-tools-base android/tools-base
 }
 
 build() {
   cd intellij-community-idea-${_build}
-
   unset _JAVA_OPTIONS
-
   ant build
   tar -xf out/idea-ce/artifacts/ideaIC-${_build}-no-jdk.tar.gz -C "${srcdir}"
 }
@@ -67,4 +62,3 @@
 }
 
 # vim: ts=2 sw=2 et:
-

Deleted: idea.install
===================================================================
--- idea.install	2018-09-09 17:43:27 UTC (rev 378922)
+++ idea.install	2018-09-09 18:00:49 UTC (rev 378923)
@@ -1,10 +0,0 @@
-post_install() {
-  echo "WARNING:"
-  echo "  Running IntelliJ IDEA with java other than java 8"
-  echo "  may cause various problems, such as Graddle import not working"
-}
-
-post_upgrade() {
-  post_install
-}
-

Modified: idea.sh
===================================================================
--- idea.sh	2018-09-09 17:43:27 UTC (rev 378922)
+++ idea.sh	2018-09-09 18:00:49 UTC (rev 378923)
@@ -1,9 +1,11 @@
 #!/bin/sh
 
+# WARNING:
+# Running IntelliJ IDEA with java other than java 8
+# may cause various problems, such as Graddle import not working
 if [ -z "$IDEA_JDK" ] ; then
   IDEA_JDK="/usr/lib/jvm/java-8-openjdk/"
 fi
-exec env IDEA_JDK=$IDEA_JDK /usr/share/idea/bin/idea.sh $@
+exec env IDEA_JDK="$IDEA_JDK" /usr/share/idea/bin/idea.sh "$@"
 
 # vim: ts=2 sw=2 et:
-