summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2016-04-08 09:18:37 +0200
committerChristoph Helma <helma@in-silico.ch>2016-04-08 09:18:37 +0200
commitb85e6d6b503b40d9448ff6857523271558780434 (patch)
treee5e18848cf862b33a8df8738c646e3f455f43a02
parent063acd4dc63e9287287cc1ff78fff2064ff74e4f (diff)
parent024c08f3adaa384577fdc6fd2fe9de71beea5814 (diff)
Merge branch 'development' into nano
-rw-r--r--VERSION2
-rw-r--r--ext/lazar/extconf.rb3
2 files changed, 4 insertions, 1 deletions
diff --git a/VERSION b/VERSION
index f374f66..2003b63 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.9.1
+0.9.2
diff --git a/ext/lazar/extconf.rb b/ext/lazar/extconf.rb
index a577baa..0e607f3 100644
--- a/ext/lazar/extconf.rb
+++ b/ext/lazar/extconf.rb
@@ -19,6 +19,9 @@ FileUtils.mkdir_p File.join(main_dir,"bin") # for Rserve binary
rinstall = File.expand_path(File.join(File.dirname(__FILE__),"rinstall.R"))
puts `Rscript --vanilla #{rinstall} #{r_dir}`
+r_libs = Dir[File.join(r_dir,"*")].collect{|l| l.sub(r_dir, '').sub('/','')}.sort
+abort "Failed to install R packages." unless r_libs == ["caret","doMC","foreach","ggplot2","gridExtra","iterators","pls"].sort
+
# create a fake Makefile
File.open(File.join(File.dirname(__FILE__),"Makefile"),"w+") do |makefile|
makefile.puts "all:\n\ttrue\n\ninstall:\n\ttrue\n"