support R 2.10 and greater again

shogun-toolbox · Jul 2, 2012 · df76374 · df76374
1 parent 053bdde
commit df76374
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/src/.r-install.sh b/src/.r-install.sh
@@ -5,7 +5,6 @@ DATE=`head -n 1 ../../NEWS | cut -f 1 -d ' '`
 RVERSION=`R --slave -e "with(R.version, cat(sprintf('%s.%s', major, minor)))"`
 PLATFORM=`R --slave -e "cat(R.version\\$platform)"`
 OSTYPE=`R --slave -e "cat(.Platform\\$OS.type)"`
-#OSTYPE="`uname -o`"
 DATE="`date '+%Y-%m-%d %H:%M:%S'`"
 PKGFILE="$1/$2/Meta/package.rds"
 
@@ -16,7 +15,7 @@ Date: $DATE
 Title: The SHOGUN Machine Learning Toolbox
 Author: Soeren Sonnenburg, Gunnar Raetsch
 Maintainer: Soeren Sonnenburg <sonne@debian.org>
-Depends: R (>= 2.13.0)
+Depends: R (>= 2.10.0)
 Suggests:
 Description: SHOGUN - is a new machine learning toolbox with focus on large
         scale kernel methods and especially on Support Vector Machines (SVM) with focus
@@ -53,7 +52,7 @@ echo "x=structure(list(DESCRIPTION = c(Package='$2',\
 		Suggests = list(),\
 		Imports = list()),\
 		class = 'packageDescription2');\
-		saveRDS(x, \"$PKGFILE\")" | R --no-save
+		$SAVERDS(x, \"$PKGFILE\")" | R --no-save
 
 # R STATIC
 if test "$2" = "sg" || test "$2" = "elwms"

diff --git a/src/Makefile.template b/src/Makefile.template
@@ -217,7 +217,7 @@ install-r_static: $(TEMPLATE_TARGET)
 	install -d -m755 $(DESTDIR)$(RDIR)/sg/R
 	install -m755 $(TEMPLATE_TARGET) $(DESTDIR)$(RDIR)/sg/libs
 	install -m644 $(CONFIGPATH)/../examples/documented/r_static/*.R $(CONFIGPATH)/../examples/documented/r_static/graphical/*.R $(DESTDIR)$(RDIR)/sg/demo
-	$(CONFIGPATH)/.r-install.sh $(DESTDIR)$(RDIR) sg $(EXT_LIB)
+	$(CONFIGPATH)/.r-install.sh $(DESTDIR)$(RDIR) sg $(EXT_LIB) $(SAVERDS)
 
 install-elwms_static: $(TEMPLATE_TARGET)
 	#one .so file

diff --git a/src/configure b/src/configure
@@ -4488,7 +4488,16 @@ test_r()
 		echocheck "R"
 		if ( echo 'version; quit()' | R --no-save ) >/dev/null 2>&1
 		then
-			echores "`echo 'version; quit()' | R  --no-save 2>&1 | grep version\.string | cut -f 4 -d ' '`"
+			r_version="`echo 'version; quit()' | R  --no-save 2>&1 | grep version\.string | cut -f 4 -d ' '`"
+			echores "$r_version"
+			assert_version "R" "$_r" "$r_version" "2.10"
+
+			SAVERDS=".saveRDS"
+			if assert_version "R" "no" "$r_version" "2.13"
+			then
+				SAVERDS="saveRDS"
+			fi
+
 			test -n "$_rdir" || _rdir=`echo '.libPaths()[1]' | R --no-save 2>/dev/null | grep '^\[1\]' | cut -f 2 -d '"'`
 			if cygwin
 			then
@@ -4838,7 +4847,8 @@ INCLUDES_R_MODULAR		= ${INCLUDES_R}
 PRELINKFLAGS_R_MODULAR	= ${PRELINKFLAGS_R}
 LINKFLAGS_R_MODULAR 	= ${LINKFLAGS_R}
 POSTLINKFLAGS_R_MODULAR	= ${POSTLINKFLAGS_R}
-SWIGFLAGS_R_MODULAR = ${SWIGFLAGS_R_MODULAR}
+SWIGFLAGS_R_MODULAR		= ${SWIGFLAGS_R_MODULAR}
+SAVERDS					= ${SAVERDS}
 
 PRE_LIB_SWIG_PYTHON_MODULAR	= ${PRE_LIB_SWIG_PYTHON_MODULAR}
 EXT_LIB_SWIG_PYTHON_MODULAR	= ${EXT_LIB_SWIG_PYTHON_MODULAR}