svn commit: r1427728 - in /subversion/trunk: ./ get-deps.sh

[br...@apache.org]

Author: brane
Date: Wed Jan  2 10:53:03 2013
New Revision: 1427728

URL: http://svn.apache.org/viewvc?rev=1427728&view=rev
Log:
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().

* .: Ignore the gtest directory.

Patch by: Gabriela Gibson <gabriela.gibson{_AT_}gmail.com>
          (Tweaked by me)

Modified:
    subversion/trunk/   (props changed)
    subversion/trunk/get-deps.sh

Propchange: subversion/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Jan  2 10:53:03 2013
@@ -49,5 +49,6 @@ mkmf.log
 zlib
 sqlite-amalgamation
 serf
+gtest
 .git
 .gitignore

Modified: subversion/trunk/get-deps.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/get-deps.sh?rev=1427728&r1=1427727&r2=1427728&view=diff
==============================================================================
--- subversion/trunk/get-deps.sh (original)
+++ subversion/trunk/get-deps.sh Wed Jan  2 10:53:03 2013
@@ -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:"