Make JRE optional

3 files changed, 41 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7ea9563b7794..b6e48e76e694 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,24 @@
 # Generated by mksrcinfo v8
-# Fri Oct 27 11:16:38 UTC 2017
+# Fri Nov  3 23:03:15 UTC 2017
 pkgbase = phpstorm-eap
 	pkgdesc = Lightning-smart PHP IDE. Early Access Program.
 	pkgver = 173.3415.21
-	pkgrel = 1
-	url = http://www.jetbrains.com/phpstorm/
-	arch = i686
+	pkgrel = 2
+	url = https://www.jetbrains.com/phpstorm/
 	arch = x86_64
-	license = custom
-	optdepends = java-environment>=8: use system java
-	optdepends = java-runtime-common: use system java
+	arch = i686
+	license = Commercial
+	makedepends = rsync
 	options = !strip
 	source = https://download.jetbrains.com/webide/PhpStorm-EAP-173.3415.21.tar.gz
-	source = phpstorm-eap.desktop
+	source = jetbrains-phpstorm-eap.desktop
 	sha256sums = a1a40ac2a0ff862095529b905b875184325c53df163e948da1749f0ab3822e8b
 	sha256sums = 479e6ac16424df02ce1610da9eec8cc73a84cac7912e60661d4092954142933e
 
 pkgname = phpstorm-eap
+	optdepends = phpstorm-eap-jre: JetBrains custom Java Runtime (Recommended)
+	optdepends = java-runtime>=8: JRE - Required if phpstorm-eap-jre is not installed
+	optdepends = gnome-keyring: save login/deployment credentials safely
+
+pkgname = phpstorm-eap-jre
 
diff --git a/PKGBUILD b/PKGBUILD
index 23039b719a56..48fc1ead5edb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,30 +5,39 @@
 # Contributor: Slava Volkov <sv99sv[at]gmail[dot]com>
 # Contributor: Patrik Votoček <patrik[at]votocek[dot]cz>
 
-pkgname=phpstorm-eap
+pkgbase=phpstorm-eap
+pkgname=(phpstorm-eap phpstorm-eap-jre)
 pkgver=173.3415.21
-pkgrel=1
+pkgrel=2
 pkgdesc="Lightning-smart PHP IDE. Early Access Program."
-arch=('i686' 'x86_64')
-options=(!strip)
-url="http://www.jetbrains.com/phpstorm/"
-license=('custom')
-optdepends=('java-environment>=8: use system java'
-            'java-runtime-common: use system java')
-source=("https://download.jetbrains.com/webide/PhpStorm-EAP-${pkgver}.tar.gz"
-        "phpstorm-eap.desktop")
+arch=('x86_64' 'i686')
+license=('Commercial')
+url='https://www.jetbrains.com/phpstorm/'
+makedepends=('rsync')
+options=('!strip')
+source=(https://download.jetbrains.com/webide/PhpStorm-EAP-${pkgver}.tar.gz
+        jetbrains-phpstorm-eap.desktop)
 sha256sums=('a1a40ac2a0ff862095529b905b875184325c53df163e948da1749f0ab3822e8b'
             '479e6ac16424df02ce1610da9eec8cc73a84cac7912e60661d4092954142933e')
 
-package() {
-  install -d -m 755 ${pkgdir}/opt/
-  install -d -m 755 ${pkgdir}/usr/bin/
-  install -d -m 755 ${pkgdir}/usr/share/applications/
-  install -d -m 755 ${pkgdir}/usr/share/pixmaps/
+package_phpstorm-eap() {
+  optdepends=('phpstorm-eap-jre: JetBrains custom Java Runtime (Recommended)'
+              'java-runtime>=8: JRE - Required if phpstorm-eap-jre is not installed'
+              'gnome-keyring: save login/deployment credentials safely')
 
-  cp -R ${srcdir}/PhpStorm-${pkgver} ${pkgdir}/opt/${pkgname}
-  
-  ln -s /opt/$pkgname/bin/phpstorm.sh ${pkgdir}/usr/bin/phpstorm-eap
-  install -D -m 644 ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/
-  install -D -m 644 ${pkgdir}/opt/${pkgname}/bin/phpstorm.png ${pkgdir}/usr/share/pixmaps/phpstorm-eap.png
+  install -d -m 755 "${pkgdir}/opt/"
+  install -d -m 755 "${pkgdir}/usr/bin/"
+  install -d -m 755 "${pkgdir}/usr/share/applications/"
+  install -d -m 755 "${pkgdir}/usr/share/pixmaps/"
+
+  rsync -rtl "${srcdir}/PhpStorm-${pkgver}/" "${pkgdir}/opt/${pkgbase}" --exclude=/jre64
+
+  ln -s "/opt/${pkgbase}/bin/phpstorm.sh" "${pkgdir}/usr/bin/${pkgbase}"
+  install -D -m 644 "${srcdir}/jetbrains-${pkgbase}.desktop" "${pkgdir}/usr/share/applications/"
+  install -D -m 644 "${pkgdir}/opt/${pkgbase}/bin/phpstorm.png" "${pkgdir}/usr/share/pixmaps/${pkgbase}.png"
+}
+
+package_phpstorm-eap-jre() {
+  install -d -m 755 "${pkgdir}/opt/${pkgbase}"
+  rsync -rtl "${srcdir}/PhpStorm-${pkgver}/jre64" "${pkgdir}/opt/${pkgbase}"
 }
diff --git a/phpstorm-eap.desktop b/jetbrains-phpstorm-eap.desktop
index d4c3b4f90ee9..d4c3b4f90ee9 100644
--- a/phpstorm-eap.desktop
+++ b/jetbrains-phpstorm-eap.desktop