[arch-commits] Commit in intellij-idea-community-edition/trunk (4 files)
Maxime Gauduin
alucryd at archlinux.org
Wed Aug 15 18:31:49 UTC 2018
Date: Wednesday, August 15, 2018 @ 18:31:49
Author: alucryd
Revision: 371879
upgpkg: intellij-idea-community-edition 2:2018.2.1-2
Added:
intellij-idea-community-edition/trunk/idea-build.patch
Modified:
intellij-idea-community-edition/trunk/PKGBUILD
intellij-idea-community-edition/trunk/idea.desktop
intellij-idea-community-edition/trunk/idea.sh
------------------+
PKGBUILD | 83 ++++++++++++++++++++++++++++++++++-------------------
idea-build.patch | 40 +++++++++++++++++++++++++
idea.desktop | 2 -
idea.sh | 8 +++--
4 files changed, 101 insertions(+), 32 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-08-15 18:30:56 UTC (rev 371878)
+++ PKGBUILD 2018-08-15 18:31:49 UTC (rev 371879)
@@ -1,43 +1,68 @@
+# $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.1
-_pkgver=182.3911.36
-pkgrel=1
+_build=182.3911.36
+pkgrel=2
epoch=2
-pkgdesc="IDE for Java, Groovy and other programming languages with advanced refactoring features"
-arch=('any')
-url="https://www.jetbrains.com/idea/"
+pkgdesc='IDE for Java, Groovy and other programming languages with advanced refactoring features'
+arch=('x86_64')
+url='https://www.jetbrains.com/idea/'
license=('Apache')
-backup=('usr/share/intellijidea-ce/bin/idea.vmoptions'
- 'usr/share/intellijidea-ce/bin/idea64.vmoptions')
-depends=('java-environment=8' 'giflib' 'libxtst' 'libxft' 'ttf-font'
- 'coreutils' 'grep' 'which' 'glibc' 'python')
-conflicts=('intellij-idea-libs')
-replaces=('intellij-idea-libs')
-install=idea.install
-source=(https://download.jetbrains.com/idea/ideaIC-${pkgver}-no-jdk.tar.gz
- idea.desktop
- idea.sh)
-sha256sums=('5e26c975f12bdda8b02fd592ab9a725a91306db10e84e515787370f4821a4eb7'
- 'bd37ad47c926941108f624cbe5adbd7fe91d198b15aca63d8a0c0da14c7a76a6'
- '0e5d6a47b5ae464e9f562110ccc798f55055943e425e0621c0275f72615fdb1d')
+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'
+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#tag=idea/${_build}"
+ "idea-adt-tools-base::git://git.jetbrains.org/idea/adt-tools-base.git#tag=idea/${_build}"
+ 'idea-build.patch'
+ 'idea.desktop'
+ 'idea.sh')
+sha256sums=('4556dbf0099fde8115b05bdc76e80c82263d9c3ef98c9b112c48d610f2fac509'
+ 'SKIP'
+ 'SKIP'
+ '3793e8125abb05b1580919017469ada2563a2e5972a8d74666557df60d270cfd'
+ 'fa9e3cba5e26a7e01cecda867f23467322db123c5553dfbb4f14aae034ccbed7'
+ '9e2155dd4d352b2410fc689236b15d5c3cb9937d82b50d39ec8b8dbcdfa40de1')
+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}"/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}"
+}
+
package() {
- install -d -m755 "$pkgdir/"usr/share
- cp -a "idea-IC-$_pkgver" "$pkgdir"/usr/share/intellijidea-ce
+ cd idea-IC-${_build}
- # make sure that all files are owned by root
- chown -R root:root "$pkgdir/usr/share"
+ # workaround FS#40934
+ sed -i 's/lcd/on/' bin/*.vmoptions
- install -D -m755 "$srcdir"/idea.sh "$pkgdir"/usr/bin/idea.sh
- install -D -m644 "$srcdir"/idea.desktop "$pkgdir"/usr/share/applications/idea.desktop
- install -D -m644 "$pkgdir"/usr/share/intellijidea-ce/bin/idea.png \
- "$pkgdir"/usr/share/pixmaps/idea.png
+ rm -rf bin/fsnotifier{,-arm} lib/libpty/linux/x86
- # workaround FS#40934
- sed -i 's|lcd|on|' "$pkgdir"/usr/share/intellijidea-ce/bin/*.vmoptions
+ install -dm 755 "${pkgdir}"/usr/share/{licenses,pixmaps,idea}
+ cp -dr --no-preserve='ownership' bin lib plugins redist "${pkgdir}"/usr/share/idea/
+ cp -dr --no-preserve='ownership' license "${pkgdir}"/usr/share/licenses/idea
+ ln -s /usr/share/idea/bin/idea.png "${pkgdir}"/usr/share/pixmaps/
+ install -Dm 644 ../idea.desktop -t "${pkgdir}"/usr/share/applications/
+ install -Dm 755 ../idea.sh "${pkgdir}"/usr/bin/idea
}
-# vim:set ts=2 sw=2 et:
+# vim: ts=2 sw=2 et:
+
Added: idea-build.patch
===================================================================
--- idea-build.patch (rev 0)
+++ idea-build.patch 2018-08-15 18:31:49 UTC (rev 371879)
@@ -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
++}
Modified: idea.desktop
===================================================================
--- idea.desktop 2018-08-15 18:30:56 UTC (rev 371878)
+++ idea.desktop 2018-08-15 18:31:49 UTC (rev 371879)
@@ -3,7 +3,7 @@
Type=Application
Name=IntelliJ IDEA Community Edition
Comment=Develop with pleasure!
-Exec=idea.sh %f
+Exec=idea %f
Icon=idea
Terminal=false
StartupNotify=true
Modified: idea.sh
===================================================================
--- idea.sh 2018-08-15 18:30:56 UTC (rev 371878)
+++ idea.sh 2018-08-15 18:31:49 UTC (rev 371879)
@@ -1,5 +1,9 @@
#!/bin/sh
+
if [ -z "$IDEA_JDK" ] ; then
- IDEA_JDK="/usr/lib/jvm/java-8-openjdk/"
+ IDEA_JDK="/usr/lib/jvm/java-8-openjdk/"
fi
-exec env IDEA_JDK=$IDEA_JDK /usr/share/intellijidea-ce/bin/idea.sh $@
+exec env IDEA_JDK=$IDEA_JDK /usr/share/idea/bin/idea.sh $@
+
+# vim: ts=2 sw=2 et:
+
More information about the arch-commits
mailing list