[Rcpp-commits] r4146 - in pkg/Rcpp: . R

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

Author: jjallaire
Date: 2012-12-11 15:04:58 +0100 (Tue, 11 Dec 2012)
New Revision: 4146

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/R/Attributes.R
Log:
always print output when shared library is not created

Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2012-12-11 11:44:22 UTC (rev 4145)
+++ pkg/Rcpp/ChangeLog	2012-12-11 14:04:58 UTC (rev 4146)
@@ -1,3 +1,7 @@
+2012-12-11  JJ Allaire <jj at rstudio.org>
+      
+        * R/Attributes.R: always print output when shared library is not created
+
 2012-12-11 Romain Francois <romain at r-enthusiasts.com>
 
         * include/Rcpp/String.h: missing operator +=( const StringProxy& )

Modified: pkg/Rcpp/R/Attributes.R
===================================================================
--- pkg/Rcpp/R/Attributes.R	2012-12-11 11:44:22 UTC (rev 4145)
+++ pkg/Rcpp/R/Attributes.R	2012-12-11 14:04:58 UTC (rev 4146)
@@ -111,6 +111,10 @@
                 cat(result, "\n")
                 succeeded <- FALSE
                 stop("Error ", status, " occurred building shared library.")
+            } else if (!file.exists(context$dynlibFilename)) {
+                cat(result, "\n")
+                succeeded <- FALSE
+                stop("Error occurred building shared library.")
             } else {
                 succeeded <- TRUE
             }
@@ -333,7 +337,7 @@
         "\n--------------------------------------------------------\n")
     cat(context$generatedCpp, sep="")
     
-    cat("\nGenerated R .Call bindings",
+    cat("\nGenerated R functions",
         "\n-------------------------------------------------------\n\n")
     cat(readLines(file.path(context$buildDirectory, 
                             context$rSourceFilename)),