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

1 files changed, 3 insertions, 32 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 7f5a1531154e..c6c5dc4f58a5 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')