split package

2 files changed, 27 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6d4243fc7a22..28831846946e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,13 @@
 # Generated by mksrcinfo v8
-# Wed Dec 21 14:19:56 UTC 2016
+# Fri Feb 24 12:54:21 UTC 2017
 pkgbase = phpstorm
 	pkgdesc = Lightweight and Smart PHP IDE
 	pkgver = 2016.3.2
-	pkgrel = 1
-	url = http://www.jetbrains.com/phpstorm/
+	pkgrel = 2
+	url = https://www.jetbrains.com/phpstorm/
 	arch = x86_64
 	arch = i686
 	license = Commercial
-	optdepends = java-environment>=8: use system java
-	optdepends = java-runtime-common: use system java
 	options = !strip
 	source = https://download.jetbrains.com/webide/PhpStorm-2016.3.2.tar.gz
 	source = jetbrains-phpstorm.desktop
@@ -17,4 +15,8 @@ pkgbase = phpstorm
 	sha512sums = fe312d7c637ec20bd946f2e22681243a51f29afc1052ae3fe5afd0fe01f77c222bf1e2c98f0afad8d5385466215653b7ffa8718da05b6dac100ba768ff2be1d6
 
 pkgname = phpstorm
+	optdepends = phpstorm-jre: JetBrains custom Java Runtime (Recommended)
+	optdepends = java-runtime>=8: JRE - Required if phpstorm-jre is not installed
+
+pkgname = phpstorm-jre
 
diff --git a/PKGBUILD b/PKGBUILD
index f1ad74b2400a..db6459ee70e9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,34 +4,38 @@
 # Contributor: D. Can Celasun <dcelasun[at]gmail[dot]com>
 # Contributor: Slava Volkov <sv99sv[at]gmail[dot]com>
 
-pkgname=phpstorm
-_pkgname=PhpStorm
+pkgbase=phpstorm
+pkgname=(phpstorm phpstorm-jre)
 pkgver=2016.3.2
 _pkgver=163.10504.2
-pkgrel=1
-pkgdesc="Lightweight and Smart PHP IDE"
+pkgrel=2
+pkgdesc='Lightweight and Smart PHP IDE'
 arch=('x86_64' 'i686')
-options=('!strip')
-url="http://www.jetbrains.com/${pkgname}/"
 license=('Commercial')
-optdepends=('java-environment>=8: use system java'
-            'java-runtime-common: use system java')
-source=(https://download.jetbrains.com/webide/${_pkgname}-${pkgver}.tar.gz
+url='https://www.jetbrains.com/phpstorm/'
+options=('!strip')
+source=(https://download.jetbrains.com/webide/PhpStorm-${pkgver}.tar.gz
         jetbrains-phpstorm.desktop)
 sha512sums=('4fe6c53b3f10b74e45e639543b139fbb284f2e5a30d6c4503e73cc097acd833b79a5736eb9d6fd50368fa5c9d54c1f3b79752c56362167f9a7de813e71912c46'
             'fe312d7c637ec20bd946f2e22681243a51f29afc1052ae3fe5afd0fe01f77c222bf1e2c98f0afad8d5385466215653b7ffa8718da05b6dac100ba768ff2be1d6')
 
-package() {
+package_phpstorm() {
+  optdepends=('phpstorm-jre: JetBrains custom Java Runtime (Recommended)'
+              'java-runtime>=8: JRE - Required if phpstorm-jre is not installed')
+
   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/
 
-  cp -a ${srcdir}/${_pkgname}-${_pkgver} ${pkgdir}/opt/${pkgname}
-  # if using system java you may remove the bundled jre and save about 100M
-  #rm -rf ${pkgdir}/opt/${pkgname}/jre
+  rsync -rtl ${srcdir}/PhpStorm-${_pkgver}/ ${pkgdir}/opt/${pkgbase} --exclude=/jre
+
+  ln -s /opt/${pkgbase}/bin/${pkgbase}.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/${pkgbase}.png ${pkgdir}/usr/share/pixmaps/${pkgbase}.png
+}
 
-  ln -s /opt/$pkgname/bin/${pkgname}.sh ${pkgdir}/usr/bin/${pkgname}
-  install -D -m 644 ${srcdir}/jetbrains-${pkgname}.desktop ${pkgdir}/usr/share/applications/
-  install -D -m 644 "${pkgdir}/opt/${pkgname}/bin/${pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+package_phpstorm-jre() {
+  install -d -m 755 ${pkgdir}/opt/${pkgbase}
+  rsync -rtl ${srcdir}/PhpStorm-${_pkgver}/jre ${pkgdir}/opt/${pkgbase}
 }