subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1659277 - in /subversion/branches/cxxhl: ./ INSTALL Makefile.in build.conf build/ac-macros/compiler.m4 build/generator/gen_win_dependencies.py configure.ac doc/programmer/gtest-guide.txt gen-make.py get-deps.sh
Date Thu, 12 Feb 2015 14:31:29 GMT
Author: brane
Date: Thu Feb 12 14:31:29 2015
New Revision: 1659277

URL: http://svn.apache.org/r1659277
Log:
On the cxxhl branch: Introduce different compile and link options for
C++HL and the C++ parts of JavaHL, so that the former will be compiled
as C++11 and the latter as C++98, as it is now.

Also rename 'gmock' to 'googlemock' everywhere, because it turns out
that 'gmock' is the name of a mocking test framework for Groovy and
using the shortened name for the C++ test framework would be confusing.


* build/ac-macros/compiler.m4
  (SVN_CXX_MODE_SETUP): Rename CXXMODEFLAGS to CXX98MODEFLAGS.
   Introduce CXX11MODEFLAGS to force the compiler into C++11 mode.

* configure.ac: Rename gmock to googlemock.
   Display both C++98 and C++11 compiler flags, and the C mode flags.

* Makefile.in: Rename gmock to googlemock.
  (CXXMODEFLAGS): Remove. Replace with the following:
  (CXX98MODEFLAGS, CXX11MODEFLAGS): New; replacement for CXXMODEFLAGS.
  (COMPILE_CXX98, COMPILE_CXX98_NOWARN,
   LT_COMPILE_CXX98, LT_COMPILE_CXX98_NOWARN,
   COMPILE_CXX11, COMPILE_CXX11_NOWARN,
   LT_COMPILE_CXX11, LT_COMPILE_CXX11_NOWARN):
   New; replacements for COMPILE_CXX, COMPILE_CXX_NOWARN,
   and LT_COMPILE_CXX, LT_COMPILE_CXX_NOWARN.
  (LINK_CXX98, LINK_CXX98_LIB, LINK_CXX11, LINK_CXX11_LIB):
   New; replacements for LINK_CXX and LINK_CXX_LIB.
  (COMPILE_JAVAHL_CXX, LINK_JAVAHL_CXX, COMPILE_CXXHL_CXX,
   COMPILE_GOOGLEMOCK_CXX, COMPILE_CXXHL_GOOGLEMOCK_CXX): Updated definitions.
  (.cpp.o, .cpp.lo): Removed unused suffix rules.
  (cxxhl): New target alias.

* build.conf
  (libsvn_auth_kwallet, libsvncxxhl, cxxhl-tests):
   Update compile and link commands.
  (libgooglemock): Renamed from libgmock and updated.

* INSTALL,
  gen-make.py,
  get-deps.sh,
  doc/programmer/gtest-guide.txt,
  build/generator/gen_win_dependencies.py: Rename gmock to googlemock.
* .: Update the svn:ignore property.

Modified:
    subversion/branches/cxxhl/   (props changed)
    subversion/branches/cxxhl/INSTALL
    subversion/branches/cxxhl/Makefile.in
    subversion/branches/cxxhl/build.conf
    subversion/branches/cxxhl/build/ac-macros/compiler.m4
    subversion/branches/cxxhl/build/generator/gen_win_dependencies.py
    subversion/branches/cxxhl/configure.ac
    subversion/branches/cxxhl/doc/programmer/gtest-guide.txt
    subversion/branches/cxxhl/gen-make.py
    subversion/branches/cxxhl/get-deps.sh

Propchange: subversion/branches/cxxhl/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Feb 12 14:31:29 2015
@@ -49,7 +49,7 @@ mkmf.log
 zlib
 sqlite-amalgamation
 serf
-gmock-fused
+googlemock-fused
 .git
 .gitignore
 compile_commands.json

