Update to 8.04.15 (main update)

2 files changed, 42 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a355723e5272..f7d7212ebae7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue Jan  5 18:30:44 UTC 2016
+# Tue Jan 19 20:54:29 UTC 2016
 pkgbase = j8-git
 	pkgdesc = J is a modern, high-level, general-purpose, high-performance programming language
-	pkgver = 1.4.9
+	pkgver = 8.04.15.20160119
 	pkgrel = 1
 	url = http://www.jsoftware.com
 	arch = i686
@@ -15,10 +15,12 @@ pkgbase = j8-git
 	depends = qt5-webengine
 	depends = wget
 	depends = pcre
-	source = http://www.jsoftware.com/gitlist/qtide.git/zipball/master
-	source = http://www.databaserossoverde.it/jsoftware/j804_env_20160104.tar.gz
+	source = jsource.zip::http://www.jsoftware.com/gitlist/jsource.git/zipball/master
+	source = qtide.zip::http://www.jsoftware.com/gitlist/qtide.git/zipball/master
+	source = http://www.databaserossoverde.it/jsoftware/j804_env_20160119.tar.gz
 	md5sums = SKIP
-	md5sums = 11533fc6defe5550f44d01989afec4a4
+	md5sums = SKIP
+	md5sums = 7e9b1bc11404f8c4e5b3db501f83f52e
 
 pkgname = j8-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 4651624e8aa4..e4c887320bba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,63 @@
-# Contributor: Lorenzo Tomei <tomeil@tiscali.it>
+# Maintainer: Lorenzo Tomei <tomeil@tiscali.it>
 
 pkgname=j8-git
-pkgver=1.4.9
+pkgver=8.04.15.20160119
 pkgrel=1
 pkgdesc='J is a modern, high-level, general-purpose, high-performance programming language'
 arch=('i686' 'x86_64')
 url='http://www.jsoftware.com'
 license=('GPL3'  'LGPL')
 depends=('ncurses' 'qt5-tools' 'qt5-websockets' 'qt5-webengine' 'wget' 'pcre')
-source=('http://www.jsoftware.com/gitlist/qtide.git/zipball/master' 'http://www.databaserossoverde.it/jsoftware/j804_env_20160104.tar.gz')
-md5sums=('SKIP' '11533fc6defe5550f44d01989afec4a4')
+source=('jsource.zip::http://www.jsoftware.com/gitlist/jsource.git/zipball/master' 'qtide.zip::http://www.jsoftware.com/gitlist/qtide.git/zipball/master' 'http://www.databaserossoverde.it/jsoftware/j804_env_20160119.tar.gz')
+md5sums=('SKIP' 'SKIP' '7e9b1bc11404f8c4e5b3db501f83f52e')
 if [ "${CARCH}" = x86_64 ]; then
 _xarch=x86_64
-_noarch=i686
+_jarch=j64
 else
 _xarch=x86
-_noarch=x86_64
+_jarch=j32
 fi
 
 pkgver() {
-_version=$(sed -n -e 2p "${srcdir}"/lib/lib.pro)
-echo ${_version:10}
+cd "${srcdir}"
+echo "$(head -c 7 jenv/usr/lib/j8/system/config/version.txt)"."$(date +%Y%m%d)"
+} 
+
+prepare() {
+cd "${srcdir}"
+echo '#define jversion "804"' > 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@jgit=~/gitdev/jsource@jgit=${srcdir}@" make/jvars.sh
+sed -i "s@jbld=~/jbld@jbld=${srcdir}/jbld@" make/jvars.sh
+sed -i "s@cd ~@cd ${srcdir}@" make/build_jconsole.sh
+sed -i "s@cd ~@cd ${srcdir}@" make/build_libj.sh
+sed -i "s@cd ~@cd ${srcdir}@" make/domake.sh
+cp make/jvars.sh ./
 }
 
 build() {
-cd "${srcdir}"/lib
+# jsource
+cd "${srcdir}"
+rm -rf "${srcdir}/jbld"
+mkdir -p "${srcdir}/jbld/jout"
+mkdir "${srcdir}/jbld/${_jarch}"
+cp -r "${srcdir}"/jlibrary/* "${srcdir}/jbld/${_jarch}"
+"${srcdir}"/make/build_jconsole.sh "${_jarch}"
+"${srcdir}"/make/build_libj.sh "${_jarch}"
+# qtide
+cd "${srcdir}/lib"
 qmake && make
-cd "${srcdir}"/main
+cd "${srcdir}/main"
 qmake && make
 }
 
 package() {
 cd "${srcdir}"
 cp -a jenv/* "${pkgdir}"/
-mv "${pkgdir}"/usr/lib/j8/bin/"${CARCH}"/* "${pkgdir}"/usr/lib/j8/bin/
-rm -d "${pkgdir}"/usr/lib/j8/bin/"${CARCH}"
-rm -r "${pkgdir}"/usr/lib/j8/bin/"${_noarch}"
+cp -a jbld/"${_jarch}"/bin/{jconsole,libj.so} "${pkgdir}"/usr/lib/j8/bin/
 cp -a bin/linux-"${_xarch}"/release/*  "${pkgdir}"/usr/lib/j8/bin/
 echo "${pkgname}-${pkgver}-${pkgrel}-${CARCH}.pkg.tar.xz (Arch Linux package)" > ${pkgdir}/usr/lib/j8/bin/installer.txt
 chown -R nobody:nobody "${pkgdir}"/srv/j8