[Rinside-commits] r249 - in pkg: . inst inst/examples/standard src
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Wed Sep 5 16:35:10 CEST 2012
Author: edd
Date: 2012-09-05 16:35:10 +0200 (Wed, 05 Sep 2012)
New Revision: 249
Modified:
pkg/.Rbuildignore
pkg/ChangeLog
pkg/DESCRIPTION
pkg/inst/NEWS.Rd
pkg/inst/examples/standard/Makefile.win
pkg/src/Makevars
pkg/src/Makevars.win
Log:
changes prompted by rcpp-devel discussion on Windows builds issue leading to better default builds on Windows and for the examples
also got rid of configure{.win} by altering the main src/Makevars{.win}
Modified: pkg/.Rbuildignore
===================================================================
--- pkg/.Rbuildignore 2012-08-19 20:02:11 UTC (rev 248)
+++ pkg/.Rbuildignore 2012-09-05 14:35:10 UTC (rev 249)
@@ -9,3 +9,5 @@
inst/examples/qt/moc_qtdensity.cpp
inst/examples/wt/extkitchen.css
inst/examples/wt/run.sh
+configure
+configure.win
Modified: pkg/ChangeLog
===================================================================
--- pkg/ChangeLog 2012-08-19 20:02:11 UTC (rev 248)
+++ pkg/ChangeLog 2012-09-05 14:35:10 UTC (rev 249)
@@ -1,3 +1,16 @@
+2012-09-05 Dirk Eddelbuettel <edd at debian.org>
+
+ * src/Makevars: Updating required headers here now
+ * src/Makevars.win: Updating required headers here now
+ * configure: Deprecated, no longer used or installed
+ * configure.win: Deprecated, no longer used or installed
+ * inst/examples/standard/Makefile.win: R_ARCH autodetection
+
+2012-09-04 Dirk Eddelbuettel <edd at debian.org>
+
+ * src/Makevars.win: Ensure static library is copied to target on both
+ architectures
+
2012-08-19 Dirk Eddelbuettel <edd at debian.org>
* inst/examples/eigen/cmake/CMakeLists.txt: Added a second patch by
Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION 2012-08-19 20:02:11 UTC (rev 248)
+++ pkg/DESCRIPTION 2012-09-05 14:35:10 UTC (rev 249)
@@ -1,6 +1,6 @@
Package: RInside
Title: C++ classes to embed R in C++ applications
-Version: 0.2.7
+Version: 0.2.7.1
Date: $Date$
Author: Dirk Eddelbuettel and Romain Francois
Maintainer: Dirk Eddelbuettel <edd at debian.org>
Modified: pkg/inst/NEWS.Rd
===================================================================
--- pkg/inst/NEWS.Rd 2012-08-19 20:02:11 UTC (rev 248)
+++ pkg/inst/NEWS.Rd 2012-09-05 14:35:10 UTC (rev 249)
@@ -6,7 +6,11 @@
\itemize{
\item Added CMake build support for armadillo and eigen examples,
once again kindly contributed by Peter Aberline
- }
+ \item Corrected Windows package build to always generated 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
+ }
}
\section{Changes in RInside version 0.2.7 (2012-08-12)}{
\itemize{
Modified: pkg/inst/examples/standard/Makefile.win
===================================================================
--- pkg/inst/examples/standard/Makefile.win 2012-08-19 20:02:11 UTC (rev 248)
+++ pkg/inst/examples/standard/Makefile.win 2012-09-05 14:35:10 UTC (rev 249)
@@ -8,8 +8,10 @@
R_HOME := $(shell R RHOME | sed -e "s|\\\\|\/|g")
## You may have to set this to one of the two values to enforce a particular architecture
-#R_ARCH := --arch i386
-#R_ARCH := --arch x64
+## in case the autodetection in the next line does not work
+R_ARCH := --arch $(shell echo 'cat(.Platform$$r_arch)' | R --vanilla --slave)
+##R_ARCH := --arch i386
+##R_ARCH := --arch x64
## You may need to set R_LIBS_USER if Rcpp or RInside are installed where R does not see them by default
#R_LIBS_USER := "C:/myRstuff/library"
Modified: pkg/src/Makevars
===================================================================
--- pkg/src/Makevars 2012-08-19 20:02:11 UTC (rev 248)
+++ pkg/src/Makevars 2012-09-05 14:35:10 UTC (rev 249)
@@ -1,6 +1,6 @@
## -*- mode: Makefile; tab-width: 8 -*-
##
-## Copyright (C) 2010 Dirk Eddelbuettel and Romain Francois
+## Copyright (C) 2010 - 2012 Dirk Eddelbuettel and Romain Francois
##
## This file is part of RInside.
##
@@ -24,8 +24,12 @@
PKG_CPPFLAGS += -I../inst/include/
PKG_LIBS = `$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()"`
-all: $(SHLIB) userLibrary
+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
+
userLibrary: $(USERLIB) $(USERLIBST)
- at if test ! -e $(USERDIR)$(R_ARCH); then mkdir -p $(USERDIR)$(R_ARCH); fi
cp $(USERLIB) $(USERDIR)$(R_ARCH)
@@ -39,9 +43,9 @@
$(USERLIBST): $(OBJECTS)
$(AR) qc $(USERLIBST) $^
@if test -n "$(RANLIB)"; then $(RANLIB) $(USERLIBST); fi
-
-.PHONY: all clean userLibrary
+.PHONY: all clean userLibrary headers
+
clean:
rm -f $(OBJECTS) $(SHLIB) $(USERLIB) $(USERLIBST)
Modified: pkg/src/Makevars.win
===================================================================
--- pkg/src/Makevars.win 2012-08-19 20:02:11 UTC (rev 248)
+++ pkg/src/Makevars.win 2012-09-05 14:35:10 UTC (rev 249)
@@ -1,6 +1,6 @@
## -*- mode: Makefile; tab-width: 8 -*-
##
-## Copyright (C) 2010 Dirk Eddelbuettel and Romain Francois
+## Copyright (C) 2010 - 2012 Dirk Eddelbuettel and Romain Francois
##
## This file is part of RInside.
##
@@ -24,22 +24,28 @@
PKG_CPPFLAGS += -I../inst/include/
PKG_LIBS = $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()")
-all: $(SHLIB) userLibrary
+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
+
userLibrary: $(USERLIBST) $(USERLIB)
- at if test ! -e $(USERDIR)$(R_ARCH); then mkdir -p $(USERDIR)$(R_ARCH); fi
cp $(USERLIB) $(USERDIR)$(R_ARCH)
- cp $(USERLIBST) $(USERDIR)$(R_ARCH)
- rm $(USERLIBST)
+# cp $(USERLIBST) $(USERDIR)$(R_ARCH)
+# rm $(USERLIBST)
$(USERLIBST): $(OBJECTS)
+ - at if test ! -e $(USERDIR)$(R_ARCH); then mkdir -p $(USERDIR)$(R_ARCH); fi
$(AR) qc $(USERLIBST) $^
@if test -n "$(RANLIB)"; then $(RANLIB) $(USERLIBST); fi
+ cp $(USERLIBST) $(USERDIR)$(R_ARCH)
$(USERLIB): $(OBJECTS)
$(CXX) -Wl,--export-all-symbols -shared -o $(USERLIB) $^ $(ALL_LIBS) -lws2_32
-.PHONY: all clean userLibrary
+.PHONY: all clean userLibrary headers
clean:
rm -f $(OBJECTS) $(SHLIB) $(USERLIBST) $(USERLIB)
More information about the Rinside-commits
mailing list