Modified: subversion/branches/cxxhl/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/cxxhl/INSTALL?rev=1659277&r1=1659276&r2=1659277&view=diff
==============================================================================
--- subversion/branches/cxxhl/INSTALL (original)
+++ subversion/branches/cxxhl/INSTALL Thu Feb 12 14:31:29 2015
@@ -153,7 +153,7 @@ I.    INTRODUCTION
          configured via auto-props or the mime-types-file option
          take precedence.
 
-      * Googlemock aka Gmock (OPTIONAL)
+      * Googlemock (OPTIONAL)
 
          This optional package is used by the tests for Subversions'
          C++ bindings.
@@ -578,7 +578,7 @@ I.    INTRODUCTION
 
       Googlemock can be installed and built in-tree by invoking
 
-      $ ./get-dep.sh gmock
+      $ ./get-dep.sh googlemock
 
   D. Documentation
 

Modified: subversion/branches/cxxhl/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/cxxhl/Makefile.in?rev=1659277&r1=1659276&r2=1659277&view=diff
==============================================================================
--- subversion/branches/cxxhl/Makefile.in (original)
+++ subversion/branches/cxxhl/Makefile.in Thu Feb 12 14:31:29 2015
@@ -136,8 +136,8 @@ 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@
 
 SWIG = @SWIG@
 SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ -I$(SWIG_SRC_DIR)/python/libsvn_swig_py
@@ -177,7 +177,8 @@ CMODEFLAGS = @CMODEFLAGS@
 CNOWARNFLAGS = @CNOWARNFLAGS@
 CMAINTAINERFLAGS = @CMAINTAINERFLAGS@
 CXXFLAGS = @CXXFLAGS@ @CXXUSERFLAGS@ $(EXTRA_CXXFLAGS)
-CXXMODEFLAGS = @CXXMODEFLAGS@
+CXX98MODEFLAGS = @CXX98MODEFLAGS@
+CXX11MODEFLAGS = @CXX11MODEFLAGS@
 CXXNOWARNFLAGS = @CXXNOWARNFLAGS@
 CXXMAINTAINERFLAGS = @CXXMAINTAINERFLAGS@
 ### A few of the CFLAGS (e.g. -Wmissing-prototypes, -Wstrict-prototypes,
@@ -190,11 +191,15 @@ SWIG_CPPFLAGS = @SWIG_CPPFLAGS@ $(EXTRA_
 
 COMPILE = $(CC) $(CMODEFLAGS) $(CPPFLAGS) $(CMAINTAINERFLAGS) $(CFLAGS) $(INCLUDES)
 COMPILE_NOWARN = $(CC) $(CMODEFLAGS) $(CPPFLAGS) $(CNOWARNFLAGS) $(CFLAGS) $(INCLUDES)
-COMPILE_CXX = $(CXX) $(CXXMODEFLAGS) $(CPPFLAGS) $(CXXMAINTAINERFLAGS) $(CXXFLAGS) $(INCLUDES)
-COMPILE_CXX_NOWARN = $(CXX) $(CXXMODEFLAGS) $(CPPFLAGS) $(CXXNOWARNFLAGS) $(CXXFLAGS) $(INCLUDES)
+COMPILE_CXX98 = $(CXX) $(CXX98MODEFLAGS) $(CPPFLAGS) $(CXXMAINTAINERFLAGS) $(CXXFLAGS) $(INCLUDES)
+COMPILE_CXX98_NOWARN = $(CXX) $(CXX98MODEFLAGS) $(CPPFLAGS) $(CXXNOWARNFLAGS) $(CXXFLAGS)
$(INCLUDES)
+COMPILE_CXX11 = $(CXX) $(CXX11MODEFLAGS) $(CPPFLAGS) $(CXXMAINTAINERFLAGS) $(CXXFLAGS) $(INCLUDES)
+COMPILE_CXX11_NOWARN = $(CXX) $(CXX11MODEFLAGS) $(CPPFLAGS) $(CXXNOWARNFLAGS) $(CXXFLAGS)
$(INCLUDES)
 LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) $(LT_CFLAGS)
