summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Martin2015-09-04 09:57:28 -0500
committerStephen Martin2015-12-05 15:59:33 -0600
commit67b3bbf794c13d16412101ba5fff0b86891e7e97 (patch)
treeb957f9e4fb17c7a4f97c41d0619f6090df80fc23
parent6d840189d5ae3ee01652f3d0d6996a45202b6b4f (diff)
downloadaur-67b3bbf794c13d16412101ba5fff0b86891e7e97.tar.gz
Updated build process
The JASP devs are removing the need for an included r bundle. Instead, they are calling to the system R library (/usr/lib/R/library) The devs are targeting debian and they host PPAs with the needed R packages to install into the system R library. Because arch does not really support the million r-cran-* packages, I am creating a standalone 'bundle' meant for jasp that includes all the needed packages, installed into the R system library. They will be named according to the cran packages. r-cran-WhateveR
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD35
-rw-r--r--rbundle.R16
3 files changed, 5 insertions, 51 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bcce037daab..b9174b5ad48 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -22,16 +22,15 @@ pkgbase = jasp-desktop-git
depends = qt5-svg
depends = tk
depends = curl
+ depends = jasp-rbundle
provides = jasp
provides = jasp-desktop
conflicts = jasp
conflicts = jasp-desktop
- source = jasp-desktop::git+https://github.com/jasp-stats/jasp-desktop.git#tag=v0.7.1.12
- source = rbundle.R
+ source = jasp-desktop::git+https://github.com/jasp-stats/jasp-desktop.git
source = jasp-desktop.svg
source = sem.patch
md5sums = SKIP
- md5sums = 85087ac1d6e0ffa885f4887c40985982
md5sums = bcaf403001283553bb63b72c268d0290
md5sums = 9e04c417faac1e36f7ddb9f8350620ab
diff --git a/PKGBUILD b/PKGBUILD
index 7f5a1531154..c6c5dc4f58a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,13 +8,12 @@ pkgdesc="JASP, a low fat alternative to SPSS, a delicious alternative to R."
arch=('any')
url="http://jasp-stats.org"
license=('AGPL3')
-depends=('qt5-base' 'r' 'libarchive' 'qt5-webkit' 'qt5-declarative' 'qt5-sensors' 'qt5-svg' 'tk' 'curl')
+depends=('qt5-base' 'r' 'libarchive' 'qt5-webkit' 'qt5-declarative' 'qt5-sensors' 'qt5-svg' 'tk' 'curl' 'jasp-rbundle')
makedepends=('git' 'qtchooser' 'r' 'gcc-fortran' 'boost')
provides=('jasp' 'jasp-desktop')
conflicts=('jasp' 'jasp-desktop')
install=('jasp-desktop-git.install')
-source=("$_pkgname::git+https://github.com/jasp-stats/$_pkgname.git#tag=v0.7.1.12"
- "rbundle.R"
+source=("$_pkgname::git+https://github.com/jasp-stats/$_pkgname.git"
"jasp-desktop.svg"
"sem.patch")
@@ -29,36 +28,9 @@ pkgver() {
prepare() {
cd $srcdir/$_pkgname
patch -p1 < $srcdir/sem.patch
- echo "Patching in the SEM feature. This feature is UNSUPPORTED by the developer currently"
mkdir -p $srcdir/$_buildname
cd $srcdir/$_buildname
- #Create new R bundle
- mkdir -p R/include
- _libraryPath=$srcdir/$_buildname/R/library
- if [ ! -e $srcdir/RBundle ]; then
- echo "Creating customized R bundle"
- echo "Copying R bin, etc, lib, modules, and base libs"
- cp -r /usr/lib/R/{bin,etc,lib,modules,library} R/
- rm R/bin/R
- ln -s $(which R) R/bin/R
- echo "Copying R headers"
- cp -r /usr/include/R/* R/include/
- echo "Installing JASP dependencies"
- Rscript $srcdir/rbundle.R $_libraryPath
-
- #Copy JASP to new R bundle for it to later compile
- echo "Installing JASP to bundle"
- R CMD INSTALL -l $srcdir/$_buildname/R/library/ $srcdir/$_pkgname/JASP-Engine/JASP
-
- ## Save new R bundle for future use
- echo "Creating R bundle backup for future compilation"
- cp -r R $srcdir/RBundle
- else
- echo "Restoring previously created R bundle"
- cp -r $srcdir/RBundle/* ./R
- fi
-
echo "Creating Makefile"
qmake PREFIX=/usr ../$_pkgname
}
@@ -72,7 +44,7 @@ package() {
#Install files
cd $srcdir/$_buildname
mkdir -p $pkgdir/usr/share/$_pkgname
- cp -r ./Help ./JASP ./JASPEngine ./Resources ./R $pkgdir/usr/share/$_pkgname/
+ cp -r ./Help ./JASP ./JASPEngine ./Resources $pkgdir/usr/share/$_pkgname/
#Install icon
mkdir -p $pkgdir/usr/share/pixmaps/
@@ -92,6 +64,5 @@ Categories=Science;
EOF
}
md5sums=('SKIP'
- '85087ac1d6e0ffa885f4887c40985982'
'bcaf403001283553bb63b72c268d0290'
'9e04c417faac1e36f7ddb9f8350620ab')
diff --git a/rbundle.R b/rbundle.R
deleted file mode 100644
index a988ff0ba0f..00000000000
--- a/rbundle.R
+++ /dev/null
@@ -1,16 +0,0 @@
-#Set repo to 0cloud
-options('repos' = 'http://cran.revolutionanalytics.com')
-
-#Grab library dir
-path <- commandArgs(trailingOnly = TRUE)
-print(path)
-
-.libPaths(new = path)
-
-#List of R packages to be installed
-libs <- c('BayesFactor','lme4','Rcpp','RInside','afex','base64','car','effects','qgraph','hypergeo','lavaan',
- 'logspline','lsmeans','plotrix','RJSONIO','semTools','vcd','vcdExtra','gnm')
-
-#They modified gnm
-
-install.packages(libs,path,'http://cran.us.r-project.org')