[Rinside-commits] r254 - in pkg: . inst src

[noreply at r-forge.r-project.org]

Author: edd
Date: 2012-09-07 05:11:28 +0200 (Fri, 07 Sep 2012)
New Revision: 254

Modified:
   pkg/.Rbuildignore
   pkg/ChangeLog
   pkg/inst/NEWS.Rd
   pkg/src/Makevars
   pkg/src/Makevars.win
   pkg/src/RInside.cpp
Log:
more last minute robustification for build process before releasing 0.2.8


Modified: pkg/.Rbuildignore
===================================================================
--- pkg/.Rbuildignore	2012-09-07 01:14:04 UTC (rev 253)
+++ pkg/.Rbuildignore	2012-09-07 03:11:28 UTC (rev 254)
@@ -11,3 +11,7 @@
 inst/examples/wt/run.sh
 configure
 configure.win
+src/RInsideAutoloads.h
+src/RInsideEnvVars.h
+inst/include/RInsideAutoloads.h
+inst/include/RInsideEnvVars.h

Modified: pkg/ChangeLog
===================================================================
--- pkg/ChangeLog	2012-09-07 01:14:04 UTC (rev 253)
+++ pkg/ChangeLog	2012-09-07 03:11:28 UTC (rev 254)
@@ -2,6 +2,10 @@
 
 	* DESCRIPTION: Release 0.2.8
 
+	* src/RInside.cpp: Include local headers from src/
+	* src/Makevars{.win}: Declare explicit dependency on headers for
+	RInside.cpp
+
 2012-09-05  Dirk Eddelbuettel  <edd at debian.org>
 
 	* src/Makevars: Updating required headers here now

Modified: pkg/inst/NEWS.Rd
===================================================================
--- pkg/inst/NEWS.Rd	2012-09-07 01:14:04 UTC (rev 253)
+++ pkg/inst/NEWS.Rd	2012-09-07 03:11:28 UTC (rev 254)
@@ -9,7 +9,8 @@
     \item Corrected Windows package build to always generate a 64 bit
     static library too
     \item Updated package build to no longer require configure{.win} to
-    update the two header file supplying compile-time information
+    update the two header file supplying compile-time information;
+    tightened build dependencies on headers in Makevars
     \item Improved examples/standard/Makefile.win by detecting architecture
   }
 }

Modified: pkg/src/Makevars
===================================================================
--- pkg/src/Makevars	2012-09-07 01:14:04 UTC (rev 253)
+++ pkg/src/Makevars	2012-09-07 03:11:28 UTC (rev 254)
@@ -21,15 +21,21 @@
 USERLIBST=libRInside.a
 USERDIR=../inst/lib
 
-PKG_CPPFLAGS += -I../inst/include/
+PKG_CPPFLAGS += -I. -I../inst/include/
 PKG_LIBS = `$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()"`
 
 all:	headers $(SHLIB) userLibrary
 
-headers:
-	${R_HOME}/bin/Rscript tools/RInsideAutoloads.r > ../inst/include/RInsideAutoloads.h
-	${R_HOME}/bin/Rscript tools/RInsideEnvVars.r   > ../inst/include/RInsideEnvVars.h
+headers: RInsideAutoloads.h RInsideEnvVars.h
 
+RInsideAutoloads.h:
+	${R_HOME}/bin/Rscript tools/RInsideAutoloads.r > RInsideAutoloads.h
+
+RInsideEnvVars.h:
+	${R_HOME}/bin/Rscript tools/RInsideEnvVars.r   > RInsideEnvVars.h
+
+RInside.cpp: headers
+
 userLibrary: $(USERLIB) $(USERLIBST)
 	- at if test ! -e $(USERDIR)$(R_ARCH); then mkdir -p $(USERDIR)$(R_ARCH); fi
 	cp $(USERLIB) $(USERDIR)$(R_ARCH)

Modified: pkg/src/Makevars.win
===================================================================
--- pkg/src/Makevars.win	2012-09-07 01:14:04 UTC (rev 253)
+++ pkg/src/Makevars.win	2012-09-07 03:11:28 UTC (rev 254)
@@ -26,10 +26,16 @@
 
 all:	headers $(SHLIB) userLibrary
 
-headers:
-	${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe tools/RInsideAutoloads.r > ../inst/include/RInsideAutoloads.h
-	${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe tools/RInsideEnvVars.r   > ../inst/include/RInsideEnvVars.h
+headers: RInsideAutoloads.h RInsideEnvVars.h
 
+RInsideAutoloads.h:
+	${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe tools/RInsideAutoloads.r > RInsideAutoloads.h
+
+RInsideEnvVars.h:
+	${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe tools/RInsideEnvVars.r   > RInsideEnvVars.h
+
+RInside.cpp: headers
+
 userLibrary: $(USERLIBST) $(USERLIB)
 	- at if test ! -e $(USERDIR)$(R_ARCH); then mkdir -p $(USERDIR)$(R_ARCH); fi
 	cp $(USERLIB) $(USERDIR)$(R_ARCH)

Modified: pkg/src/RInside.cpp
===================================================================
--- pkg/src/RInside.cpp	2012-09-07 01:14:04 UTC (rev 253)
+++ pkg/src/RInside.cpp	2012-09-07 03:11:28 UTC (rev 254)
@@ -117,8 +117,8 @@
 
     verbose_m = false;          // Default is false
 
-    // generated as littler.h via from svn/littler/littler.R
-    #include <RInsideEnvVars.h>
+    // generated from Makevars{.win}
+    #include "RInsideEnvVars.h"
 
     for (int i = 0; R_VARS[i] != NULL; i+= 2) {
         if (getenv(R_VARS[i]) == NULL) { // if env variable is not yet set
@@ -216,7 +216,7 @@
 
 void RInside::autoloads() {
 
-    #include <RInsideAutoloads.h>
+    #include "RInsideAutoloads.h"
 
     // Autoload default packages and names from autoloads.h
     //