-LT_COMPILE_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(LT_CFLAGS)
-LT_COMPILE_CXX_NOWARN = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX_NOWARN) $(LT_CFLAGS)
+LT_COMPILE_CXX98 = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX98) $(LT_CFLAGS)
+LT_COMPILE_CXX98_NOWARN = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX98_NOWARN)
$(LT_CFLAGS)
+LT_COMPILE_CXX11 = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX11) $(LT_CFLAGS)
+LT_COMPILE_CXX11_NOWARN = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX11_NOWARN)
$(LT_CFLAGS)
 # Execute a command that loads libraries from the build dir
 LT_EXECUTE = $(LIBTOOL) $(LTFLAGS) --mode=execute `for f in $(abs_builddir)/subversion/*/*.la;
do echo -dlopen $$f; done`
 
@@ -207,7 +212,7 @@ COMPILE_SWIG_PL = $(LIBTOOL) $(LTFLAGS)
 COMPILE_SWIG_RB = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(CPPFLAGS) $(LT_CFLAGS)
$(SWIG_RB_INCLUDES) $(INCLUDES) -o $@ -c
 
 # special compilation for files destined for javahl (i.e. C++)
-COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(LT_CFLAGS)
$(JAVAHL_INCLUDES) -o $@ -c
+COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX98) $(LT_CFLAGS)
$(JAVAHL_INCLUDES) -o $@ -c
 COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS)
 COMPILE_JAVAHL_JAVAH = $(JAVAH)
 COMPILE_JAVAHL_COMPAT_JAVAC = $(JAVAC) $(JAVAC_COMPAT_FLAGS)
@@ -251,14 +256,16 @@ TEST_SHLIB_VAR_SWIG_RB=\
   fi;
 
 # 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_CXXHL_CXX = $(LT_COMPILE_CXX11) $(CXXHL_INCLUDES) -o $@ -c
+COMPILE_GOOGLEMOCK_CXX = $(LT_COMPILE_CXX11_NOWARN) $(GOOGLEMOCK_INCLUDES) -o $@ -c
+COMPILE_CXXHL_GOOGLEMOCK_CXX = $(LT_COMPILE_CXX11) $(CXXHL_INCLUDES) $(GOOGLEMOCK_INCLUDES)
-o $@ -c
 
 LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath
$(libdir)
 LINK_LIB = $(LINK) $(LT_SO_VERSION)
-LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS)
-rpath $(libdir)
-LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION)
+LINK_CXX98 = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXX98MODEFLAGS)
$(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)
+LINK_CXX98_LIB = $(LINK_CXX98) $(LT_SO_VERSION)
+LINK_CXX11 = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXX11MODEFLAGS)
$(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)
+LINK_CXX11_LIB = $(LINK_CXX11) $(LT_SO_VERSION)
 
 # special link rule for mod_dav_svn
 LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
-rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS)
@@ -289,7 +296,7 @@ COMPILE_RB_WRAPPER = $(LIBTOOL) $(LTFLAG
 LINK_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=link $(SWIG_PY_LINK) $(SWIG_LDFLAGS) -rpath
$(swig_pydir) -avoid-version -module
 LINK_RB_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=link $(SWIG_RB_LINK) $(SWIG_LDFLAGS) -rpath
$(swig_rbdir) -avoid-version -module
 
-LINK_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS)
$(LT_CXX_LIBADD) -rpath $(libdir)
+LINK_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXX98MODEFLAGS)
$(CXXFLAGS) $(LDFLAGS) $(LT_CXX_LIBADD) -rpath $(libdir)
 
 INSTALL = @INSTALL@
 INSTALL_LIB = $(LIBTOOL) --mode=install $(INSTALL)
