subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1746303 - in /subversion/trunk: ./ Makefile.in build.conf configure.ac get-deps.sh
Date Tue, 31 May 2016 16:48:17 GMT
Author: brane
Date: Tue May 31 16:48:17 2016
New Revision: 1746303

URL: http://svn.apache.org/viewvc?rev=1746303&view=rev
Log:
Make get-deps.sh download Googlemock and Googletest from GitHub.
Also rename gmock->googlemock throughout the code
(except for a few places in get_deps.sh).

* .: Ignore directory 'googlemock' instaed of 'gmock-fused'.

* get-deps.sh: Renamed gmock to googlemock.
  (GMOCK_VERSION): Bump to 1.7.0
  (GMOCK, GMOCK_URL): Update to the new location on GitHub.
  (GTEST, GTEST_URL, GTEST_VERSION): New variables.
  (get_googlemock): Updated to download both Googlemock and Googletest sources.

* configure.ac: Renamed gmock to googlemock.
  (SVN_USE_GOOGLEMOCK): Fixed one instance that was mistyped.

* build.conf: Renamed gmock to googlemock.
  (cxxhl-tests): Updated target definition.
  (libgooglemock): Updated source path and sources list.

* Makefile.in: Renamed gmock to googlemock.
  (GOOGLEMOCK_INCLUDES): Changed, these are now only the include paths that
   are needed by tests that use Googlemock, not the Googlemock library itself.
  (GOOGLEMOCK_LIB_INCLUDES): New, these are the include paths for the library.
  (COMPILE_GOOGLEMOCK_CXX): Use the correct include paths.

Modified:
    subversion/trunk/   (props changed)
    subversion/trunk/Makefile.in
    subversion/trunk/build.conf
    subversion/trunk/configure.ac
    subversion/trunk/get-deps.sh

Propchange: subversion/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue May 31 16:48:17 2016
@@ -44,7 +44,7 @@ mkmf.log
 zlib
 sqlite-amalgamation
 serf
-gmock-fused
+googlemock
 .git
 .gitignore
 .idea

Modified: subversion/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1746303&r1=1746302&r2=1746303&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Tue May 31 16:48:17 2016
@@ -136,8 +136,9 @@ APACHE_INCLUDES = @APACHE_INCLUDES@
 APACHE_LIBEXECDIR = $(DESTDIR)@APACHE_LIBEXECDIR@
 APACHE_LDFLAGS = @APACHE_LDFLAGS@
 
-SVN_USE_GMOCK = @SVN_USE_GMOCK@
-GMOCK_INCLUDES = -I@GMOCK_SRCDIR@
+SVN_USE_GOOGLEMOCK = @SVN_USE_GOOGLEMOCK@
+GOOGLEMOCK_INCLUDES = -I@GOOGLEMOCK_SRCDIR@/googlemock/include -I@GOOGLEMOCK_SRCDIR@/googletest/include
+GOOGLEMOCK_LIB_INCLUDES = -I@GOOGLEMOCK_SRCDIR@/googlemock -I@GOOGLEMOCK_SRCDIR@/googletest
$(GOOGLEMOCK_INCLUDES)
 
 SWIG = @SWIG@
 SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ -I$(SWIG_SRC_DIR)/python/libsvn_swig_py
@@ -252,8 +253,8 @@ TEST_SHLIB_VAR_SWIG_RB=\
 
 # special compilation for files destined for cxxhl
 COMPILE_CXXHL_CXX = $(LT_COMPILE_CXX) $(CXXHL_INCLUDES) -o $@ -c
-COMPILE_GMOCK_CXX = $(LT_COMPILE_CXX_NOWARN) $(GMOCK_INCLUDES) -o $@ -c
-COMPILE_CXXHL_GMOCK_CXX = $(LT_COMPILE_CXX) $(CXXHL_INCLUDES) $(GMOCK_INCLUDES) -o $@ -c
+COMPILE_GOOGLEMOCK_CXX = $(LT_COMPILE_CXX_NOWARN) $(GOOGLEMOCK_LIB_INCLUDES) -o $@ -c
+COMPILE_CXXHL_GOOGLEMOCK_CXX = $(LT_COMPILE_CXX) $(CXXHL_INCLUDES) $(GOOGLEMOCK_INCLUDES)
-o $@ -c
 
 LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath
$(libdir)
 LINK_LIB = $(LINK) $(LT_SO_VERSION)

Modified: subversion/trunk/build.conf
URL: http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1746303&r1=1746302&r2=1746303&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Tue May 31 16:48:17 2016
@@ -742,30 +742,30 @@ link-cmd = $(LINK_CXX_LIB)
 
 [cxxhl-tests]
 description = Unit tests for Subversion C++ HighLevel bindings
-when = SVN_USE_GMOCK
+when = SVN_USE_GOOGLEMOCK
 type = exe
 path = subversion/bindings/cxxhl
