[Rprotobuf-commits] r794 - in pkg: . src

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

Author: edd
Date: 2014-01-18 05:17:12 +0100 (Sat, 18 Jan 2014)
New Revision: 794

Removed:
   pkg/configure.win.readme
Modified:
   pkg/DESCRIPTION
   pkg/src/Makevars.win
Log:
set version to 0.4.0 and move content of configure.win.readme into src/Makevars.win


Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2014-01-15 05:32:08 UTC (rev 793)
+++ pkg/DESCRIPTION	2014-01-18 04:17:12 UTC (rev 794)
@@ -1,5 +1,5 @@
 Package: RProtoBuf
-Version: 0.4
+Version: 0.4.0
 Date: $Date$
 Author: Romain Francois, Dirk Eddelbuettel, Murray Stokely and Jeroen Ooms
 Maintainer: Dirk Eddelbuettel <edd at debian.org>

Deleted: pkg/configure.win.readme
===================================================================
--- pkg/configure.win.readme	2014-01-15 05:32:08 UTC (rev 793)
+++ pkg/configure.win.readme	2014-01-18 04:17:12 UTC (rev 794)
@@ -1,7 +0,0 @@
-# Rename this file to configure.win to build on machines where the 
-# headers/lib are not installed on the machine already. Make sure to
-# use R CMD INSTALL --force-biarch 
-#
-"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e '
-download.file("http://r-forge.r-project.org/scm/viewvc.php/*checkout*/windows/protobuf-2.5.0-windows.zip?root=rprotobuf", "lib.zip");
-unzip("lib.zip");'

Modified: pkg/src/Makevars.win
===================================================================
--- pkg/src/Makevars.win	2014-01-15 05:32:08 UTC (rev 793)
+++ pkg/src/Makevars.win	2014-01-18 04:17:12 UTC (rev 794)
@@ -12,3 +12,8 @@
 RCPP_LDFLAGS= $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()")
 PKG_CPPFLAGS=-I${LIB_PROTOBUF}/include -I../protobuf-2.5.0/include
 PKG_LIBS=$(RCPP_LDFLAGS) -L${LIB_PROTOBUF}/lib${R_ARCH} -L../protobuf-2.5.0/lib${R_ARCH} -lprotobuf
+
+## In case the headers and library are not installed, excute the following bit
+## of R code, and make sure to # use R CMD INSTALL --force-biarch 
+##
+##  "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e 'download.file("http://r-forge.r-project.org/scm/viewvc.php/*checkout*/windows/protobuf-2.5.0-windows.zip?root=rprotobuf", "lib.zip"); unzip("lib.zip");'