@@ -514,6 +521,9 @@ check-javahl: check-apache-javahl
 
 check-all-javahl: check-apache-javahl check-tigris-javahl check-deprecated-authn-javahl
 
+# C++HL target aliases
+cxxhl: libsvncxxhl cxxhl-tests
+
 # "make check CLEANUP=true" will clean up directories for successful tests.
 # "make check TESTS=subversion/tests/cmdline/basic_tests.py"
 #  will perform only basic tests (likewise for other tests).
@@ -755,15 +765,9 @@ schema-clean:
 .c.o:
 	$(COMPILE) -o $@ -c $<
 
-.cpp.o:
-	$(COMPILE_CXX) -o $@ -c $<
-
 .c.lo:
 	$(LT_COMPILE) -o $@ -c $<
 
-.cpp.lo:
-	$(LT_COMPILE_CXX) -o $@ -c $<
-
 .la.la-a:
 	sed "/library_names/s/'.*'/''/" $< > $@
 

Modified: subversion/branches/cxxhl/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/cxxhl/build.conf?rev=1659277&r1=1659276&r2=1659277&view=diff
==============================================================================
--- subversion/branches/cxxhl/build.conf (original)
+++ subversion/branches/cxxhl/build.conf Thu Feb 12 14:31:29 2015
@@ -234,7 +234,7 @@ type = lib
 install = kwallet-lib
 path = subversion/libsvn_auth_kwallet
 libs = libsvn_subr apr kwallet
-link-cmd = $(LINK_CXX_LIB)
+link-cmd = $(LINK_CXX98_LIB)
 
 # Library needed by all subversion clients
 [libsvn_client]
