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

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

Author: jeroenooms
Date: 2014-01-12 21:40:24 +0100 (Sun, 12 Jan 2014)
New Revision: 753

Added:
   pkg/configure.win.readme
Modified:
   pkg/DESCRIPTION
   pkg/configure.win
   pkg/src/Makevars.win
Log:
changes for CRAN win builder

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2014-01-12 19:28:26 UTC (rev 752)
+++ pkg/DESCRIPTION	2014-01-12 20:40:24 UTC (rev 753)
@@ -1,5 +1,5 @@
 Package: RProtoBuf
-Version: 0.3.2.4
+Version: 0.3.2.5
 Date: $Date$
 Author: Romain Francois, Dirk Eddelbuettel, Murray Stokely and Jeroen Ooms
 Maintainer: Dirk Eddelbuettel <edd at debian.org>

Modified: pkg/configure.win
===================================================================
--- pkg/configure.win	2014-01-12 19:28:26 UTC (rev 752)
+++ pkg/configure.win	2014-01-12 20:40:24 UTC (rev 753)
@@ -1,7 +0,0 @@
-# Uncomment this to build on machines where the headers/lib are not installed
-# on the machine already. 
-#
-#
-# "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e '
-# download.file("http://www.stat.ucla.edu/~jeroen/files/protobuf-2.5.0-windows.zip", "lib.zip");
-# unzip("lib.zip");'

Added: pkg/configure.win.readme
===================================================================
--- pkg/configure.win.readme	                        (rev 0)
+++ pkg/configure.win.readme	2014-01-12 20:40:24 UTC (rev 753)
@@ -0,0 +1,7 @@
+# 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-12 19:28:26 UTC (rev 752)
+++ pkg/src/Makevars.win	2014-01-12 20:40:24 UTC (rev 753)
@@ -1,7 +1,7 @@
 # -*- mode: Makefile -*-
 ##
 ## On the CRAN windows builder, the heades and library are installed in
-## a directory ${LIB_PROTOBUF}. On other machines, the configure.win file
+## a directory ${LIB_PROTOBUF}. On other machines, the configure.win.readme
 ## contains instructions for getting these files.
 ##
 ## Note that mingw64 4.8.1 had an issue that results in ld reading