summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Alex2017-05-31 11:17:06 +1000
committerBen Alex2017-05-31 11:17:06 +1000
commitc4b74114f2e4b50d7c94ff30eed221987daf3d5f (patch)
tree357c7dbc386693464349038461e374c2d839a7c6
parent07fb6766568355291a11e79a372ee832a1ef5fd0 (diff)
downloadaur-c4b74114f2e4b50d7c94ff30eed221987daf3d5f.tar.gz
Refactor to include bundled Oracle JRE in package build
I've tried to avoid this as long as practical, but the recent option of JavaFX by TWS leaves little choice. This commit bundles the IB-provided Oracle JRE into the ib-tws package. It is kept in a private directory specifically for TWS use. Both IB Gateway and TWS now use the bundled Oracle JRE. The IB Controller sister package has also been updated to reflect this change.
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD19
-rwxr-xr-xib-gw4
-rwxr-xr-xib-tws4
4 files changed, 21 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7f0dbbc9a4d..92ebd787f03 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,14 @@
-# Generated by mksrcinfo v8
-# Fri May 19 04:39:08 UTC 2017
pkgbase = ib-tws
pkgdesc = Electronic trading platform from discount brokerage firm Interactive Brokers
pkgver = 965.1b
- pkgrel = 1
+ pkgrel = 2
url = http://interactivebrokers.com/
arch = any
license = custom
+ makedepends = gtk2
makedepends = imagemagick
makedepends = gzip
makedepends = tar
- depends = java-environment
depends = bash
source = LICENSE
source = ib-tws
@@ -19,11 +17,11 @@ pkgbase = ib-tws
source = ib-gw.desktop
source = https://download2.interactivebrokers.com/installers/tws/latest-standalone/tws-latest-standalone-linux-x64.sh
md5sums = e1cae2de592add7133bb08123e8db1ad
- md5sums = c407d22dfafdb33ec2fe97eeb5e9f0aa
+ md5sums = dff283b103c0ddeb76eba6ecfb852afd
md5sums = 9205b5eade96d69f8e470cc52c30db4a
- md5sums = c95eeb41fec3aae6ad5e82703a39060c
+ md5sums = 6f08b240afad921b29c2c81a440a6a8a
md5sums = ffa9fcfb623850e5c9e796040bdbd052
- md5sums = 7c755b9d5b6889e2c89fd924b9a18807
+ md5sums = b5c6bbb526862cfd463304fb1da4dbc9
pkgname = ib-tws
diff --git a/PKGBUILD b/PKGBUILD
index 4042cd42eb3..33f6377ed07 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,13 @@
pkgname=ib-tws
pkgver=965.1b
-pkgrel=1
+pkgrel=2
pkgdesc='Electronic trading platform from discount brokerage firm Interactive Brokers'
arch=('any')
url="http://interactivebrokers.com/"
license=('custom')
-depends=(jre bash)
-makedepends=(imagemagick gzip tar)
+depends=(bash)
+makedepends=(gtk2 imagemagick gzip tar)
source=('LICENSE'
'ib-tws'
@@ -17,9 +17,9 @@ source=('LICENSE'
'ib-gw.desktop'
'https://download2.interactivebrokers.com/installers/tws/latest-standalone/tws-latest-standalone-linux-x64.sh')
md5sums=('e1cae2de592add7133bb08123e8db1ad'
- 'f6475c9ea0bdd03e9dec608983ae1218'
+ 'dff283b103c0ddeb76eba6ecfb852afd'
'9205b5eade96d69f8e470cc52c30db4a'
- '4fde990121cb3b4f0fad029d3c923cbe'
+ '6f08b240afad921b29c2c81a440a6a8a'
'ffa9fcfb623850e5c9e796040bdbd052'
'b5c6bbb526862cfd463304fb1da4dbc9')
@@ -32,6 +32,9 @@ build() {
rm -rf $HOME/.install4j $HOME/.i4j_jres $HOME/Jts/${majorVer}
./tws-latest-standalone-linux-x64.sh -q
+ BUNDLED_JRE_VER=$(ls -1 ${HOME}/.i4j_jres)
+ mv ${HOME}/.i4j_jres/${BUNDLED_JRE_VER} ${HOME}/.i4j_jres/jre
+ mv ${HOME}/.i4j_jres/jre ${srcdir}/jre
mv ${HOME}/Jts/${majorVer}/jars/*.jar ${srcdir}
rm -rf $HOME/.install4j $HOME/.i4j_jres $HOME/Jts/${majorVer}
cd ${srcdir}
@@ -59,6 +62,8 @@ package() {
install -Dm644 ib-gw.desktop ${pkgdir}/usr/share/applications/ib-gw.desktop
mkdir -p ${pkgdir}/usr/share/pixmaps/
install -Dm644 *.png "${pkgdir}/usr/share/pixmaps/"
- mkdir -p ${pkgdir}/usr/share/java/${pkgname}
- install -Dm644 *.jar ${pkgdir}/usr/share/java/${pkgname}
+ mkdir -p ${pkgdir}/usr/share/${pkgname}/jre
+ cp -R jre ${pkgdir}/usr/share/${pkgname}
+ mkdir -p ${pkgdir}/usr/share/${pkgname}/jars
+ install -Dm644 *.jar ${pkgdir}/usr/share/${pkgname}/jars
}
diff --git a/ib-gw b/ib-gw
index 4167226ca93..f66e779c2d2 100755
--- a/ib-gw
+++ b/ib-gw
@@ -1,4 +1,4 @@
#!/bin/bash
-cd /usr/share/java/ib-tws
-/usr/lib/jvm/java-8-jre/jre/bin/java -cp \* -Xmx512M -XX:MaxPermSize=128M -Dsun.java2d.noddraw=true ibgateway.GWClient $HOME/.ib-tws
+cd /usr/share/ib-tws/jars
+/usr/share/ib-tws/jre/bin/java -cp \* -Xmx512M -Dsun.java2d.noddraw=true ibgateway.GWClient $HOME/.ib-tws
diff --git a/ib-tws b/ib-tws
index 0dfc9933d02..7d3161927d1 100755
--- a/ib-tws
+++ b/ib-tws
@@ -1,5 +1,5 @@
#!/bin/bash
-cd /usr/share/java/ib-tws
-/usr/lib/jvm/java-8-jre/jre/bin/java -cp \* \
+cd /usr/share/ib-tws/jars
+/usr/share/ib-tws/jre/bin/java -cp \* \
-Xmx768m -Dsun.awt.nopixfmt=true -Dsun.java2d.noddraw=true -Dswing.boldMetal=false -Dsun.locale.formatasdefault=true \
jclient.LoginFrame $HOME/.ib-tws