@@ -732,35 +732,35 @@ sources = src/*.cpp src/aprwrap/*.cpp
 install = cxxhl-lib
 msvc-static = yes
 compile-cmd = $(COMPILE_CXXHL_CXX)
-link-cmd = $(LINK_CXX_LIB)
+link-cmd = $(LINK_CXX11_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)
-link-cmd = $(LINK_CXX)
+compile-cmd = $(COMPILE_CXXHL_GOOGLEMOCK_CXX)
+link-cmd = $(LINK_CXX11)
 
 
 # ----------------------------------------------------------------------------
 #
-# Gmock targets
+# Googlemock targets
 #
 
-[libgmock]
+[libgooglemock]
 description = Googlemock Library
-when = SVN_USE_GMOCK
+when = SVN_USE_GOOGLEMOCK
 type = lib
-path = gmock-fused
+path = googlemock-fused
 sources = gmock-gtest-all.cc
 install = tests
 msvc-static = yes
-compile-cmd = $(COMPILE_GMOCK_CXX)
-link-cmd = $(LINK_CXX_LIB)
+compile-cmd = $(COMPILE_GOOGLEMOCK_CXX)
+link-cmd = $(LINK_CXX11_LIB)
 
 # ----------------------------------------------------------------------------
 #

Modified: subversion/branches/cxxhl/build/ac-macros/compiler.m4
URL: http://svn.apache.org/viewvc/subversion/branches/cxxhl/build/ac-macros/compiler.m4?rev=1659277&r1=1659276&r2=1659277&view=diff
==============================================================================
--- subversion/branches/cxxhl/build/ac-macros/compiler.m4 (original)
+++ subversion/branches/cxxhl/build/ac-macros/compiler.m4 Thu Feb 12 14:31:29 2015
@@ -105,7 +105,16 @@ AC_DEFUN([SVN_CXX_MODE_SETUP],
     SVN_CXXFLAGS_ADD_IFELSE([-std=c++98])
   fi
 
-  CXXMODEFLAGS="$CXXFLAGS"
+  CXX98MODEFLAGS="$CXXFLAGS"
+  CXXFLAGS=""
+
+  if test "$GXX" = "yes"; then
+    dnl Find flags to force C++98 mode
+                  dnl g++ and clang++
+    SVN_CXXFLAGS_ADD_IFELSE([-std=c++11])
+  fi
+
+  CXX11MODEFLAGS="$CXXFLAGS"
   CXXFLAGS=""
 
   if test "$GXX" = "yes"; then
@@ -116,7 +125,8 @@ AC_DEFUN([SVN_CXX_MODE_SETUP],
   CXXNOWARNFLAGS="$CXXFLAGS"
   CXXFLAGS="$CXXFLAGS_KEEP"
 
-  AC_SUBST(CXXMODEFLAGS)
+  AC_SUBST(CXX98MODEFLAGS)
+  AC_SUBST(CXX11MODEFLAGS)
   AC_SUBST(CXXNOWARNFLAGS)
   AC_SUBST(CXXMAINTAINERFLAGS)
   AC_SUBST(CXXUSERFLAGS)

Modified: subversion/branches/cxxhl/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/branches/cxxhl/build/generator/gen_win_dependencies.py?rev=1659277&r1=1659276&r2=1659277&view=diff
==============================================================================
--- subversion/branches/cxxhl/build/generator/gen_win_dependencies.py (original)
+++ subversion/branches/cxxhl/build/generator/gen_win_dependencies.py Thu Feb 12 14:31:29
2015
@@ -128,7 +128,7 @@ class GenDependenciesBase(gen_base.Gener
   # this list, then the project is not generated on Windows.
   _windows_when = [
      'INSTALL_APACHE_MODS',
-     # not 'SVN_USE_GMOCK',
+     # not 'SVN_USE_GOOGLEMOCK',
   ]
 
   def parse_options(self, options):

Modified: subversion/branches/cxxhl/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/cxxhl/configure.ac?rev=1659277&r1=1659276&r2=1659277&view=diff
==============================================================================
--- subversion/branches/cxxhl/configure.ac (original)
+++ subversion/branches/cxxhl/configure.ac Thu Feb 12 14:31:29 2015
@@ -623,27 +623,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-fused])
 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_SOURCES=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
@@ -1163,10 +1163,11 @@ elif test "$enable_optimization" = "no";
 fi
 
 dnl Dump the current compiler options
-AC_MSG_NOTICE([C compiler flags: $CFLAGS])
+AC_MSG_NOTICE([C compiler flags: $CMODEFLAGS $CFLAGS])
 AC_MSG_NOTICE([    user-defined: $CUSERFLAGS])
 AC_MSG_NOTICE([ maintainer-mode: $CMAINTAINERFLAGS])
-AC_MSG_NOTICE([C++ compiler flags: $CXXFLAGS])
+AC_MSG_NOTICE([C++98 compiler flags: $CXX98MODEFLAGS $CXXFLAGS])
+AC_MSG_NOTICE([C++11 compiler flags: $CXX11MODEFLAGS $CXXFLAGS])
 AC_MSG_NOTICE([      user-defined: $CXXUSERFLAGS])
 AC_MSG_NOTICE([   maintainer-mode: $CXXMAINTAINERFLAGS])
 

Modified: subversion/branches/cxxhl/doc/programmer/gtest-guide.txt
URL: http://svn.apache.org/viewvc/subversion/branches/cxxhl/doc/programmer/gtest-guide.txt?rev=1659277&r1=1659276&r2=1659277&view=diff
==============================================================================
--- subversion/branches/cxxhl/doc/programmer/gtest-guide.txt (original)
+++ subversion/branches/cxxhl/doc/programmer/gtest-guide.txt Thu Feb 12 14:31:29 2015
@@ -19,12 +19,12 @@ Subversion uses Googlemock and Googletes
 
 To configure Subversion to use Googlemock, type
 
-   ./get-dep.sh gmock
+   ./get-dep.sh googlemock
 
 This will download Googlemock and put the fused source into the
-'gmock-fused' directory. Once it's there, configure will pick it up
-automatically (but you do have to re-run autogen.sh and configure).
+'googlemock-fused' directory. Once it's there, configure will pick it
+up automatically (but you do have to re-run autogen.sh and configure).
 
 You can disable building Googlemock (and hence the C++HL test suite)
-with the --disable-gmock configure option. This will tell configure to
-ignore the gmock-fused directory.
+with the --disable-googlemock configure option. This will tell
+configure to ignore the googlemock-fused directory.

Modified: subversion/branches/cxxhl/gen-make.py
URL: http://svn.apache.org/viewvc/subversion/branches/cxxhl/gen-make.py?rev=1659277&r1=1659276&r2=1659277&view=diff
==============================================================================
--- subversion/branches/cxxhl/gen-make.py (original)
+++ subversion/branches/cxxhl/gen-make.py Thu Feb 12 14:31:29 2015
@@ -213,7 +213,7 @@ def _usage_exit(err=None):
   print("")
   print("  --with-apr_memcache=DIR")
   print("           the apr_memcache sources are in DIR")
-  print("  --disable-gmock")
+  print("  --disable-googlemock")
   print("           do not use Googlemock")
   sys.exit(1)
 
@@ -262,7 +262,7 @@ if __name__ == '__main__':
                             'disable-shared',
                             'installed-libs=',
                             'vsnet-version=',
-                            'disable-gmock',
+                            'disable-googlemock',
                             ])
     if len(args) > 1:
       _usage_exit("Too many arguments")

Modified: subversion/branches/cxxhl/get-deps.sh
URL: http://svn.apache.org/viewvc/subversion/branches/cxxhl/get-deps.sh?rev=1659277&r1=1659276&r2=1659277&view=diff
==============================================================================
--- subversion/branches/cxxhl/get-deps.sh (original)
+++ subversion/branches/cxxhl/get-deps.sh Thu Feb 12 14:31:29 2015
@@ -36,7 +36,7 @@ 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"}
+GOOGLEMOCK_VERSION=${GOOGLEMOCK_VERSION:-"1.7.0"}
 HTTPD_VERSION=${HTTPD_VERSION:-"2.4.10"}
 APR_ICONV_VERSION=${APR_ICONV_VERSION:-"1.2.1"}
 
@@ -46,8 +46,8 @@ 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/
+GOOGLEMOCK=gmock-${GOOGLEMOCK_VERSION}
+GOOGLEMOCK_URL=https://googlemock.googlecode.com/files/
 
 HTTPD=httpd-${HTTPD_VERSION}
 APR_ICONV=apr-iconv-${APR_ICONV_VERSION}
@@ -67,7 +67,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,24 +122,24 @@ get_sqlite() {
 
 }
 
-get_gmock() {
-    test -d $BASEDIR/gmock-fused && return
+get_googlemock() {
+    test -d $BASEDIR/googlemock-fused && return
 
     cd $TEMPDIR
-    $HTTP_FETCH ${GMOCK_URL}/${GMOCK}.zip
+    $HTTP_FETCH ${GOOGLEMOCK_URL}/${GOOGLEMOCK}.zip
     cd $BASEDIR
 
-    unzip -q $TEMPDIR/$GMOCK.zip
+    unzip -q $TEMPDIR/$GOOGLEMOCK.zip
 
-    mv $GMOCK/fused-src gmock-fused
-    rm -fr $GMOCK
+    mv $GOOGLEMOCK/fused-src googlemock-fused
+    rm -fr $GOOGLEMOCK
 }
 
 # main()
 get_deps() {
     mkdir -p $TEMPDIR
 
-    for i in zlib serf sqlite-amalgamation apr apr-util gmock-fused; do
+    for i in zlib serf sqlite-amalgamation apr apr-util googlemock-fused; do
       if [ -d $i ]; then
         echo "Local directory '$i' already exists; the downloaded copy won't be used" >&2
       fi



Mime
View raw message