-libs = libsvncxxhl libgmock libsvn_subr apr
+libs = libsvncxxhl libgooglemock libsvn_subr apr
 sources = tests/*.cpp
 install = tests
-compile-cmd = $(COMPILE_CXXHL_GMOCK_CXX)
+compile-cmd = $(COMPILE_CXXHL_GOOGLEMOCK_CXX)
 link-cmd = $(LINK_CXX)
 
 
 # ----------------------------------------------------------------------------
 #
-# Gmock targets
+# Googlemock targets
 #
 
-[libgmock]
+[libgooglemock]
 description = Googlemock Library
-when = SVN_USE_GMOCK
+when = SVN_USE_GOOGLEMOCK
 type = lib
-path = gmock-fused
-sources = gmock-gtest-all.cc
+path = googlemock
+sources = googletest/src/gtest-all.cc googlemock/src/gmock-all.cc
 install = tests
 msvc-static = yes
-compile-cmd = $(COMPILE_GMOCK_CXX)
+compile-cmd = $(COMPILE_GOOGLEMOCK_CXX)
 link-cmd = $(LINK_CXX_LIB)
 
 # ----------------------------------------------------------------------------

Modified: subversion/trunk/configure.ac
URL: http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1746303&r1=1746302&r2=1746303&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Tue May 31 16:48:17 2016
@@ -632,27 +632,27 @@ AC_SUBST(SVN_GNOME_KEYRING_INCLUDES)
 AC_SUBST(SVN_GNOME_KEYRING_LIBS)
 
 dnl Googlemock -----------------
-AC_ARG_ENABLE([gmock],
-  AS_HELP_STRING([--disable-gmock],
+AC_ARG_ENABLE([googlemock],
+  AS_HELP_STRING([--disable-googlemock],
                  [Do not use the Googlemock testing framework]),
   [],
-  [enable_gmock=yes])
+  [enable_googlemock=yes])
 
-AC_SUBST([GMOCK_SRCDIR], [$abs_srcdir/gmock-fused])
+AC_SUBST([GOOGLEMOCK_SRCDIR], [$abs_srcdir/googlemock])
 AC_MSG_CHECKING([whether use Googlemock])
-if test "$enable_gmock" != "no"; then
-  if test -d "$GMOCK_SRCDIR"; then
+if test "$enable_googlemock" != "no"; then
+  if test -d "$GOOGLEMOCK_SRCDIR"; then
     AC_MSG_RESULT([yes])
-    SVN_USE_GMOCK=true
+    SVN_USE_GOOGLEMOCK=true
   else
     AC_MSG_RESULT([no])
-    SVN_USE_GMOCK=false
+    SVN_USE_GOOGLEMOCK=false
   fi
 else
   AC_MSG_RESULT([no])
-  SVN_USE_GMOCK_SOURCES=false
+  SVN_USE_GOOGLEMOCK=false
 fi
-AC_SUBST([SVN_USE_GMOCK])
+AC_SUBST([SVN_USE_GOOGLEMOCK])
 
 dnl Ev2 experimental features ----------------------
 dnl Note: The Ev2 implementations will be built unconditionally, but by

Modified: subversion/trunk/get-deps.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/get-deps.sh?rev=1746303&r1=1746302&r2=1746303&view=diff
==============================================================================
--- subversion/trunk/get-deps.sh (original)
+++ subversion/trunk/get-deps.sh Tue May 31 16:48:17 2016
@@ -36,7 +36,8 @@ APU_VERSION=${APU_VERSION:-"1.5.1"}
 SERF_VERSION=${SERF_VERSION:-"1.3.8"}
 ZLIB_VERSION=${ZLIB_VERSION:-"1.2.8"}
 SQLITE_VERSION=${SQLITE_VERSION:-"3.7.15.1"}
-GMOCK_VERSION=${GMOCK_VERSION:-"1.6.0"}
+GTEST_VERSION=${GMOCK_VERSION:-"1.7.0"}
+GMOCK_VERSION=${GMOCK_VERSION:-"1.7.0"}
 HTTPD_VERSION=${HTTPD_VERSION:-"2.4.10"}
 APR_ICONV_VERSION=${APR_ICONV_VERSION:-"1.2.1"}
 
@@ -46,8 +47,10 @@ SERF=serf-${SERF_VERSION}
 ZLIB=zlib-${ZLIB_VERSION}
 SQLITE_VERSION_LIST=`echo $SQLITE_VERSION | sed -e 's/\./ /g'`
 SQLITE=sqlite-amalgamation-`printf %d%02d%02d%02d $SQLITE_VERSION_LIST`
-GMOCK=gmock-${GMOCK_VERSION}
-GMOCK_URL=https://googlemock.googlecode.com/files/
+GTEST=release-${GTEST_VERSION}
+GTEST_URL=https://github.com/google/googletest/archive
+GMOCK=release-${GMOCK_VERSION}
+GMOCK_URL=https://github.com/google/googlemock/archive
 
 HTTPD=httpd-${HTTPD_VERSION}
 APR_ICONV=apr-iconv-${APR_ICONV_VERSION}
@@ -67,7 +70,7 @@ APACHE_MIRROR=http://archive.apache.org/
 # helpers
 usage() {
     echo "Usage: $0"
-    echo "Usage: $0 [ apr | serf | zlib | sqlite | gmock ] ..."
+    echo "Usage: $0 [ apr | serf | zlib | sqlite | googlemock ] ..."
     exit $1
 }
 
@@ -122,17 +125,22 @@ get_sqlite() {
 
 }
 
-get_gmock() {
-    test -d $BASEDIR/gmock-fused && return
+get_googlemock() {
+    test -d $BASEDIR/googlemock && return
 
     cd $TEMPDIR
-    $HTTP_FETCH ${GMOCK_URL}/${GMOCK}.zip
-    cd $BASEDIR
+    $HTTP_FETCH ${GTEST_URL}/${GTEST}.zip
+    unzip -q ${GTEST}.zip
+    rm -f ${GTEST}.zip
 
-    unzip -q $TEMPDIR/$GMOCK.zip
+    $HTTP_FETCH ${GMOCK_URL}/${GMOCK}.zip
+    unzip -q ${GMOCK}.zip
+    rm -f ${GMOCK}.zip
 
-    mv $GMOCK/fused-src gmock-fused
-    rm -fr $GMOCK
+    cd $BASEDIR
+    mkdir googlemock
+    mv $TEMPDIR/googletest-release-${GTEST_VERSION} googlemock/googletest
+    mv $TEMPDIR/googlemock-release-${GMOCK_VERSION} googlemock/googlemock
 }
 
 # main()



Mime
View raw message