summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO12
-rw-r--r--.gitignore4
-rw-r--r--PKGBUILD77
3 files changed, 48 insertions, 45 deletions
diff --git a/.SRCINFO b/.SRCINFO
index decf3a69589f..a12d78226014 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
pkgbase = j9-git
pkgdesc = J is a modern, high-level, general-purpose, high-performance programming language
- pkgver = 9.02.03.20201214
+ pkgver = r2181.3cbf8f13
pkgrel = 1
url = http://www.jsoftware.com
install = j9-git.install
arch = x86_64
license = GPL3
- license = LGPL
+ makedepends = git
makedepends = clang
depends = qt5-webengine
depends = qt5-websockets
@@ -16,12 +16,12 @@ pkgbase = j9-git
optdepends = expat: for api/expat addon
optdepends = fftw: for math/fftw addon
optdepends = lapack: for math/lapack addon
- source = jsource.zip::https://github.com/jsoftware/jsource/archive/master.zip
- source = qtide.zip::https://github.com/jsoftware/qtide/archive/master.zip
- source = jenv.tar.gz::http://www.databaserossoverde.it/jsoftware/j902_env_20200604.tar.gz
+ source = j9-git::git+https://github.com/jsoftware/jsource.git#branch=master
+ source = qtide-git::git+https://github.com/jsoftware/qtide.git#branch=master
+ source = jenv.tar.gz::http://www.databaserossoverde.it/jsoftware/j903_env_20201225.tar.gz
md5sums = SKIP
md5sums = SKIP
- md5sums = 97d95a813d13ff4c4242f701dd6c6a2f
+ md5sums = ad004c510a1b39a27107f03398759628
pkgname = j9-git
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..f71c635dafda
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!.gitignore
+!PKGBUILD
+!.SRCINFO
diff --git a/PKGBUILD b/PKGBUILD
index f5bd63a2f0c1..756e4485cae6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,63 +1,62 @@
# Maintainer: Andriy Mykhaylyk <erp dot lsf at gmail dot com>
-# Maintainer: Lorenzo Tomei <tomeil@tiscali.it>
+# Maintainer: Lorenzo Tomei <tomeil at tiscali dot it>
+# Maintainer: eelvex <eelvex at gmail dot com>
pkgname=j9-git
-pkgver=9.02.03.20201214
+pkgver=r2181.3cbf8f13
pkgrel=1
pkgdesc='J is a modern, high-level, general-purpose, high-performance programming language'
arch=('x86_64')
url='http://www.jsoftware.com'
-license=('GPL3' 'LGPL')
+license=('GPL3')
depends=('qt5-webengine' 'qt5-websockets' 'qt5-multimedia' 'qt5-svg')
optdepends=('wget: for web/gethttp addon'
'expat: for api/expat addon'
'fftw: for math/fftw addon'
'lapack: for math/lapack addon')
-makedepends=('clang')
- source=('jsource.zip::https://github.com/jsoftware/jsource/archive/master.zip'
- 'qtide.zip::https://github.com/jsoftware/qtide/archive/master.zip'
- 'jenv.tar.gz::http://www.databaserossoverde.it/jsoftware/j902_env_20200604.tar.gz')
-md5sums=('SKIP' 'SKIP' '97d95a813d13ff4c4242f701dd6c6a2f')
-install=j9-git.install
+makedepends=('git'
+ 'clang')
+source=("${pkgname}::git+https://github.com/jsoftware/jsource.git#branch=master"
+ 'qtide-git::git+https://github.com/jsoftware/qtide.git#branch=master'
+ 'jenv.tar.gz::http://www.databaserossoverde.it/jsoftware/j903_env_20201225.tar.gz')
+md5sums=('SKIP'
+ 'SKIP'
+ 'ad004c510a1b39a27107f03398759628')
+install="${pkgname}.install"
pkgver() {
-cd ${srcdir}
-echo "$(head -c 7 jenv/usr/lib/j9/system/config/version.txt)"."$(date +%Y%m%d)"
+ cd "${pkgname}"
+ printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}
prepare() {
-cd ${srcdir}/jsource-master
-echo '#define jversion "902"' > jsrc/jversion.h
-echo '#define jplatform "linux"' >> jsrc/jversion.h
-echo '#define jtype "build"' >> jsrc/jversion.h
-echo '#define jlicense "GPL3"' >> jsrc/jversion.h
-echo '#define jbuilder "www.jsoftware.com"' >> jsrc/jversion.h
-sed -i "s@-Werror@-Werror -Wno-return-local-add@" make2/build_jnative.sh
-sed -i "s@-Werror@-Werror -Wno-return-local-add@" make2/build_libj.sh
-sed -i "s@-Werror@-Werror -Wno-return-local-add@" make2/build_tsdll.sh
-sed -i "s@-Werror@-Werror -Wno-return-local-add@" make2/build_jconsole.sh
-cd ${srcdir}/qtide-master
-sed -i "s@#include <QPainter>@#include <QPainter>\n#include <QPainterPath>@" lib/wd/isigraph2.h
+ cd "${srcdir}/${pkgname}"
+ echo '#define jversion "903"' > jsrc/jversion.h
+ echo '#define jplatform "linux"' >> jsrc/jversion.h
+ echo '#define jtype "beta"' >> jsrc/jversion.h
+ echo '#define jlicense "GPL3"' >> jsrc/jversion.h
+ echo '#define jbuilder "AUR"' >> jsrc/jversion.h
}
build() {
-# jsource
-cd ${srcdir}/jsource-master
-make2/build_all.sh
-make2/cpbin.sh
-# qtide
-cd ${srcdir}/qtide-master/lib
-qmake && make
-cd ${srcdir}/qtide-master/main
-qmake && make
+ # jsource
+ cd "${srcdir}/${pkgname}/make2"
+ CC=clang
+ export CC
+ . build_all.sh
+ . cpbin.sh
+ # qtide
+ cd "${srcdir}/qtide-git/lib"
+ qmake && make
+ cd "${srcdir}/qtide-git/main"
+ qmake && make
}
package() {
-cd ${srcdir}
-cp -a jenv/* ${pkgdir}/
-cp -a jsource-master/jlibrary/bin/jconsole ${pkgdir}/usr/lib/j9/bin/jconsole
-cp -a jsource-master/jlibrary/bin/libj.so ${pkgdir}/usr/lib/j9/bin/libj.so
-cp -a jsource-master/jlibrary/bin/libtsdll.so ${pkgdir}/usr/lib/j9/bin/libtsdll.so
-cp -a qtide-master/bin/linux-x86_64/release/* ${pkgdir}/usr/lib/j9/bin/
-echo "${pkgname}-${pkgver}-${pkgrel}-${CARCH}.pkg.tar.xz (Arch Linux package)" > ${pkgdir}/usr/lib/j9/bin/installer.txt
+ cd "${srcdir}"
+ cp -a jenv/* "${pkgdir}/"
+ cp -a "${pkgname}/jlibrary/bin/"* "${pkgdir}/usr/lib/j9/bin/"
+ cp -a "${pkgname}/bin/linux/"*/* "${pkgdir}/usr/lib/j9/bin/"
+ cp -a "qtide-git/bin/linux-${CARCH}/release/"* "${pkgdir}/usr/lib/j9/bin/"
+ echo "${pkgname}-${pkgver}-${pkgrel}-${CARCH}.pkg.tar.xz (Arch Linux package)" > "${pkgdir}/usr/lib/j9/bin/installer.txt"
}