On 02/01/13 00:55, Branko Čibej wrote:
On 01.01.2013 22:17, Gabriela Gibson wrote:
Hi Brane and everyone here,

I've used configure and friends before, albeit in a much smaller
setting, so the territory looks familiar.

Googletest and virtual hosts also looks also like good tools to know
about -- I'll need some reading-in time, but I'm confident I can take
this project on.  Could you please send me the two test cases and I'll
have a go?

See:

subversion/bindings/cxxhl/tests/test_exception.cpp

A suggestion about dealing with Ggoogle Test: We have to build the GTest
libraries from source with the same compiler options as the rest of the
library, see

http://code.google.com/p/googletest/wiki/FAQ#Why_is_it_not_recommended_to_install_a_pre-compiled_copy_of_Goog

On Debian/Ubuntu Linux, "apt-get install libgtest-dev" will put the
sources in /usr/src/gtest and the headers in /usr/include/gtest. I
propose we make our configury do something similar to what we do with
SQLite amalgamation; e.g., get-deps.sh could download and unpack the
GTest sources into ./gtest, and configure could find them there unless
told to look elsewhere.

Windows will be a bit trickier, but if you can make it work on Linux,
that's quite good enough, so don't worry about Windows at this point.

-- Brane


Ok, patch for get-deps.sh attached.

I have a question on the compilation process though. Gtest has deprecated autoconf. The remaining options are to use cmake or our own target. Do you agree that a target in the Subversion Makefile is preferred?

[[[
Changes to get-deps.sh to download gtest

* get-deps.sh:
  (Variable definitions): Adds three "GTEST_*" variables to assist in
   downloading gtest sources
  (get_gtest): New function: Download, unzip and move gtest source.
  (get_deps): Check whether gtest is available
   Call get_gtest()  

Patch by: <gabriela.gib...@gmail.com>
]]]
Index: get-deps.sh
===================================================================
--- get-deps.sh	(revision 1427508)
+++ get-deps.sh	(working copy)
@@ -29,6 +29,9 @@ SERF=serf-1.1.1
 ZLIB=zlib-1.2.7
 SQLITE_VERSION=3.7.15.1
 SQLITE=sqlite-amalgamation-$(printf %d%02d%02d%02d $(echo $SQLITE_VERSION | sed -e 's/\./ /g'))
+GTEST_VERSION=1.6.0
+GTEST=gtest-${GTEST_VERSION}
+GTEST_URL=http://googletest.googlecode.com/files/
 
 HTTPD=httpd-2.4.3
 APR_ICONV=apr-iconv-1.2.1
@@ -103,11 +106,23 @@ get_sqlite() {
 
 }
 
+get_gtest() {
+    test -d $BASEDIR/gtest && return
+
+    cd $TEMPDIR
+    $HTTP_FETCH ${GTEST_URL}/${GTEST}.zip
+    cd $BASEDIR
+
+    unzip -q $TEMPDIR/$GTEST.zip
+
+    mv $GTEST gtest
+}
+
 # main()
 get_deps() {
     mkdir -p $TEMPDIR
 
-    for i in zlib serf sqlite-amalgamation apr apr-util; do
+    for i in zlib serf sqlite-amalgamation apr apr-util gtest; do
       if [ -d $i ]; then
         echo "Local directory '$i' already exists; the downloaded copy won't be used" >&2
       fi
@@ -126,6 +141,7 @@ get_deps() {
       get_serf
       get_zlib
       get_sqlite
+      get_gtest
 
       echo
       echo "If you require mod_dav_svn, the recommended version of httpd is:"

Reply via email to