[Rcpp-commits] r662 - pkg pkg/inst scripts

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

Author: edd
Date: 2010-02-12 05:16:23 +0100 (Fri, 12 Feb 2010)
New Revision: 662

Modified:
   pkg/NEWS
   pkg/inst/ChangeLog
   scripts/runBuild.sh
Log:
a few minor updates


Modified: pkg/NEWS
===================================================================
--- pkg/NEWS	2010-02-11 10:20:57 UTC (rev 661)
+++ pkg/NEWS	2010-02-12 04:16:23 UTC (rev 662)
@@ -1,4 +1,7 @@
+0.7.6   (under development)
 
+    o   Restore Windows build; successfully tested on 32 and 64 bit
+
 0.7.5	2010-02-08
 
     o 	wrap has been much improved. wrappable types now are :

Modified: pkg/inst/ChangeLog
===================================================================
--- pkg/inst/ChangeLog	2010-02-11 10:20:57 UTC (rev 661)
+++ pkg/inst/ChangeLog	2010-02-12 04:16:23 UTC (rev 662)
@@ -1,28 +1,28 @@
 2010-02-10  Romain Francois <romain at r-enthusiasts.com>
 
-	* src/Rcpp/SEXP_Vector.h: SEXP_Vector (and therefore 
-	ExpressionVector and GenericVector, a.k.a List) gain 
-	methods push_front, push_back and insert that are templated and 
+	* src/Rcpp/SEXP_Vector.h: SEXP_Vector (and therefore
+	ExpressionVector and GenericVector, a.k.a List) gain
+	methods push_front, push_back and insert that are templated and
 	use the 'implicit wrap idiom' to add an element to the front
-	or, the back or an arbitrary (valid) position of the list, 
-	pushing other elements. Internally the SEXP is actually copied. 
+	or, the back or an arbitrary (valid) position of the list,
+	pushing other elements. Internally the SEXP is actually copied.
 
 	* src/Rcpp/SEXP_Vector.h: SEXP_Vector gains an erase method
 	modelled after std::vector<>::erase to remove elements from
 	a list. erase has a single iterator (or int) form that removes
-	one element, and a range based version 
+	one element, and a range based version
 	erase(iterator first, iterator last) that erases all elements
-	between first and last. 
-	
-	* src/Rcpp/VectorBase.h: VectorBase gains a version of 
+	between first and last.
+
+	* src/Rcpp/VectorBase.h: VectorBase gains a version of
 	offset to support retrieving the offset of a given name of a
 	vector: offset( const std::string& name)
-	
+
 	* src/Rcpp/SimpleVector.h : uses the new offset to perform
 	names based indexing (FR #808)
 	* src/Rcpp/SEXP_Vector.h: same
 	* src/Rcpp/CharacterVector.h: same
-	
+
 	* inst/unitTests/runit.GenericVector.R: unit tests for names
 	based indexing
 	* inst/unitTests/runit.IntegerVector.R: same
@@ -37,13 +37,13 @@
 
 	* src/Rcpp/SEXP_Vector.h: The functionality of SEXP_Vector
 	that was independent of the template parameter was factored out
-	into a new base class SEXP_Vector_Base. This follows the advice 
+	into a new base class SEXP_Vector_Base. This follows the advice
 	of item 44 of Effective C++.
-	
+
 	* src/Rcpp/SEXP_Vector.h: SEXP_Vector_Base::iterator is introduced
-	as well as methods begin() and end() to support use of stl 
+	as well as methods begin() and end() to support use of stl
 	algorithms on lists.
-	
+
 	* inst/unitTests/runit.GenericVector.R: new unit test for
 	testing SEXP_Vector_Base::iterator and illustrating a c++
 	version of lapply using std::transform

Modified: scripts/runBuild.sh
===================================================================
--- scripts/runBuild.sh	2010-02-11 10:20:57 UTC (rev 661)
+++ scripts/runBuild.sh	2010-02-12 04:16:23 UTC (rev 662)
@@ -1,4 +1,11 @@
 #!/bin/sh
 
+version=$(r -e'cat(as.character(read.dcf("pkg/DESCRIPTION")[,"Version"]))')
+echo "Working on version $version"
+
 export RCPP_CXX0X="yes"
-R CMD build --force pkg
\ No newline at end of file
+R CMD build --force pkg
+
+test -d tarballs    && cp -vax Rcpp_${version}.tar.gz tarballs/rcpp_${version}.orig.tar.gz
+test -d build-aread && cp -vax Rcpp_${version}.tar.gz build-area/rcpp_${version}.orig.tar.gz
+