Turn on Decklink by default

Opening a DeckLink card for output with the DeckLink object
sometimes failed because some types of card report no support for BGRA pixel
format, yet it works. The test is maintained but a warning is printed
instead of throwing an exception.

Optional cache size suffix added in Decklink output format string: may be
needed for some card that needs more than the default 8 frames.

.gitignore

@@ -33,9 +33,3 @@ Desktop.ini
 /doc/python_api/sphinx-in-tmp/
 /doc/python_api/sphinx-in/
 /doc/python_api/sphinx-out/
-/doc/python_api/rst/bmesh.ops.rst
-/doc/python_api/rst/in_menu.png
-/doc/python_api/rst/menu_id.png
-/doc/python_api/rst/op_prop.png
-/doc/python_api/rst/run_script.png
-/doc/python_api/rst/spacebar.png

.gitmodules

@@ -10,7 +10,3 @@
 	path = release/datafiles/locale
 	url = ../blender-translations.git
 	ignore = all
-[submodule "source/tools"]
-	path = source/tools
-	url = ../blender-dev-tools.git
-	ignore = all

GNUmakefile

@@ -182,20 +182,14 @@ help: .FORCE
 	@echo "  * package_archive - build an archive package"
 	@echo ""
 	@echo "Testing Targets (not associated with building blender)"
-	@echo "  * test               - run ctest, currently tests import/export,"
-	@echo "                         operator execution and that python modules load"
-	@echo "  * test_cmake         - runs our own cmake file checker"
-	@echo "                         which detects errors in the cmake file list definitions"
-	@echo "  * test_pep8          - checks all python script are pep8"
-	@echo "                         which are tagged to use the stricter formatting"
+	@echo "  * test               - run ctest, currently tests import/export, operator execution and that python modules load"
+	@echo "  * test_cmake         - runs our own cmake file checker which detects errors in the cmake file list definitions"
+	@echo "  * test_pep8          - checks all python script are pep8 which are tagged to use the stricter formatting"
 	@echo "  * test_deprecated    - checks for deprecation tags in our code which may need to be removed"
-	@echo "  * test_style_c       - checks C/C++ conforms with blenders style guide:"
-	@echo "                         http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
+	@echo "  * test_style_c       - checks C/C++ conforms with blenders style guide: http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
 	@echo "  * test_style_c_qtc   - same as test_style but outputs QtCreator tasks format"
-	@echo "  * test_style_osl     - checks OpenShadingLanguage conforms with blenders style guide:"
-	@echo "                         http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
-	@echo "  * test_style_osl_qtc - checks OpenShadingLanguage conforms with blenders style guide:"
-	@echo "                         http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
+	@echo "  * test_style_osl     - checks OpenShadingLanguage conforms with blenders style guide: http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
+	@echo "  * test_style_osl_qtc - checks OpenShadingLanguage conforms with blenders style guide: http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
 	@echo ""
 	@echo "Static Source Code Checking (not associated with building blender)"
 	@echo "  * check_cppcheck       - run blender source through cppcheck (C & C++)"
@@ -411,8 +405,7 @@ update: .FORCE
 
 # Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation.
 doc_py: .FORCE
-	"$(BUILD_DIR)/bin/blender" --background -noaudio --factory-startup \
-		--python doc/python_api/sphinx_doc_gen.py
+	"$(BUILD_DIR)/bin/blender" --background -noaudio --factory-startup --python doc/python_api/sphinx_doc_gen.py
 	cd doc/python_api ; sphinx-build -b html sphinx-in sphinx-out
 	@echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/contents.html'"
 
@@ -421,8 +414,7 @@ doc_doxy: .FORCE
 	@echo "docs written into: '$(BLENDER_DIR)/doc/doxygen/html/index.html'"
 
 doc_dna: .FORCE
-	"$(BUILD_DIR)/bin/blender" --background -noaudio --factory-startup \
-		--python doc/blender_file_format/BlendFileDnaExporter_25.py
+	"$(BUILD_DIR)/bin/blender" --background -noaudio --factory-startup --python doc/blender_file_format/BlendFileDnaExporter_25.py
 	@echo "docs written into: '$(BLENDER_DIR)/doc/blender_file_format/dna.html'"
 
 doc_man: .FORCE

build_files/build_environment/install_deps.sh

@@ -25,17 +25,17 @@
 ARGS=$( \
 getopt \
 -o s:i:t:h \
---long source:,install:,tmp:,info:,threads:,help,show-deps,no-sudo,no-build,no-confirm,with-all,with-opencollada,\
+--long source:,install:,tmp:,info:,threads:,help,show-deps,no-sudo,no-confirm,with-all,with-opencollada,\
 ver-ocio:,ver-oiio:,ver-llvm:,ver-osl:,ver-osd:,ver-openvdb:,\
 force-all,force-python,force-numpy,force-boost,\
 force-ocio,force-openexr,force-oiio,force-llvm,force-osl,force-osd,force-openvdb,\
-force-ffmpeg,force-opencollada,force-alembic,\
+force-ffmpeg,force-opencollada,\
 build-all,build-python,build-numpy,build-boost,\
 build-ocio,build-openexr,build-oiio,build-llvm,build-osl,build-osd,build-openvdb,\
-build-ffmpeg,build-opencollada,build-alembic,\
+build-ffmpeg,build-opencollada,\
 skip-python,skip-numpy,skip-boost,\
 skip-ocio,skip-openexr,skip-oiio,skip-llvm,skip-osl,skip-osd,skip-openvdb,\
-skip-ffmpeg,skip-opencollada,skip-alembic \
+skip-ffmpeg,skip-opencollada \
 -- "$@" \
 )
 
@@ -97,9 +97,6 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
     --no-sudo
         Disable use of sudo (this script won't be able to do much though, will just print needed packages...).
 
-    --no-build
-        Do not build (compile) anything, dependencies not installable with the package manager will remain missing.
-
     --no-confirm
         Disable any interaction with user (suitable for automated run).
 
@@ -167,9 +164,6 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
     --build-openvdb
         Force the build of OpenVDB.
 
-    --build-alembic
-        Force the build of Alembic.
-
     --build-opencollada
         Force the build of OpenCOLLADA.
 
@@ -219,9 +213,6 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
     --force-openvdb
         Force the rebuild of OpenVDB.
 
-    --force-alembic
-        Force the rebuild of Alembic.
-
     --force-opencollada
         Force the rebuild of OpenCOLLADA.
 
@@ -264,9 +255,6 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
     --skip-openvdb
         Unconditionally skip OpenVDB installation/building.
 
-    --skip-alembic
-        Unconditionally skip Alembic installation/building.
-
     --skip-opencollada
         Unconditionally skip OpenCOLLADA installation/building.
 
@@ -279,7 +267,6 @@ DO_SHOW_DEPS=false
 
 SUDO="sudo"
 
-NO_BUILD=false
 NO_CONFIRM=false
 
 PYTHON_VERSION="3.5.1"
@@ -330,14 +317,14 @@ LLVM_FORCE_REBUILD=false
 LLVM_SKIP=false
 
 # OSL needs to be compiled for now!
-OSL_VERSION="1.7.3"
+OSL_VERSION="1.7.1"
 OSL_VERSION_MIN=$OSL_VERSION
 OSL_FORCE_BUILD=false
 OSL_FORCE_REBUILD=false
 OSL_SKIP=false
 
 # OpenSubdiv needs to be compiled for now
-OSD_VERSION="3.0.5"
+OSD_VERSION="3.0.2"
 OSD_VERSION_MIN=$OSD_VERSION
 OSD_FORCE_BUILD=false
 OSD_FORCE_REBUILD=false
@@ -352,13 +339,6 @@ OPENVDB_FORCE_BUILD=false
 OPENVDB_FORCE_REBUILD=false
 OPENVDB_SKIP=false
 
-# Alembic needs to be compiled for now
-ALEMBIC_VERSION="1.6.0"
-ALEMBIC_VERSION_MIN=$ALEMBIC_VERSION
-ALEMBIC_FORCE_BUILD=false
-ALEMBIC_FORCE_REBUILD=false
-ALEMBIC_SKIP=false
-
 # Version??
 OPENCOLLADA_VERSION="1.3"
 OPENCOLLADA_FORCE_BUILD=false
@@ -483,12 +463,6 @@ while true; do
       PRINT ""
       SUDO=""; shift; continue
     ;;
-    --no-build)
-      PRINT ""
-      WARNING "--no-build enabled, this script will not be able to install all dependencies..."
-      PRINT ""
-      NO_BUILD=true; shift; continue
-    ;;
     --no-confirm)
       NO_CONFIRM=true; shift; continue
     ;;
@@ -541,7 +515,6 @@ while true; do
       OPENVDB_FORCE_BUILD=true
       OPENCOLLADA_FORCE_BUILD=true
       FFMPEG_FORCE_BUILD=true
-      ALEMBIC_FORCE_BUILD=true
       shift; continue
     ;;
     --build-python)
@@ -584,9 +557,6 @@ while true; do
     --build-ffmpeg)
       FFMPEG_FORCE_BUILD=true; shift; continue
     ;;
-    --build-alembic)
-      ALEMBIC_FORCE_BUILD=true; shift; continue
-    ;;
     --force-all)
       PYTHON_FORCE_REBUILD=true
       NUMPY_FORCE_REBUILD=true
@@ -600,7 +570,6 @@ while true; do
       OPENVDB_FORCE_REBUILD=true
       OPENCOLLADA_FORCE_REBUILD=true
       FFMPEG_FORCE_REBUILD=true
-      ALEMBIC_FORCE_REBUILD=true
       shift; continue
     ;;
     --force-python)
@@ -641,9 +610,6 @@ while true; do
     --force-ffmpeg)
       FFMPEG_FORCE_REBUILD=true; shift; continue
     ;;
-    --force-alembic)
-      ALEMBIC_FORCE_REBUILD=true; shift; continue
-    ;;
     --skip-python)
       PYTHON_SKIP=true; shift; continue
     ;;
@@ -680,9 +646,6 @@ while true; do
     --skip-ffmpeg)
       FFMPEG_SKIP=true; shift; continue
     ;;
-    --skip-alembic)
-      ALEMBIC_SKIP=true; shift; continue
-    ;;
     --)
       # no more arguments to parse
       break
@@ -710,7 +673,7 @@ NUMPY_SOURCE=( "http://sourceforge.net/projects/numpy/files/NumPy/$NUMPY_VERSION
 
 _boost_version_nodots=`echo "$BOOST_VERSION" | sed -r 's/\./_/g'`
 BOOST_SOURCE=( "http://sourceforge.net/projects/boost/files/boost/$BOOST_VERSION/boost_$_boost_version_nodots.tar.bz2/download" )
-BOOST_BUILD_MODULES="--with-system --with-filesystem --with-thread --with-regex --with-locale --with-date_time --with-wave --with-iostreams --with-python --with-program_options"
+BOOST_BUILD_MODULES="--with-system --with-filesystem --with-thread --with-regex --with-locale --with-date_time --with-wave --with-iostreams"
 
 OCIO_SOURCE=( "https://github.com/imageworks/OpenColorIO/tarball/v$OCIO_VERSION" )
 
@@ -739,7 +702,7 @@ OSL_SOURCE_REPO=( "https://github.com/Nazg-Gul/OpenShadingLanguage.git" )
 OSL_SOURCE_REPO_UID="7d40ff5fe8e47b030042afb92d0e955f5aa96f48"
 OSL_SOURCE_REPO_BRANCH="blender-fixes"
 
-OSD_USE_REPO=false
+OSD_USE_REPO=true
 # Script foo to make the version string compliant with the archive name:
 # ${Varname//SearchForThisChar/ReplaceWithThisChar}
 OSD_SOURCE=( "https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${OSD_VERSION//./_}.tar.gz" )
@@ -754,12 +717,6 @@ OPENVDB_SOURCE=( "https://github.com/dreamworksanimation/openvdb/archive/v${OPEN
 #~ OPENVDB_SOURCE_REPO_UID="404659fffa659da075d1c9416e4fc939139a84ee"
 #~ OPENVDB_SOURCE_REPO_BRANCH="dev"
 
-ALEMBIC_USE_REPO=false
-ALEMBIC_SOURCE=( "https://github.com/alembic/alembic/archive/${ALEMBIC_VERSION}.tar.gz" )
-# ALEMBIC_SOURCE_REPO=( "https://github.com/alembic/alembic.git" )
-# ALEMBIC_SOURCE_REPO_UID="e6c90d4faa32c4550adeaaf3f556dad4b73a92bb"
-# ALEMBIC_SOURCE_REPO_BRANCH="master"
-
 OPENCOLLADA_SOURCE=( "https://github.com/KhronosGroup/OpenCOLLADA.git" )
 OPENCOLLADA_REPO_UID="3335ac164e68b2512a40914b14c74db260e6ff7d"
 OPENCOLLADA_REPO_BRANCH="master"
@@ -800,8 +757,7 @@ You may also want to build them yourself (optional ones are [between brackets]):
     * [OpenShadingLanguage $OSL_VERSION_MIN] (from $OSL_SOURCE_REPO, branch $OSL_SOURCE_REPO_BRANCH, commit $OSL_SOURCE_REPO_UID).
     * [OpenSubDiv $OSD_VERSION_MIN] (from $OSD_SOURCE_REPO, branch $OSD_SOURCE_REPO_BRANCH, commit $OSD_SOURCE_REPO_UID).
     * [OpenVDB $OPENVDB_VERSION_MIN] (from $OPENVDB_SOURCE), [Blosc $OPENVDB_BLOSC_VERSION] (from $OPENVDB_BLOSC_SOURCE).
-    * [OpenCollada] (from $OPENCOLLADA_SOURCE, branch $OPENCOLLADA_REPO_BRANCH, commit $OPENCOLLADA_REPO_UID).
-    * [Alembic $ALEMBIC_VERSION] (from $ALEMBIC_SOURCE).\""
+    * [OpenCollada] (from $OPENCOLLADA_SOURCE, branch $OPENCOLLADA_REPO_BRANCH, commit $OPENCOLLADA_REPO_UID).\""
 
 if [ "$DO_SHOW_DEPS" = true ]; then
   PRINT ""
@@ -1011,11 +967,6 @@ clean_Python() {
 }
 
 compile_Python() {
-  if [ "$NO_BUILD" = true ]; then
-    WARNING "--no-build enabled, Python will not be compiled!"
-    return
-  fi
-
   # To be changed each time we make edits that would modify the compiled result!
   py_magic=1
   _init_python
@@ -1081,11 +1032,6 @@ clean_Numpy() {
 }
 
 compile_Numpy() {
-  if [ "$NO_BUILD" = true ]; then
-    WARNING "--no-build enabled, Numpy will not be compiled!"
-    return
-  fi
-
   # To be changed each time we make edits that would modify the compiled result!
   numpy_magic=0
   _init_numpy
@@ -1146,13 +1092,8 @@ clean_Boost() {
 }
 
 compile_Boost() {
-  if [ "$NO_BUILD" = true ]; then
-    WARNING "--no-build enabled, Boost will not be compiled!"
-    return
-  fi
-
   # To be changed each time we make edits that would modify the compiled result!
-  boost_magic=11
+  boost_magic=10
 
   _init_boost
 
@@ -1224,11 +1165,6 @@ clean_OCIO() {
 }
 
 compile_OCIO() {
-  if [ "$NO_BUILD" = true ]; then
-    WARNING "--no-build enabled, OpenColorIO will not be compiled!"
-    return
-  fi
-
   # To be changed each time we make edits that would modify the compiled result!
   ocio_magic=1
   _init_ocio
@@ -1320,11 +1256,6 @@ clean_ILMBASE() {
 }
 
 compile_ILMBASE() {
-  if [ "$NO_BUILD" = true ]; then
-    WARNING "--no-build enabled, ILMBase will not be compiled!"
-    return
-  fi
-
   # To be changed each time we make edits that would modify the compiled result!
   ilmbase_magic=10
   _init_ilmbase
@@ -1412,11 +1343,6 @@ clean_OPENEXR() {
 }
 
 compile_OPENEXR() {
-  if [ "$NO_BUILD" = true ]; then
-    WARNING "--no-build enabled, OpenEXR will not be compiled!"
-    return
-  fi
-
   # To be changed each time we make edits that would modify the compiled result!
   openexr_magic=14
 
@@ -1532,11 +1458,6 @@ clean_OIIO() {
 }
 
 compile_OIIO() {
-  if [ "$NO_BUILD" = true ]; then
-    WARNING "--no-build enabled, OpenImageIO will not be compiled!"
-    return
-  fi
-
   # To be changed each time we make edits that would modify the compiled result!
   oiio_magic=16
   _init_oiio
@@ -1668,11 +1589,6 @@ clean_LLVM() {
 }
 
 compile_LLVM() {
-  if [ "$NO_BUILD" = true ]; then
-    WARNING "--no-build enabled, LLVM will not be compiled!"
-    return
-  fi
-
   # To be changed each time we make edits that would modify the compiled result!
   llvm_magic=3
   _init_llvm
@@ -1770,13 +1686,8 @@ clean_OSL() {
 }
 
 compile_OSL() {
-  if [ "$NO_BUILD" = true ]; then
-    WARNING "--no-build enabled, OpenShadingLanguage will not be compiled!"
-    return
-  fi
-
   # To be changed each time we make edits that would modify the compiled result!
-  osl_magic=21
+  osl_magic=20
   _init_osl
 
   # Clean install if needed!
@@ -1901,13 +1812,8 @@ clean_OSD() {
 }
 
 compile_OSD() {
-  if [ "$NO_BUILD" = true ]; then
-    WARNING "--no-build enabled, OpenSubdiv will not be compiled!"
-    return
-  fi
-
   # To be changed each time we make edits that would modify the compiled result!
-  osd_magic=2
+  osd_magic=1
   _init_osd
 
   # Clean install if needed!
@@ -1998,11 +1904,6 @@ clean_BLOSC() {
 }
 
 compile_BLOSC() {
-  if [ "$NO_BUILD" = true ]; then
-    WARNING "--no-build enabled, Blosc will not be compiled!"
-    return
-  fi
-
   # To be changed each time we make edits that would modify the compiled result!
   blosc_magic=0
   _init_blosc
@@ -2085,11 +1986,6 @@ clean_OPENVDB() {
 }
 
 compile_OPENVDB() {
-  if [ "$NO_BUILD" = true ]; then
-    WARNING "--no-build enabled, OpenVDB will not be compiled!"
-    return
-  fi
-
   compile_BLOSC
   PRINT ""
 
@@ -2172,102 +2068,6 @@ compile_OPENVDB() {
   run_ldconfig "openvdb"
 }
 
-#### Build Alembic ####
-_init_alembic() {
-  _src=$SRC/alembic-$ALEMBIC_VERSION
-  _git=false
-  _inst=$INST/alembic-$ALEMBIC_VERSION
-  _inst_shortcut=$INST/alembic
-}
-
-clean_ALEMBIC() {
-  _init_alembic
-  _clean
-}
-
-compile_ALEMBIC() {
-  if [ "$NO_BUILD" = true ]; then
-    WARNING "--no-build enabled, Alembic will not be compiled!"
-    return
-  fi
-
-  compile_HDF5
-  PRINT ""
-
-  # To be changed each time we make edits that would modify the compiled result!
-  alembic_magic=2
-  _init_alembic
-
-  # Clean install if needed!
-  magic_compile_check alembic-$ALEMBIC_VERSION $alembic_magic
-  if [ $? -eq 1 -o "$ALEMBIC_FORCE_REBUILD" = true ]; then
-    clean_ALEMBIC
-  fi
-
-  if [ ! -d $_inst ]; then
-    INFO "Building Alembic-$ALEMBIC_VERSION"
-
-    prepare_opt
-
-    if [ ! -d $_src -o true ]; then
-      mkdir -p $SRC
-      download ALEMBIC_SOURCE[@] "$_src.tar.gz"
-
-      INFO "Unpacking Alembic-$ALEMBIC_VERSION"
-      tar -C $SRC -xf $_src.tar.gz
-    fi
-
-    cd $_src
-
-    cmake_d="-D CMAKE_INSTALL_PREFIX=$_inst"
-
-    if [ -d $INST/boost ]; then
-      cmake_d="$cmake_d -D BOOST_ROOT=$INST/boost"
-      cmake_d="$cmake_d -D USE_STATIC_BOOST=ON"
-    else
-      cmake_d="$cmake_d -D USE_STATIC_BOOST=OFF"
-    fi
-
-    if [ "$_with_built_openexr" = true ]; then
-      cmake_d="$cmake_d -D ILMBASE_ROOT=$INST/openexr"
-      cmake_d="$cmake_d -D USE_ARNOLD=OFF"
-      cmake_d="$cmake_d -D USE_BINARIES=OFF"
-      cmake_d="$cmake_d -D USE_EXAMPLES=OFF"
-      cmake_d="$cmake_d -D USE_HDF5=OFF"
-      cmake_d="$cmake_d -D USE_MAYA=OFF"
-      cmake_d="$cmake_d -D USE_PRMAN=OFF"
-      cmake_d="$cmake_d -D USE_PYALEMBIC=OFF"
-      cmake_d="$cmake_d -D USE_STATIC_HDF5=OFF"
-      cmake_d="$cmake_d -D ALEMBIC_ILMBASE_LINK_STATIC=OFF"
-      cmake_d="$cmake_d -D ALEMBIC_SHARED_LIBS=OFF"
-      cmake_d="$cmake_d -D ALEMBIC_LIB_USES_BOOST=ON"
-      cmake_d="$cmake_d -D ALEMBIC_LIB_USES_TR1=OFF"
-      INFO "ILMBASE_ROOT=$INST/openexr"
-    fi
-
-    cmake $cmake_d ./
-    make -j$THREADS install
-    make clean
-
-    if [ -d $_inst ]; then
-      _create_inst_shortcut
-    else
-      ERROR "Alembic-$ALEMBIC_VERSION failed to compile, exiting"
-      exit 1
-    fi
-
-    magic_compile_set alembic-$ALEMBIC_VERSION $alembic_magic
-
-    cd $CWD
-    INFO "Done compiling Alembic-$ALEMBIC_VERSION!"
-  else
-    INFO "Own Alembic-$ALEMBIC_VERSION is up to date, nothing to do!"
-    INFO "If you want to force rebuild of this lib, use the --force-alembic option."
-  fi
-
-  run_ldconfig "alembic"
-}
-
 #### Build OpenCOLLADA ####
 _init_opencollada() {
   _src=$SRC/OpenCOLLADA-$OPENCOLLADA_VERSION
@@ -2282,11 +2082,6 @@ clean_OpenCOLLADA() {
 }
 
 compile_OpenCOLLADA() {
-  if [ "$NO_BUILD" = true ]; then
-    WARNING "--no-build enabled, OpenCOLLADA will not be compiled!"
-    return
-  fi
-
   # To be changed each time we make edits that would modify the compiled results!
   opencollada_magic=9
   _init_opencollada
@@ -2366,11 +2161,6 @@ clean_FFmpeg() {
 }
 
 compile_FFmpeg() {
-  if [ "$NO_BUILD" = true ]; then
-    WARNING "--no-build enabled, ffmpeg will not be compiled!"
-    return
-  fi
-
   # To be changed each time we make edits that would modify the compiled result!
   ffmpeg_magic=5
   _init_ffmpeg
@@ -2876,17 +2666,6 @@ install_DEB() {
     fi
   fi
 
-  PRINT ""
-  if [ "$ALEMBIC_SKIP" = true ]; then
-    WARNING "Skipping Alembic installation, as requested..."
-  elif [ "$ALEMBIC_FORCE_BUILD" = true ]; then
-    INFO "Forced Alembic building, as requested..."
-    compile_ALEMBIC
-  else
-    # No package currently, only HDF5!
-    compile_ALEMBIC
-  fi
-
 
   if [ "$WITH_OPENCOLLADA" = true ]; then
     _do_compile_collada=false
@@ -3424,17 +3203,6 @@ install_RPM() {
     compile_OPENVDB
   fi
 
-  PRINT ""
-  if [ "$ALEMBIC_SKIP" = true ]; then
-    WARNING "Skipping Alembic installation, as requested..."
-  elif [ "$ALEMBIC_FORCE_BUILD" = true ]; then
-    INFO "Forced Alembic building, as requested..."
-    compile_ALEMBIC
-  else
-    # No package currently!
-    compile_ALEMBIC
-  fi
-
 
   if [ "$WITH_OPENCOLLADA" = true ]; then
     PRINT ""
@@ -3845,16 +3613,6 @@ install_ARCH() {
     fi
   fi
 
-  PRINT ""
-  if [ "$ALEMBIC_SKIP" = true ]; then
-    WARNING "Skipping Alembic installation, as requested..."
-  elif [ "$ALEMBIC_FORCE_BUILD" = true ]; then
-    INFO "Forced Alembic building, as requested..."
-    compile_ALEMBIC
-  else
-    compile_ALEMBIC
-  fi
-
 
   if [ "$WITH_OPENCOLLADA" = true ]; then
     PRINT ""
@@ -4162,7 +3920,7 @@ print_info() {
 
   _buildargs="-U *SNDFILE* -U *PYTHON* -U *BOOST* -U *Boost*"
   _buildargs="$_buildargs -U *OPENCOLORIO* -U *OPENEXR* -U *OPENIMAGEIO* -U *LLVM* -U *CYCLES*"
-  _buildargs="$_buildargs -U *OPENSUBDIV* -U *OPENVDB* -U *COLLADA* -U *FFMPEG* -U *ALEMBIC*"
+  _buildargs="$_buildargs -U *OPENSUBDIV* -U *OPENVDB* -U *COLLADA* -U *FFMPEG*"
 
   _1="-D WITH_CODEC_SNDFILE=ON"
   PRINT "  $_1"
@@ -4268,17 +4026,6 @@ print_info() {
     _buildargs="$_buildargs $_1"
   fi
 
-  if [ "$ALEMBIC_SKIP" = false ]; then
-    _1="-D WITH_ALEMBIC=ON"
-    PRINT "  $_1"
-    _buildargs="$_buildargs $_1"
-    if [ -d $INST/alembic ]; then
-      _1="-D ALEMBIC_ROOT_DIR=$INST/alembic"
-      PRINT "  $_1"
-      _buildargs="$_buildargs $_1"
-    fi
-  fi
-
   if [ "$NO_SYSTEM_GLEW" = true ]; then
     _1="-D WITH_SYSTEM_GLEW=OFF"
     PRINT "  $_1"

build_files/buildbot/master.cfg

@@ -285,7 +285,7 @@ def generic_builder(id, libdir='', branch='', rsync=False):
                              maxsize=150 * 1024 * 1024,
                              workdir='install'))
     f.addStep(MasterShellCommand(name='unpack',
-                                 command=['python2.7', unpack_script, filename],
+                                 command=['python', unpack_script, filename],
                                  description='unpacking',
                                  descriptionDone='unpacked'))
     return f

build_files/buildbot/slave_compile.py

@@ -73,25 +73,20 @@ if 'cmake' in builder:
         if builder.endswith('x86_64_10_6_cmake'):
             cmake_extra_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=x86_64')
         cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/bin/nvcc')
-        cmake_extra_options.append('-DCUDA_NVCC8_EXECUTABLE=/usr/local/cuda8-hack/bin/nvcc')
 
     elif builder.startswith('win'):
-        if builder.endswith('_vc2015'):
-            if builder.startswith('win64'):
-                cmake_options.extend(['-G', 'Visual Studio 14 2015 Win64'])
-            elif builder.startswith('win32'):
-                bits = 32
-                cmake_options.extend(['-G', 'Visual Studio 14 2015'])
-            cmake_extra_options.append('-DCUDA_NVCC_FLAGS=--cl-version;2013;' +
-                '--compiler-bindir;C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\bin')
-        else:
-            if builder.startswith('win64'):
-                cmake_options.extend(['-G', 'Visual Studio 12 2013 Win64'])
-            elif builder.startswith('win32'):
-                bits = 32
-                cmake_options.extend(['-G', 'Visual Studio 12 2013'])
-        cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE:FILEPATH=C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v7.5/bin/nvcc.exe')
-        cmake_extra_options.append('-DCUDA_NVCC8_EXECUTABLE:FILEPATH=C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v8.0/bin/nvcc.exe')
+      if builder.endswith('_vc2015'):
+        if builder.startswith('win64'):
+            cmake_options.extend(['-G', 'Visual Studio 14 2015 Win64', '-DWITH_CYCLES_CUDA_BINARIES=0'])
+        elif builder.startswith('win32'):
+            bits = 32
+            cmake_options.extend(['-G', 'Visual Studio 14 2015', '-DWITH_CYCLES_CUDA_BINARIES=0'])
+      else:
+        if builder.startswith('win64'):
+            cmake_options.extend(['-G', 'Visual Studio 12 2013 Win64'])
+        elif builder.startswith('win32'):
+            bits = 32
+            cmake_options.extend(['-G', 'Visual Studio 12 2013'])
 
     elif builder.startswith('linux'):
         tokens = builder.split("_")
@@ -111,14 +106,10 @@ if 'cmake' in builder:
             cuda_chroot_name = 'buildbot_' + deb_name + '_x86_64'
             targets = ['player', 'blender', 'cuda']
 
-        cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-7.5/bin/nvcc')
-        cmake_extra_options.append('-DCUDA_NVCC8_EXECUTABLE=/usr/local/cuda-8.0/bin/nvcc')
-
     cmake_options.append("-C" + os.path.join(blender_dir, cmake_config_file))
 
     # Prepare CMake options needed to configure cuda binaries compilation.
     cuda_cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=%s" % ('ON' if build_cubins else 'OFF'))
-    cuda_cmake_options.append("-DCYCLES_CUDA_BINARIES_ARCH=sm_20;sm_21;sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61")
     if build_cubins or 'cuda' in targets:
         if bits == 32:
             cuda_cmake_options.append("-DCUDA_64_BIT_DEVICE_CODE=OFF")

build_files/buildbot/slave_pack.py

@@ -108,8 +108,6 @@ if builder.find('cmake') != -1:
                 platform += 'i386'
             elif builder.endswith('ppc_10_6_cmake'):
                 platform += 'ppc'
-        if builder.endswith('vc2015'):
-            platform += "-vc14"
         builderified_name = 'blender-{}-{}-{}'.format(blender_full_version, git_hash, platform)
         if branch != '':
             builderified_name = branch + "-" + builderified_name

build_files/cmake/Modules/FindAlembic.cmake

@@ -1,70 +0,0 @@
-# - Find Alembic library
-# Find the native Alembic includes and libraries
-# This module defines
-#  ALEMBIC_INCLUDE_DIRS, where to find Alembic headers, Set when
-#                        ALEMBIC_INCLUDE_DIR is found.
-#  ALEMBIC_LIBRARIES, libraries to link against to use Alembic.
-#  ALEMBIC_ROOT_DIR, The base directory to search for Alembic.
-#                    This can also be an environment variable.
-#  ALEMBIC_FOUND, If false, do not try to use Alembic.
-#
-
-#=============================================================================
-# Copyright 2016 Blender Foundation.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-
-# If ALEMBIC_ROOT_DIR was defined in the environment, use it.
-IF(NOT ALEMBIC_ROOT_DIR AND NOT $ENV{ALEMBIC_ROOT_DIR} STREQUAL "")
-  SET(ALEMBIC_ROOT_DIR $ENV{ALEMBIC_ROOT_DIR})
-ENDIF()
-
-SET(_alembic_SEARCH_DIRS
-  ${ALEMBIC_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-  /opt/lib/alembic
-)
-
-FIND_PATH(ALEMBIC_INCLUDE_DIR
-  NAMES
-    Alembic/Abc/All.h
-  HINTS
-    ${_alembic_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include
-)
-
-FIND_LIBRARY(ALEMBIC_LIBRARY
-  NAMES
-    Alembic
-  HINTS
-    ${_alembic_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib lib/static
-)
-
-# handle the QUIETLY and REQUIRED arguments and set ALEMBIC_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(ALEMBIC DEFAULT_MSG ALEMBIC_LIBRARY ALEMBIC_INCLUDE_DIR)
-
-IF(ALEMBIC_FOUND)
-  SET(ALEMBIC_LIBRARIES ${ALEMBIC_LIBRARY})
-  SET(ALEMBIC_INCLUDE_DIRS ${ALEMBIC_INCLUDE_DIR})
-ENDIF(ALEMBIC_FOUND)
-
-MARK_AS_ADVANCED(
-  ALEMBIC_INCLUDE_DIR
-  ALEMBIC_LIBRARY
-)
-
-UNSET(_alembic_SEARCH_DIRS)

build_files/cmake/Modules/FindHDF5.cmake

@@ -1,69 +0,0 @@
-# - Find HDF5 library
-# Find the native HDF5 includes and libraries
-# This module defines
-#  HDF5_INCLUDE_DIRS, where to find hdf5.h, Set when HDF5_INCLUDE_DIR is found.
-#  HDF5_LIBRARIES, libraries to link against to use HDF5.
-#  HDF5_ROOT_DIR, The base directory to search for HDF5.
-#                 This can also be an environment variable.
-#  HDF5_FOUND, If false, do not try to use HDF5.
-#
-
-#=============================================================================
-# Copyright 2016 Blender Foundation.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-
-# If HDF5_ROOT_DIR was defined in the environment, use it.
-IF(NOT HDF5_ROOT_DIR AND NOT $ENV{HDF5_ROOT_DIR} STREQUAL "")
-  SET(HDF5_ROOT_DIR $ENV{HDF5_ROOT_DIR})
-ENDIF()
-
-SET(_hdf5_SEARCH_DIRS
-  ${HDF5_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-  /opt/lib/hdf5
-)
-
-FIND_LIBRARY(HDF5_LIBRARY
-  NAMES
-    hdf5
-  HINTS
-    ${_hdf5_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-)
-
-FIND_PATH(HDF5_INCLUDE_DIR
-  NAMES
-    hdf5.h
-  HINTS
-    ${_hdf5_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include
-)
-
-# handle the QUIETLY and REQUIRED arguments and set HDF5_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(HDF5 DEFAULT_MSG HDF5_LIBRARY HDF5_INCLUDE_DIR)
-
-IF(HDF5_FOUND)
-  SET(HDF5_LIBRARIES ${HDF5_LIBRARY})
-  SET(HDF5_INCLUDE_DIRS ${HDF5_INCLUDE_DIR})
-ENDIF(HDF5_FOUND)
-
-MARK_AS_ADVANCED(
-  HDF5_INCLUDE_DIR
-  HDF5_LIBRARY
-)
-
-UNSET(_hdf5_SEARCH_DIRS)

build_files/cmake/Modules/GTestTesting.cmake

@@ -23,7 +23,6 @@ macro(BLENDER_SRC_GTEST_EX NAME SRC EXTRA_LIBS DO_ADD_TEST)
 			${CMAKE_SOURCE_DIR}/extern/glog/src
 			${CMAKE_SOURCE_DIR}/extern/gflags/src
 			${CMAKE_SOURCE_DIR}/extern/gtest/include
-			${CMAKE_SOURCE_DIR}/extern/gmock/include
 		)
 		unset(_current_include_directories)
 
@@ -34,7 +33,6 @@ macro(BLENDER_SRC_GTEST_EX NAME SRC EXTRA_LIBS DO_ADD_TEST)
 		                      bf_testing_main
 		                      bf_intern_guardedalloc
 		                      extern_gtest
-		                      extern_gmock
 		                      # needed for glog
 		                      ${PTHREADS_LIBRARIES}
 		                      extern_glog

build_files/cmake/clang_array_check.py

@@ -239,8 +239,8 @@ def file_check_arg_sizes(tu):
         if 0:
             print("---",
                   " <~> ".join(
-                      [" ".join([t.spelling for t in C.get_tokens()])
-                       for C in node.get_children()]
+                  [" ".join([t.spelling for t in C.get_tokens()])
+                  for C in node.get_children()]
                   ))
         # print(node.location)
 

build_files/cmake/cmake_consistency_check.py

@@ -29,11 +29,11 @@ if not sys.version.startswith("3"):
     sys.exit(1)
 
 from cmake_consistency_check_config import (
-    IGNORE,
-    UTF8_CHECK,
-    SOURCE_DIR,
-    BUILD_DIR,
-)
+        IGNORE,
+        UTF8_CHECK,
+        SOURCE_DIR,
+        BUILD_DIR,
+        )
 
 
 import os

build_files/cmake/cmake_consistency_check_config.py

@@ -31,7 +31,7 @@ IGNORE = (
     "extern/carve/patches/files/random.h",
     "intern/audaspace/SRC/AUD_SRCResampleFactory.h",
     "intern/audaspace/SRC/AUD_SRCResampleReader.h",
-)
+    )
 
 UTF8_CHECK = True
 

build_files/cmake/cmake_netbeans_project.py

@@ -37,19 +37,19 @@ if not project_info.init(sys.argv[-1]):
     sys.exit(1)
 
 from project_info import (
-    SIMPLE_PROJECTFILE,
-    SOURCE_DIR,
-    CMAKE_DIR,
-    PROJECT_DIR,
-    source_list,
-    is_project_file,
-    is_c_header,
-    # is_py,
-    cmake_advanced_info,
-    cmake_compiler_defines,
-    cmake_cache_var,
-    project_name_get,
-)
+        SIMPLE_PROJECTFILE,
+        SOURCE_DIR,
+        CMAKE_DIR,
+        PROJECT_DIR,
+        source_list,
+        is_project_file,
+        is_c_header,
+        # is_py,
+        cmake_advanced_info,
+        cmake_compiler_defines,
+        cmake_cache_var,
+        project_name_get,
+        )
 
 
 import os

build_files/cmake/cmake_qtcreator_project.py

@@ -43,17 +43,17 @@ def quote_define(define):
 
 def create_qtc_project_main(name):
     from project_info import (
-        SIMPLE_PROJECTFILE,
-        SOURCE_DIR,
-        # CMAKE_DIR,
-        PROJECT_DIR,
-        source_list,
-        is_project_file,
-        is_c_header,
-        cmake_advanced_info,
-        cmake_compiler_defines,
-        project_name_get,
-    )
+            SIMPLE_PROJECTFILE,
+            SOURCE_DIR,
+            # CMAKE_DIR,
+            PROJECT_DIR,
+            source_list,
+            is_project_file,
+            is_c_header,
+            cmake_advanced_info,
+            cmake_compiler_defines,
+            project_name_get,
+            )
 
     files = list(source_list(SOURCE_DIR, filename_check=is_project_file))
     files_rel = [os.path.relpath(f, start=PROJECT_DIR) for f in files]
@@ -69,7 +69,7 @@ def create_qtc_project_main(name):
 
         with open(os.path.join(PROJECT_DIR, "%s.includes" % FILE_NAME), 'w') as f:
             f.write("\n".join(sorted(list(set(os.path.dirname(f)
-                                              for f in files_rel if is_c_header(f))))))
+                              for f in files_rel if is_c_header(f))))))
 
         qtc_prj = os.path.join(PROJECT_DIR, "%s.creator" % FILE_NAME)
         with open(qtc_prj, 'w') as f:
@@ -87,7 +87,7 @@ def create_qtc_project_main(name):
 
         # for some reason it doesnt give all internal includes
         includes = list(set(includes) | set(os.path.dirname(f)
-                                            for f in files_rel if is_c_header(f)))
+                        for f in files_rel if is_c_header(f)))
         includes.sort()
 
         # be tricky, get the project name from CMake if we can!
@@ -125,13 +125,13 @@ def create_qtc_project_main(name):
 
 def create_qtc_project_python(name):
     from project_info import (
-        SOURCE_DIR,
-        # CMAKE_DIR,
-        PROJECT_DIR,
-        source_list,
-        is_py,
-        project_name_get,
-    )
+            SOURCE_DIR,
+            # CMAKE_DIR,
+            PROJECT_DIR,
+            source_list,
+            is_py,
+            project_name_get,
+            )
 
     files = list(source_list(SOURCE_DIR, filename_check=is_py))
     files_rel = [os.path.relpath(f, start=PROJECT_DIR) for f in files]
@@ -161,24 +161,24 @@ def argparse_create():
     import argparse
 
     parser = argparse.ArgumentParser(
-        description="This script generates Qt Creator project files for Blender",
-    )
+            description="This script generates Qt Creator project files for Blender",
+            )
 
     parser.add_argument(
-        "-n", "--name",
-        dest="name",
-        metavar='NAME', type=str,
-        help="Override default project name (\"Blender\")",
-        required=False,
-    )
+            "-n", "--name",
+            dest="name",
+            metavar='NAME', type=str,
+            help="Override default project name (\"Blender\")",
+            required=False,
+            )
 
     parser.add_argument(
-        "-b", "--build-dir",
-        dest="build_dir",
-        metavar='BUILD_DIR', type=str,
-        help="Specify the build path (or fallback to the $PWD)",
-        required=False,
-    )
+            "-b", "--build-dir",
+            dest="build_dir",
+            metavar='BUILD_DIR', type=str,
+            help="Specify the build path (or fallback to the $PWD)",
+            required=False,
+            )
 
     return parser
 

build_files/cmake/cmake_static_check_clang_array.py

@@ -32,7 +32,7 @@ USE_QUIET = (os.environ.get("QUIET", None) is not None)
 CHECKER_IGNORE_PREFIX = [
     "extern",
     "intern/moto",
-]
+    ]
 
 CHECKER_BIN = "python2"
 
@@ -42,7 +42,7 @@ CHECKER_ARGS = [
     "-I" + os.path.join(project_source_info.SOURCE_DIR, "extern", "glew", "include"),
     # stupid but needed
     "-Dbool=char"
-]
+    ]
 
 
 def main():

build_files/cmake/cmake_static_check_cppcheck.py

@@ -32,7 +32,7 @@ USE_QUIET = (os.environ.get("QUIET", None) is not None)
 CHECKER_IGNORE_PREFIX = [
     "extern",
     "intern/moto",
-]
+    ]
 
 CHECKER_BIN = "cppcheck"
 
@@ -43,7 +43,7 @@ CHECKER_ARGS = [
     "--max-configs=1",  # speeds up execution
     #  "--check-config", # when includes are missing
     "--enable=all",  # if you want sixty hundred pedantic suggestions
-]
+    ]
 
 if USE_QUIET:
     CHECKER_ARGS.append("--quiet")

build_files/cmake/cmake_static_check_smatch.py

@@ -25,13 +25,13 @@
 CHECKER_IGNORE_PREFIX = [
     "extern",
     "intern/moto",
-]
+    ]
 
 CHECKER_BIN = "smatch"
 CHECKER_ARGS = [
     "--full-path",
     "--two-passes",
-]
+    ]
 
 import project_source_info
 import subprocess

build_files/cmake/cmake_static_check_sparse.py

@@ -25,11 +25,11 @@
 CHECKER_IGNORE_PREFIX = [
     "extern",
     "intern/moto",
-]
+    ]
 
 CHECKER_BIN = "sparse"
 CHECKER_ARGS = [
-]
+    ]
 
 import project_source_info
 import subprocess

build_files/cmake/cmake_static_check_splint.py

@@ -25,7 +25,7 @@
 CHECKER_IGNORE_PREFIX = [
     "extern",
     "intern/moto",
-]
+    ]
 
 CHECKER_BIN = "splint"
 
@@ -61,7 +61,7 @@ CHECKER_ARGS = [
     # dummy, witjout this splint complains with:
     #  /usr/include/bits/confname.h:31:27: *** Internal Bug at cscannerHelp.c:2428: Unexpanded macro not function or constant: int _PC_MAX_CANON
     "-D_PC_MAX_CANON=0",
-]
+    ]
 
 
 import project_source_info

build_files/cmake/config/blender_full.cmake

@@ -4,7 +4,6 @@
 #   cmake -C../blender/build_files/cmake/config/blender_full.cmake  ../blender
 #
 
-set(WITH_ALEMBIC             ON  CACHE BOOL "" FORCE)
 set(WITH_BUILDINFO           ON  CACHE BOOL "" FORCE)
 set(WITH_BULLET              ON  CACHE BOOL "" FORCE)
 set(WITH_CODEC_AVI           ON  CACHE BOOL "" FORCE)

build_files/cmake/config/blender_lite.cmake

@@ -8,7 +8,6 @@
 set(WITH_INSTALL_PORTABLE    ON  CACHE BOOL "" FORCE)
 set(WITH_SYSTEM_GLEW         ON  CACHE BOOL "" FORCE)
 
-set(WITH_ALEMBIC             OFF CACHE BOOL "" FORCE)
 set(WITH_BUILDINFO           OFF CACHE BOOL "" FORCE)
 set(WITH_BULLET              OFF CACHE BOOL "" FORCE)
 set(WITH_CODEC_AVI           OFF CACHE BOOL "" FORCE)

build_files/cmake/config/bpy_module.cmake

@@ -32,4 +32,3 @@ set(WITH_OPENCOLLADA         OFF CACHE BOOL "" FORCE)
 set(WITH_INTERNATIONAL       OFF CACHE BOOL "" FORCE)
 set(WITH_BULLET              OFF CACHE BOOL "" FORCE)
 set(WITH_OPENVDB             OFF CACHE BOOL "" FORCE)
-set(WITH_ALEMBIC             OFF CACHE BOOL "" FORCE)

build_files/cmake/example_scripts/make_quicky.py

@@ -74,7 +74,7 @@ def main():
         "rebuild_cache",
         "depend",
         "cmake_check_build_system",
-    ])
+        ])
 
     targets -= set(bad)
 

build_files/cmake/macros.cmake

@@ -196,33 +196,8 @@ function(blender_source_group
 endfunction()
 
 
-# Support per-target CMake flags
-# Read from: CMAKE_C_FLAGS_**** (made upper case) when set.
-#
-# 'name' should alway match the target name,
-# use this macro before add_library or add_executable.
-#
-# Optionally takes an arg passed to set(), eg PARENT_SCOPE.
-macro(add_cc_flags_custom_test
-	name
-	)
-
-	string(TOUPPER ${name} _name_upper)
-	if(DEFINED CMAKE_C_FLAGS_${_name_upper})
-		message(STATUS "Using custom CFLAGS: CMAKE_C_FLAGS_${_name_upper} in \"${CMAKE_CURRENT_SOURCE_DIR}\"")
-		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${_name_upper}}" ${ARGV1})
-	endif()
-	if(DEFINED CMAKE_CXX_FLAGS_${_name_upper})
-		message(STATUS "Using custom CXXFLAGS: CMAKE_CXX_FLAGS_${_name_upper} in \"${CMAKE_CURRENT_SOURCE_DIR}\"")
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${_name_upper}}" ${ARGV1})
-	endif()
-	unset(_name_upper)
-
-endmacro()
-
-
 # only MSVC uses SOURCE_GROUP
-function(blender_add_lib__impl
+function(blender_add_lib_nolist
 	name
 	sources
 	includes
@@ -250,18 +225,6 @@ function(blender_add_lib__impl
 endfunction()
 
 
-function(blender_add_lib_nolist
-	name
-	sources
-	includes
-	includes_sys
-	)
-
-	add_cc_flags_custom_test(${name} PARENT_SCOPE)
-
-	blender_add_lib__impl(${name} "${sources}" "${includes}" "${includes_sys}")
-endfunction()
-
 function(blender_add_lib
 	name
 	sources
@@ -269,9 +232,7 @@ function(blender_add_lib
 	includes_sys
 	)
 
-	add_cc_flags_custom_test(${name} PARENT_SCOPE)
-
-	blender_add_lib__impl(${name} "${sources}" "${includes}" "${includes_sys}")
+	blender_add_lib_nolist(${name} "${sources}" "${includes}" "${includes_sys}")
 
 	set_property(GLOBAL APPEND PROPERTY BLENDER_LINK_LIBS ${name})
 endfunction()
@@ -333,11 +294,6 @@ function(SETUP_LIBDIRS)
 		link_directories(${LLVM_LIBPATH})
 	endif()
 
-	if(WITH_ALEMBIC)
-		link_directories(${ALEMBIC_LIBPATH})
-		link_directories(${HDF5_LIBPATH})
-	endif()
-
 	if(WIN32 AND NOT UNIX)
 		link_directories(${PTHREADS_LIBPATH})
 	endif()
@@ -359,6 +315,7 @@ function(setup_liblinks
 	target_link_libraries(
 		${target}
 		${PNG_LIBRARIES}
+		${ZLIB_LIBRARIES}
 		${FREETYPE_LIBRARY}
 	)
 
@@ -438,9 +395,6 @@ function(setup_liblinks
 		endif()
 	endif()
 	target_link_libraries(${target} ${JPEG_LIBRARIES})
-	if(WITH_ALEMBIC)
-		target_link_libraries(${target} ${ALEMBIC_LIBRARIES} ${HDF5_LIBRARIES})
-	endif()
 	if(WITH_IMAGE_OPENEXR)
 		target_link_libraries(${target} ${OPENEXR_LIBRARIES})
 	endif()
@@ -509,11 +463,6 @@ function(setup_liblinks
 		endif()
 	endif()
 
-	target_link_libraries(
-		${target}
-		${ZLIB_LIBRARIES}
-	)
-
 	#system libraries with no dependencies such as platform link libs or opengl should go last
 	target_link_libraries(${target}
 			${BLENDER_GL_LIBRARIES})
@@ -619,7 +568,6 @@ function(SETUP_BLENDER_SORTED_LIBS)
 		bf_imbuf_openimageio
 		bf_imbuf_dds
 		bf_collada
-		bf_alembic
 		bf_intern_elbeem
 		bf_intern_memutil
 		bf_intern_guardedalloc
@@ -737,7 +685,7 @@ function(SETUP_BLENDER_SORTED_LIBS)
 		list_insert_after(BLENDER_SORTED_LIBS "ge_logic_ngnetwork" "extern_bullet")
 	endif()
 
-	if(WITH_GAMEENGINE_DECKLINK)
+	if(WITH_DECKLINK)
 		list(APPEND BLENDER_SORTED_LIBS bf_intern_decklink)
 	endif()
 
@@ -1560,44 +1508,3 @@ function(print_all_vars)
 		message("${_var}=${${_var}}")
 	endforeach()
 endfunction()
-
-macro(openmp_delayload
-	projectname
-	)
-		if(MSVC)
-			if(WITH_OPENMP)
-				if(MSVC_VERSION EQUAL 1800)
-					set(OPENMP_DLL_NAME "vcomp120")
-				else()
-					set(OPENMP_DLL_NAME "vcomp140")
-				endif()
-				SET_TARGET_PROPERTIES(${projectname} PROPERTIES LINK_FLAGS_RELEASE "/DELAYLOAD:${OPENMP_DLL_NAME}.dll delayimp.lib")
-				SET_TARGET_PROPERTIES(${projectname} PROPERTIES LINK_FLAGS_DEBUG "/DELAYLOAD:${OPENMP_DLL_NAME}d.dll delayimp.lib")
-				SET_TARGET_PROPERTIES(${projectname} PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/DELAYLOAD:${OPENMP_DLL_NAME}.dll delayimp.lib")
-				SET_TARGET_PROPERTIES(${projectname} PROPERTIES LINK_FLAGS_MINSIZEREL "/DELAYLOAD:${OPENMP_DLL_NAME}.dll delayimp.lib")
-			endif(WITH_OPENMP)
-		endif(MSVC)
-endmacro()
-
-MACRO(WINDOWS_SIGN_TARGET target)
-	if (WITH_WINDOWS_CODESIGN)
-		if (!SIGNTOOL_EXE)
-			error("Codesigning is enabled, but signtool is not found")
-		else()
-			if (WINDOWS_CODESIGN_PFX_PASSWORD)
-				set(CODESIGNPASSWORD /p ${WINDOWS_CODESIGN_PFX_PASSWORD})
-			else()
-				if ($ENV{PFXPASSWORD})
-					set(CODESIGNPASSWORD /p $ENV{PFXPASSWORD})
-				else()
-					message( FATAL_ERROR "WITH_WINDOWS_CODESIGN is on but WINDOWS_CODESIGN_PFX_PASSWORD not set, and environment variable PFXPASSWORD not found, unable to sign code.")
-				endif()
-			endif()
-			add_custom_command(TARGET ${target}
-						POST_BUILD
-						COMMAND ${SIGNTOOL_EXE} sign /f ${WINDOWS_CODESIGN_PFX} ${CODESIGNPASSWORD} $<TARGET_FILE:${target}>
-						VERBATIM
-				)
-		endif()
-	endif()
-ENDMACRO()

build_files/cmake/packaging.cmake

@@ -38,21 +38,7 @@ unset(MY_WC_HASH)
 # Force Package Name
 execute_process(COMMAND date "+%Y%m%d" OUTPUT_VARIABLE CPACK_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
 string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
-if (MSVC)
-	if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-		set(PACKAGE_ARCH windows64)
-	else()
-		set(PACKAGE_ARCH windows32)
-	endif()
-else(MSVC)
-	set(PACKAGE_ARCH ${CMAKE_SYSTEM_PROCESSOR})
-endif()
-
-if (CPACK_OVERRIDE_PACKAGENAME)
-	set(CPACK_PACKAGE_FILE_NAME ${CPACK_OVERRIDE_PACKAGENAME}-${PACKAGE_ARCH})
-else()
-	set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME_LOWER}-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}-git${CPACK_DATE}.${BUILD_REV}-${PACKAGE_ARCH})
-endif()
+set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME_LOWER}-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}-git${CPACK_DATE}.${BUILD_REV}-${CMAKE_SYSTEM_PROCESSOR})
 
 if(CMAKE_SYSTEM_NAME MATCHES "Linux")
 	# RPM packages

build_files/cmake/platform/platform_apple.cmake

@@ -1,430 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# The Original Code is Copyright (C) 2016, Blender Foundation
-# All rights reserved.
-#
-# Contributor(s): Sergey Sharybin.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-# Libraries configuration for Apple.
-
-if(NOT DEFINED LIBDIR)
-	set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-9.x.universal)
-else()
-	message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")
-endif()
-if(NOT EXISTS "${LIBDIR}/")
-	message(FATAL_ERROR "Mac OSX requires pre-compiled libs at: '${LIBDIR}'")
-endif()
-
-if(WITH_OPENAL)
-	find_package(OpenAL)
-	if(OPENAL_FOUND)
-		set(WITH_OPENAL ON)
-		set(OPENAL_INCLUDE_DIR "${LIBDIR}/openal/include")
-	else()
-		set(WITH_OPENAL OFF)
-	endif()
-endif()
-
-if(WITH_ALEMBIC)
-	set(ALEMBIC ${LIBDIR}/alembic)
-	set(ALEMBIC_INCLUDE_DIR ${ALEMBIC}/include)
-	set(ALEMBIC_INCLUDE_DIRS ${ALEMBIC_INCLUDE_DIR})
-	set(ALEMBIC_LIBPATH ${ALEMBIC}/lib)
-	set(ALEMBIC_LIBRARIES Alembic)
-endif()
-
-if(WITH_OPENSUBDIV)
-	set(OPENSUBDIV ${LIBDIR}/opensubdiv)
-	set(OPENSUBDIV_LIBPATH ${OPENSUBDIV}/lib)
-	find_library(OSL_LIB_UTIL NAMES osdutil PATHS ${OPENSUBDIV_LIBPATH})
-	find_library(OSL_LIB_CPU NAMES osdCPU PATHS ${OPENSUBDIV_LIBPATH})
-	find_library(OSL_LIB_GPU NAMES osdGPU PATHS ${OPENSUBDIV_LIBPATH})
-	set(OPENSUBDIV_INCLUDE_DIR ${OPENSUBDIV}/include)
-	set(OPENSUBDIV_INCLUDE_DIRS ${OPENSUBDIV_INCLUDE_DIR})
-	list(APPEND OPENSUBDIV_LIBRARIES ${OSL_LIB_UTIL} ${OSL_LIB_CPU} ${OSL_LIB_GPU})
-endif()
-
-if(WITH_JACK)
-	find_library(JACK_FRAMEWORK
-		NAMES jackmp
-	)
-	set(JACK_INCLUDE_DIRS ${JACK_FRAMEWORK}/headers)
-	if(NOT JACK_FRAMEWORK)
-		set(WITH_JACK OFF)
-	endif()
-endif()
-
-if(WITH_CODEC_SNDFILE)
-	set(SNDFILE ${LIBDIR}/sndfile)
-	set(SNDFILE_INCLUDE_DIRS ${SNDFILE}/include)
-	set(SNDFILE_LIBRARIES sndfile FLAC ogg vorbis vorbisenc)
-	set(SNDFILE_LIBPATH ${SNDFILE}/lib ${FFMPEG}/lib)  # TODO, deprecate
-endif()
-
-if(WITH_PYTHON)
-	# we use precompiled libraries for py 3.5 and up by default
-	set(PYTHON_VERSION 3.5)
-	if(NOT WITH_PYTHON_MODULE AND NOT WITH_PYTHON_FRAMEWORK)
-		# normally cached but not since we include them with blender
-		set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}m")
-		set(PYTHON_EXECUTABLE "${LIBDIR}/python/bin/python${PYTHON_VERSION}m")
-		set(PYTHON_LIBRARY python${PYTHON_VERSION}m)
-		set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}")
-		# set(PYTHON_LINKFLAGS "-u _PyMac_Error")  # won't  build with this enabled
-	else()
-		# module must be compiled against Python framework
-		set(_py_framework "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}")
-
-		set(PYTHON_INCLUDE_DIR "${_py_framework}/include/python${PYTHON_VERSION}m")
-		set(PYTHON_EXECUTABLE "${_py_framework}/bin/python${PYTHON_VERSION}m")
-		set(PYTHON_LIBPATH "${_py_framework}/lib/python${PYTHON_VERSION}/config-${PYTHON_VERSION}m")
-		#set(PYTHON_LIBRARY python${PYTHON_VERSION})
-		#set(PYTHON_LINKFLAGS "-u _PyMac_Error -framework Python")  # won't  build with this enabled
-
-		unset(_py_framework)
-	endif()
-
-	# uncached vars
-	set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
-	set(PYTHON_LIBRARIES  "${PYTHON_LIBRARY}")
-
-	if(NOT EXISTS "${PYTHON_EXECUTABLE}")
-		message(FATAL_ERROR "Python executable missing: ${PYTHON_EXECUTABLE}")
-	endif()
-endif()
-
-if(WITH_FFTW3)
-	set(FFTW3 ${LIBDIR}/fftw3)
-	set(FFTW3_INCLUDE_DIRS ${FFTW3}/include)
-	set(FFTW3_LIBRARIES fftw3)
-	set(FFTW3_LIBPATH ${FFTW3}/lib)
-endif()
-
-set(PNG_LIBRARIES png)
-set(JPEG_LIBRARIES jpeg)
-
-set(ZLIB /usr)
-set(ZLIB_INCLUDE_DIRS "${ZLIB}/include")
-set(ZLIB_LIBRARIES z bz2)
-
-set(FREETYPE ${LIBDIR}/freetype)
-set(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include ${FREETYPE}/include/freetype2)
-set(FREETYPE_LIBPATH ${FREETYPE}/lib)
-set(FREETYPE_LIBRARY freetype)
-
-if(WITH_IMAGE_OPENEXR)
-	set(OPENEXR ${LIBDIR}/openexr)
-	set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
-	set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR}/include/OpenEXR)
-	set(OPENEXR_LIBRARIES Iex Half IlmImf Imath IlmThread)
-	set(OPENEXR_LIBPATH ${OPENEXR}/lib)
-endif()
-
-if(WITH_CODEC_FFMPEG)
-	set(FFMPEG ${LIBDIR}/ffmpeg)
-	set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
-	set(FFMPEG_LIBRARIES
-		avcodec avdevice avformat avutil
-		mp3lame swscale x264 xvidcore theora theoradec theoraenc vorbis vorbisenc vorbisfile ogg
-	)
-	set(FFMPEG_LIBPATH ${FFMPEG}/lib)
-endif()
-
-find_library(SYSTEMSTUBS_LIBRARY
-	NAMES
-	SystemStubs
-	PATHS
-)
-mark_as_advanced(SYSTEMSTUBS_LIBRARY)
-if(SYSTEMSTUBS_LIBRARY)
-	list(APPEND PLATFORM_LINKLIBS SystemStubs)
-endif()
-
-set(PLATFORM_CFLAGS "-pipe -funsigned-char")
-set(PLATFORM_LINKFLAGS
-	"-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Cocoa -framework Carbon -framework AudioUnit -framework AudioToolbox -framework CoreAudio"
-)
-if(WITH_CODEC_QUICKTIME)
-	set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QTKit")
-	if(CMAKE_OSX_ARCHITECTURES MATCHES i386)
-		set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime")
-		# libSDL still needs 32bit carbon quicktime
-	endif()
-endif()
-
-if(WITH_CXX11)
-	list(APPEND PLATFORM_LINKLIBS c++)
-else()
-	list(APPEND PLATFORM_LINKLIBS stdc++)
-endif()
-
-if(WITH_JACK)
-	set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -F/Library/Frameworks -weak_framework jackmp")
-endif()
-
-if(WITH_PYTHON_MODULE OR WITH_PYTHON_FRAMEWORK)
-	# force cmake to link right framework
-	set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/Python")
-endif()
-
-if(WITH_OPENCOLLADA)
-	set(OPENCOLLADA ${LIBDIR}/opencollada)
-
-	set(OPENCOLLADA_INCLUDE_DIRS
-		${LIBDIR}/opencollada/include/COLLADAStreamWriter
-		${LIBDIR}/opencollada/include/COLLADABaseUtils
-		${LIBDIR}/opencollada/include/COLLADAFramework
-		${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader
-		${LIBDIR}/opencollada/include/GeneratedSaxParser
-	)
-
-	set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
-	set(OPENCOLLADA_LIBRARIES
-		OpenCOLLADASaxFrameworkLoader
-		-lOpenCOLLADAFramework
-		-lOpenCOLLADABaseUtils
-		-lOpenCOLLADAStreamWriter
-		-lMathMLSolver
-		-lGeneratedSaxParser
-		-lxml2 -lbuffer -lftoa
-	)
-	# Use UTF functions from collada if LLVM is not enabled
-	if(NOT WITH_LLVM)
-		list(APPEND OPENCOLLADA_LIBRARIES -lUTF)
-	endif()
-	# pcre is bundled with openCollada
-	#set(PCRE ${LIBDIR}/pcre)
-	#set(PCRE_LIBPATH ${PCRE}/lib)
-	set(PCRE_LIBRARIES pcre)
-	#libxml2 is used
-	#set(EXPAT ${LIBDIR}/expat)
-	#set(EXPAT_LIBPATH ${EXPAT}/lib)
-	set(EXPAT_LIB)
-endif()
-
-if(WITH_SDL)
-	set(SDL ${LIBDIR}/sdl)
-	set(SDL_INCLUDE_DIR ${SDL}/include)
-	set(SDL_LIBRARY SDL2)
-	set(SDL_LIBPATH ${SDL}/lib)
-	set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -lazy_framework ForceFeedback")
-endif()
-
-set(PNG "${LIBDIR}/png")
-set(PNG_INCLUDE_DIRS "${PNG}/include")
-set(PNG_LIBPATH ${PNG}/lib)
-
-set(JPEG "${LIBDIR}/jpeg")
-set(JPEG_INCLUDE_DIR "${JPEG}/include")
-set(JPEG_LIBPATH ${JPEG}/lib)
-
-if(WITH_IMAGE_TIFF)
-	set(TIFF ${LIBDIR}/tiff)
-	set(TIFF_INCLUDE_DIR ${TIFF}/include)
-	set(TIFF_LIBRARY tiff)
-	set(TIFF_LIBPATH ${TIFF}/lib)
-endif()
-
-if(WITH_BOOST)
-	set(BOOST ${LIBDIR}/boost)
-	set(BOOST_INCLUDE_DIR ${BOOST}/include)
-	set(BOOST_LIBRARIES
-		boost_date_time-mt
-		boost_filesystem-mt
-		boost_regex-mt
-		boost_system-mt
-		boost_thread-mt
-		boost_wave-mt
-	)
-	if(WITH_INTERNATIONAL)
-		list(APPEND BOOST_LIBRARIES boost_locale-mt)
-	endif()
-	if(WITH_CYCLES_NETWORK)
-		list(APPEND BOOST_LIBRARIES boost_serialization-mt)
-	endif()
-	if(WITH_OPENVDB)
-		list(APPEND BOOST_LIBRARIES boost_iostreams-mt)
-	endif()
-	set(BOOST_LIBPATH ${BOOST}/lib)
-	set(BOOST_DEFINITIONS)
-endif()
-
-if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG)
-	set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -liconv") # boost_locale and ffmpeg needs it !
-endif()
-
-if(WITH_OPENIMAGEIO)
-	set(OPENIMAGEIO ${LIBDIR}/openimageio)
-	set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
-	set(OPENIMAGEIO_LIBRARIES
-		${OPENIMAGEIO}/lib/libOpenImageIO.a
-		${PNG_LIBRARIES}
-		${JPEG_LIBRARIES}
-		${TIFF_LIBRARY}
-		${OPENEXR_LIBRARIES}
-		${ZLIB_LIBRARIES}
-	)
-	set(OPENIMAGEIO_LIBPATH
-		${OPENIMAGEIO}/lib
-		${JPEG_LIBPATH}
-		${PNG_LIBPATH}
-		${TIFF_LIBPATH}
-		${OPENEXR_LIBPATH}
-		${ZLIB_LIBPATH}
-	)
-	set(OPENIMAGEIO_DEFINITIONS "-DOIIO_STATIC_BUILD")
-	set(OPENIMAGEIO_IDIFF "${LIBDIR}/openimageio/bin/idiff")
-endif()
-
-if(WITH_OPENCOLORIO)
-	set(OPENCOLORIO ${LIBDIR}/opencolorio)
-	set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
-	set(OPENCOLORIO_LIBRARIES OpenColorIO tinyxml yaml-cpp)
-	set(OPENCOLORIO_LIBPATH ${OPENCOLORIO}/lib)
-endif()
-
-if(WITH_OPENVDB)
-	set(OPENVDB ${LIBDIR}/openvdb)
-	set(OPENVDB_INCLUDE_DIRS ${OPENVDB}/include)
-	set(TBB_INCLUDE_DIRS ${LIBDIR}/tbb/include)
-	set(TBB_LIBRARIES ${LIBDIR}/tbb/lib/libtbb.a)
-	set(OPENVDB_LIBRARIES openvdb blosc ${TBB_LIBRARIES})
-	set(OPENVDB_LIBPATH ${LIBDIR}/openvdb/lib)
-	set(OPENVDB_DEFINITIONS)
-endif()
-
-if(WITH_LLVM)
-	set(LLVM_ROOT_DIR ${LIBDIR}/llvm CACHE PATH	"Path to the LLVM installation")
-	set(LLVM_VERSION "3.4" CACHE STRING	"Version of LLVM to use")
-	if(EXISTS "${LLVM_ROOT_DIR}/bin/llvm-config")
-		set(LLVM_CONFIG "${LLVM_ROOT_DIR}/bin/llvm-config")
-	else()
-		set(LLVM_CONFIG llvm-config)
-	endif()
-	execute_process(COMMAND ${LLVM_CONFIG} --version
-			OUTPUT_VARIABLE LLVM_VERSION
-			OUTPUT_STRIP_TRAILING_WHITESPACE)
-	execute_process(COMMAND ${LLVM_CONFIG} --prefix
-			OUTPUT_VARIABLE LLVM_ROOT_DIR
-			OUTPUT_STRIP_TRAILING_WHITESPACE)
-	execute_process(COMMAND ${LLVM_CONFIG} --libdir
-			OUTPUT_VARIABLE LLVM_LIBPATH
-			OUTPUT_STRIP_TRAILING_WHITESPACE)
-	find_library(LLVM_LIBRARY
-		      NAMES LLVMAnalysis # first of a whole bunch of libs to get
-		      PATHS ${LLVM_LIBPATH})
-
-	if(LLVM_LIBRARY AND LLVM_ROOT_DIR AND LLVM_LIBPATH)
-		if(LLVM_STATIC)
-			# if static LLVM libraries were requested, use llvm-config to generate
-			# the list of what libraries we need, and substitute that in the right
-			# way for LLVM_LIBRARY.
-			execute_process(COMMAND ${LLVM_CONFIG} --libfiles
-					OUTPUT_VARIABLE LLVM_LIBRARY
-					OUTPUT_STRIP_TRAILING_WHITESPACE)
-			string(REPLACE " " ";" LLVM_LIBRARY ${LLVM_LIBRARY})
-		else()
-			set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -lLLVM-3.4")
-		endif()
-	else()
-		message(FATAL_ERROR "LLVM not found.")
-	endif()
-endif()
-
-if(WITH_CYCLES_OSL)
-	set(CYCLES_OSL ${LIBDIR}/osl CACHE PATH "Path to OpenShadingLanguage installation")
-
-	find_library(OSL_LIB_EXEC NAMES oslexec PATHS ${CYCLES_OSL}/lib)
-	find_library(OSL_LIB_COMP NAMES oslcomp PATHS ${CYCLES_OSL}/lib)
-	find_library(OSL_LIB_QUERY NAMES oslquery PATHS ${CYCLES_OSL}/lib)
-	# WARNING! depends on correct order of OSL libs linking
-	list(APPEND OSL_LIBRARIES ${OSL_LIB_COMP} -force_load ${OSL_LIB_EXEC} ${OSL_LIB_QUERY})
-	find_path(OSL_INCLUDE_DIR OSL/oslclosure.h PATHS ${CYCLES_OSL}/include)
-	find_program(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin)
-
-	if(OSL_INCLUDE_DIR AND OSL_LIBRARIES AND OSL_COMPILER)
-		set(OSL_FOUND TRUE)
-	else()
-		message(STATUS "OSL not found")
-		set(WITH_CYCLES_OSL OFF)
-	endif()
-endif()
-
-if(WITH_OPENMP)
-	execute_process(COMMAND ${CMAKE_C_COMPILER} --version OUTPUT_VARIABLE COMPILER_VENDOR)
-	string(SUBSTRING "${COMPILER_VENDOR}" 0 5 VENDOR_NAME) # truncate output
-	if(${VENDOR_NAME} MATCHES "Apple") # Apple does not support OpenMP reliable with gcc and not with clang
-		set(WITH_OPENMP OFF)
-	else() # vanilla gcc or clang_omp support OpenMP
-		message(STATUS "Using special OpenMP enabled compiler !") # letting find_package(OpenMP) module work for gcc
-		if(CMAKE_C_COMPILER_ID MATCHES "Clang") # clang-omp in darwin libs
-			set(OPENMP_FOUND ON)
-			set(OpenMP_C_FLAGS "-fopenmp" CACHE STRING "C compiler flags for OpenMP parallization" FORCE)
-			set(OpenMP_CXX_FLAGS "-fopenmp" CACHE STRING "C++ compiler flags for OpenMP parallization" FORCE)
-			include_directories(${LIBDIR}/openmp/include)
-			link_directories(${LIBDIR}/openmp/lib)
-			# This is a workaround for our helperbinaries ( datatoc, masgfmt, ... ),
-			# They are linked also to omp lib, so we need it in builddir for runtime exexcution,
-			# TODO: remove all unneeded dependencies from these
-
-			# for intermediate binaries, in respect to lib ID
-			execute_process(
-				COMMAND ditto -arch ${CMAKE_OSX_ARCHITECTURES}
-				${LIBDIR}/openmp/lib/libiomp5.dylib
-				${CMAKE_BINARY_DIR}/Resources/lib/libiomp5.dylib)
-		endif()
-	endif()
-endif()
-
-set(EXETYPE MACOSX_BUNDLE)
-
-set(CMAKE_C_FLAGS_DEBUG "-fno-strict-aliasing -g")
-set(CMAKE_CXX_FLAGS_DEBUG "-fno-strict-aliasing -g")
-if(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64" OR CMAKE_OSX_ARCHITECTURES MATCHES "i386")
-	set(CMAKE_CXX_FLAGS_RELEASE "-O2 -mdynamic-no-pic -msse -msse2 -msse3 -mssse3")
-	set(CMAKE_C_FLAGS_RELEASE "-O2 -mdynamic-no-pic  -msse -msse2 -msse3 -mssse3")
-	if(NOT CMAKE_C_COMPILER_ID MATCHES "Clang")
-		set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -ftree-vectorize  -fvariable-expansion-in-unroller")
-		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -ftree-vectorize  -fvariable-expansion-in-unroller")
-	endif()
-else()
-	set(CMAKE_C_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing")
-	set(CMAKE_CXX_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing")
-endif()
-
-if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5)
-	# Xcode 5 is always using CLANG, which has too low template depth of 128 for libmv
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth=1024")
-endif()
-# Get rid of eventually clashes, we export some symbols explicite as local
-set(PLATFORM_LINKFLAGS
-	"${PLATFORM_LINKFLAGS} -Xlinker -unexported_symbols_list -Xlinker ${CMAKE_SOURCE_DIR}/source/creator/osx_locals.map"
-)
-
-if(WITH_CXX11)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
-	set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -stdlib=libc++")
-endif()
-
-# Suppress ranlib "has no symbols" warnings (workaround for T48250)
-set(CMAKE_C_ARCHIVE_CREATE   "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>")
-set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>")
-set(CMAKE_C_ARCHIVE_FINISH   "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
-set(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")

build_files/cmake/platform/platform_unix.cmake

@@ -1,426 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# The Original Code is Copyright (C) 2016, Blender Foundation
-# All rights reserved.
-#
-# Contributor(s): Sergey Sharybin.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-# Libraries configuration for any *nix system including Linux and Unix.
-
-macro(find_package_wrapper)
-	if(WITH_STATIC_LIBS)
-		find_package_static(${ARGV})
-	else()
-		find_package(${ARGV})
-	endif()
-endmacro()
-
-find_package_wrapper(JPEG REQUIRED)
-find_package_wrapper(PNG REQUIRED)
-find_package_wrapper(ZLIB REQUIRED)
-find_package_wrapper(Freetype REQUIRED)
-
-if(WITH_LZO AND WITH_SYSTEM_LZO)
-	find_package_wrapper(LZO)
-	if(NOT LZO_FOUND)
-		message(FATAL_ERROR "Failed finding system LZO version!")
-	endif()
-endif()
-
-if(WITH_SYSTEM_EIGEN3)
-	find_package_wrapper(Eigen3)
-	if(NOT EIGEN3_FOUND)
-		message(FATAL_ERROR "Failed finding system Eigen3 version!")
-	endif()
-endif()
-# else values are set below for all platforms
-
-if(WITH_PYTHON)
-	# No way to set py35, remove for now.
-	# find_package(PythonLibs)
-
-	# Use our own instead, since without py is such a rare case,
-	# require this package
-	# XXX Linking errors with debian static python :/
-#		find_package_wrapper(PythonLibsUnix REQUIRED)
-	find_package(PythonLibsUnix REQUIRED)
-endif()
-
-if(WITH_IMAGE_OPENEXR)
-	find_package_wrapper(OpenEXR)  # our own module
-	if(NOT OPENEXR_FOUND)
-		set(WITH_IMAGE_OPENEXR OFF)
-	endif()
-endif()
-
-if(WITH_IMAGE_OPENJPEG)
-	find_package_wrapper(OpenJPEG)
-	if(NOT OPENJPEG_FOUND)
-		set(WITH_IMAGE_OPENJPEG OFF)
-	endif()
-endif()
-
-if(WITH_IMAGE_TIFF)
-	# XXX Linking errors with debian static tiff :/
-#		find_package_wrapper(TIFF)
-	find_package(TIFF)
-	if(NOT TIFF_FOUND)
-		set(WITH_IMAGE_TIFF OFF)
-	endif()
-endif()
-
-# Audio IO
-if(WITH_SYSTEM_AUDASPACE)
-	find_package_wrapper(Audaspace)
-	if(NOT AUDASPACE_FOUND OR NOT AUDASPACE_C_FOUND)
-		message(FATAL_ERROR "Audaspace external library not found!")
-	endif()
-endif()
-
-if(WITH_OPENAL)
-	find_package_wrapper(OpenAL)
-	if(NOT OPENAL_FOUND)
-		set(WITH_OPENAL OFF)
-	endif()
-endif()
-
-if(WITH_SDL)
-	if(WITH_SDL_DYNLOAD)
-		set(SDL_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/extern/sdlew/include/SDL2")
-		set(SDL_LIBRARY)
-	else()
-		find_package_wrapper(SDL2)
-		if(SDL2_FOUND)
-			# Use same names for both versions of SDL until we move to 2.x.
-			set(SDL_INCLUDE_DIR "${SDL2_INCLUDE_DIR}")
-			set(SDL_LIBRARY "${SDL2_LIBRARY}")
-			set(SDL_FOUND "${SDL2_FOUND}")
-		else()
-			find_package_wrapper(SDL)
-		endif()
-		mark_as_advanced(
-			SDL_INCLUDE_DIR
-			SDL_LIBRARY
-		)
-		# unset(SDLMAIN_LIBRARY CACHE)
-		if(NOT SDL_FOUND)
-			set(WITH_SDL OFF)
-		endif()
-	endif()
-endif()
-
-if(WITH_JACK)
-	find_package_wrapper(Jack)
-	if(NOT JACK_FOUND)
-		set(WITH_JACK OFF)
-	endif()
-endif()
-
-# Codecs
-if(WITH_CODEC_SNDFILE)
-	find_package_wrapper(SndFile)
-	if(NOT SNDFILE_FOUND)
-		set(WITH_CODEC_SNDFILE OFF)
-	endif()
-endif()
-
-if(WITH_CODEC_FFMPEG)
-	set(FFMPEG /usr CACHE PATH "FFMPEG Directory")
-	set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
-
-	mark_as_advanced(FFMPEG)
-
-	# lame, but until we have proper find module for ffmpeg
-	set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
-	if(EXISTS "${FFMPEG}/include/ffmpeg/")
-		list(APPEND FFMPEG_INCLUDE_DIRS "${FFMPEG}/include/ffmpeg")
-	endif()
-	# end lameness
-
-	mark_as_advanced(FFMPEG_LIBRARIES)
-	set(FFMPEG_LIBPATH ${FFMPEG}/lib)
-endif()
-
-if(WITH_FFTW3)
-	find_package_wrapper(Fftw3)
-	if(NOT FFTW3_FOUND)
-		set(WITH_FFTW3 OFF)
-	endif()
-endif()
-
-if(WITH_OPENCOLLADA)
-	find_package_wrapper(OpenCOLLADA)
-	if(OPENCOLLADA_FOUND)
-		find_package_wrapper(XML2)
-		find_package_wrapper(PCRE)
-	else()
-		set(WITH_OPENCOLLADA OFF)
-	endif()
-endif()
-
-if(WITH_MEM_JEMALLOC)
-	find_package_wrapper(JeMalloc)
-	if(NOT JEMALLOC_FOUND)
-		set(WITH_MEM_JEMALLOC OFF)
-	endif()
-endif()
-
-if(WITH_INPUT_NDOF)
-	find_package_wrapper(Spacenav)
-	if(SPACENAV_FOUND)
-		# use generic names within blenders buildsystem.
-		set(NDOF_INCLUDE_DIRS ${SPACENAV_INCLUDE_DIRS})
-		set(NDOF_LIBRARIES ${SPACENAV_LIBRARIES})
-	else()
-		set(WITH_INPUT_NDOF OFF)
-	endif()
-endif()
-
-if(WITH_CYCLES_OSL)
-	set(CYCLES_OSL ${LIBDIR}/osl CACHE PATH "Path to OpenShadingLanguage installation")
-	if(NOT OSL_ROOT)
-		set(OSL_ROOT ${CYCLES_OSL})
-	endif()
-	find_package_wrapper(OpenShadingLanguage)
-	if(OSL_FOUND)
-		if(${OSL_LIBRARY_VERSION_MAJOR} EQUAL "1" AND ${OSL_LIBRARY_VERSION_MINOR} LESS "6")
-			# Note: --whole-archive is needed to force loading of all symbols in liboslexec,
-			# otherwise LLVM is missing the osl_allocate_closure_component function
-			set(OSL_LIBRARIES
-				${OSL_OSLCOMP_LIBRARY}
-				-Wl,--whole-archive ${OSL_OSLEXEC_LIBRARY}
-				-Wl,--no-whole-archive ${OSL_OSLQUERY_LIBRARY}
-			)
-		endif()
-	else()
-		message(STATUS "OSL not found, disabling it from Cycles")
-		set(WITH_CYCLES_OSL OFF)
-	endif()
-endif()
-
-if(WITH_OPENVDB)
-	find_package_wrapper(OpenVDB)
-	find_package_wrapper(TBB)
-	if(NOT OPENVDB_FOUND OR NOT TBB_FOUND)
-		set(WITH_OPENVDB OFF)
-		set(WITH_OPENVDB_BLOSC OFF)
-		message(STATUS "OpenVDB not found, disabling it")
-	endif()
-endif()
-
-if(WITH_ALEMBIC)
-	find_package_wrapper(Alembic)
-
-	if(WITH_ALEMBIC_HDF5)
-		set(HDF5_ROOT_DIR ${LIBDIR}/hdf5)
-		find_package_wrapper(HDF5)
-	endif()
-
-	if(NOT ALEMBIC_FOUND OR (WITH_ALEMBIC_HDF5 AND NOT HDF5_FOUND))
-		set(WITH_ALEMBIC OFF)
-		set(WITH_ALEMBIC_HDF5 OFF)
-	endif()
-endif()
-
-if(WITH_BOOST)
-	# uses in build instructions to override include and library variables
-	if(NOT BOOST_CUSTOM)
-		if(WITH_STATIC_LIBS)
-			set(Boost_USE_STATIC_LIBS ON)
-		endif()
-		set(Boost_USE_MULTITHREADED ON)
-		set(__boost_packages filesystem regex thread date_time)
-		if(WITH_CYCLES_OSL)
-			if(NOT (${OSL_LIBRARY_VERSION_MAJOR} EQUAL "1" AND ${OSL_LIBRARY_VERSION_MINOR} LESS "6"))
-				list(APPEND __boost_packages wave)
-			else()
-			endif()
-		endif()
-		if(WITH_INTERNATIONAL)
-			list(APPEND __boost_packages locale)
-		endif()
-		if(WITH_CYCLES_NETWORK)
-			list(APPEND __boost_packages serialization)
-		endif()
-		if(WITH_OPENVDB)
-			list(APPEND __boost_packages iostreams)
-		endif()
-		list(APPEND __boost_packages system)
-		find_package(Boost 1.48 COMPONENTS ${__boost_packages})
-		if(NOT Boost_FOUND)
-			# try to find non-multithreaded if -mt not found, this flag
-			# doesn't matter for us, it has nothing to do with thread
-			# safety, but keep it to not disturb build setups
-			set(Boost_USE_MULTITHREADED OFF)
-			find_package(Boost 1.48 COMPONENTS ${__boost_packages})
-		endif()
-		unset(__boost_packages)
-		if(Boost_USE_STATIC_LIBS AND WITH_BOOST_ICU)
-			find_package(IcuLinux)
-		endif()
-		mark_as_advanced(Boost_DIR)  # why doesnt boost do this?
-	endif()
-
-	set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS})
-	set(BOOST_LIBRARIES ${Boost_LIBRARIES})
-	set(BOOST_LIBPATH ${Boost_LIBRARY_DIRS})
-	set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
-endif()
-
-if(WITH_OPENIMAGEIO)
-	find_package_wrapper(OpenImageIO)
-	if(NOT OPENIMAGEIO_PUGIXML_FOUND AND WITH_CYCLES_STANDALONE)
-		find_package_wrapper(PugiXML)
-	else()
-		set(PUGIXML_INCLUDE_DIR "${OPENIMAGEIO_INCLUDE_DIR/OpenImageIO}")
-		set(PUGIXML_LIBRARIES "")
-	endif()
-
-	set(OPENIMAGEIO_LIBRARIES
-		${OPENIMAGEIO_LIBRARIES}
-		${PNG_LIBRARIES}
-		${JPEG_LIBRARIES}
-		${ZLIB_LIBRARIES}
-		${BOOST_LIBRARIES}
-	)
-	set(OPENIMAGEIO_LIBPATH)  # TODO, remove and reference the absolute path everywhere
-	set(OPENIMAGEIO_DEFINITIONS "")
-
-	if(WITH_IMAGE_TIFF)
-		list(APPEND OPENIMAGEIO_LIBRARIES "${TIFF_LIBRARY}")
-	endif()
-	if(WITH_IMAGE_OPENEXR)
-		list(APPEND OPENIMAGEIO_LIBRARIES "${OPENEXR_LIBRARIES}")
-	endif()
-
-	if(NOT OPENIMAGEIO_FOUND)
-		set(WITH_OPENIMAGEIO OFF)
-		message(STATUS "OpenImageIO not found, disabling WITH_CYCLES")
-	endif()
-endif()
-
-if(WITH_OPENCOLORIO)
-	find_package_wrapper(OpenColorIO)
-
-	set(OPENCOLORIO_LIBRARIES ${OPENCOLORIO_LIBRARIES})
-	set(OPENCOLORIO_LIBPATH)  # TODO, remove and reference the absolute path everywhere
-	set(OPENCOLORIO_DEFINITIONS)
-
-	if(NOT OPENCOLORIO_FOUND)
-		set(WITH_OPENCOLORIO OFF)
-		message(STATUS "OpenColorIO not found")
-	endif()
-endif()
-
-if(WITH_LLVM)
-	find_package_wrapper(LLVM)
-
-	if(NOT LLVM_FOUND)
-		set(WITH_LLVM OFF)
-		message(STATUS "LLVM not found")
-	endif()
-endif()
-
-if(WITH_LLVM OR WITH_SDL_DYNLOAD)
-	# Fix for conflict with Mesa llvmpipe
-	set(PLATFORM_LINKFLAGS
-		"${PLATFORM_LINKFLAGS} -Wl,--version-script='${CMAKE_SOURCE_DIR}/source/creator/blender.map'"
-	)
-endif()
-
-if(WITH_OPENSUBDIV)
-	find_package_wrapper(OpenSubdiv)
-
-	set(OPENSUBDIV_LIBRARIES ${OPENSUBDIV_LIBRARIES})
-	set(OPENSUBDIV_LIBPATH)  # TODO, remove and reference the absolute path everywhere
-
-	if(NOT OPENSUBDIV_FOUND)
-		set(WITH_OPENSUBDIV OFF)
-		message(STATUS "OpenSubdiv not found")
-	endif()
-endif()
-
-# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
-list(APPEND PLATFORM_LINKLIBS -lutil -lc -lm)
-
-find_package(Threads REQUIRED)
-list(APPEND PLATFORM_LINKLIBS ${CMAKE_THREAD_LIBS_INIT})
-# used by other platforms
-set(PTHREADS_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
-
-if(CMAKE_DL_LIBS)
-	list(APPEND PLATFORM_LINKLIBS ${CMAKE_DL_LIBS})
-endif()
-
-if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-	if(NOT WITH_PYTHON_MODULE)
-		# binreloc is linux only
-		set(BINRELOC_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/binreloc/include)
-		set(WITH_BINRELOC ON)
-	endif()
-endif()
-
-# lfs on glibc, all compilers should use
-add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
-
-# GNU Compiler
-if(CMAKE_COMPILER_IS_GNUCC)
-	set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
-
-	# use ld.gold linker if available, could make optional
-	execute_process(
-		COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version
-		ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
-	if("${LD_VERSION}" MATCHES "GNU gold")
-		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fuse-ld=gold")
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=gold")
-	else()
-		message(STATUS "GNU gold linker isn't available, using the default system linker.")
-	endif()
-	unset(LD_VERSION)
-
-# CLang is the same as GCC for now.
-elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
-	set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
-# Solaris CC
-elseif(CMAKE_C_COMPILER_ID MATCHES "SunPro")
-	set(PLATFORM_CFLAGS "-pipe -features=extensions -fPIC -D__FUNCTION__=__func__")
-
-# Intel C++ Compiler
-elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
-	# think these next two are broken
-	find_program(XIAR xiar)
-	if(XIAR)
-		set(CMAKE_AR "${XIAR}")
-	endif()
-	mark_as_advanced(XIAR)
-
-	find_program(XILD xild)
-	if(XILD)
-		set(CMAKE_LINKER "${XILD}")
-	endif()
-	mark_as_advanced(XILD)
-
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fp-model precise -prec_div -parallel")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fp-model precise -prec_div -parallel")
-
-	# set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -diag-enable sc3")
-	set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
-	set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -static-intel")
-endif()

build_files/cmake/platform/platform_win32.cmake

@@ -1,87 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# The Original Code is Copyright (C) 2016, Blender Foundation
-# All rights reserved.
-#
-# Contributor(s): Sergey Sharybin.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-# Libraries configuration for Windows.
-
-add_definitions(-DWIN32)
-
-if(MSVC)
-	include(platform_win32_msvc)
-elseif(CMAKE_COMPILER_IS_GNUCC)
-	include(platform_win32_mingw)
-endif()
-
-# Things common to both mingw and MSVC  should go here
-
-set(WINTAB_INC ${LIBDIR}/wintab/include)
-
-if(WITH_OPENAL)
-	set(OPENAL ${LIBDIR}/openal)
-	set(OPENALDIR ${LIBDIR}/openal)
-	set(OPENAL_INCLUDE_DIR ${OPENAL}/include)
-	if(MSVC)
-		set(OPENAL_LIBRARY openal32)
-	else()
-		set(OPENAL_LIBRARY wrap_oal)
-	endif()
-	set(OPENAL_LIBPATH ${OPENAL}/lib)
-endif()
-
-if(WITH_CODEC_SNDFILE)
-	set(SNDFILE ${LIBDIR}/sndfile)
-	set(SNDFILE_INCLUDE_DIRS ${SNDFILE}/include)
-	set(SNDFILE_LIBRARIES libsndfile-1)
-	set(SNDFILE_LIBPATH ${SNDFILE}/lib) # TODO, deprecate
-endif()
-
-if(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
-	add_definitions(-D__SSE__ -D__MMX__)
-endif()
-
-if(WITH_CYCLES_OSL)
-	set(CYCLES_OSL ${LIBDIR}/osl CACHE PATH "Path to OpenShadingLanguage installation")
-
-	find_library(OSL_LIB_EXEC NAMES oslexec PATHS ${CYCLES_OSL}/lib)
-	find_library(OSL_LIB_COMP NAMES oslcomp PATHS ${CYCLES_OSL}/lib)
-	find_library(OSL_LIB_QUERY NAMES oslquery PATHS ${CYCLES_OSL}/lib)
-	find_library(OSL_LIB_EXEC_DEBUG NAMES oslexec_d PATHS ${CYCLES_OSL}/lib)
-	find_library(OSL_LIB_COMP_DEBUG NAMES oslcomp_d PATHS ${CYCLES_OSL}/lib)
-	find_library(OSL_LIB_QUERY_DEBUG NAMES oslquery_d PATHS ${CYCLES_OSL}/lib)
-	list(APPEND OSL_LIBRARIES
-		optimized ${OSL_LIB_COMP}
-		optimized ${OSL_LIB_EXEC}
-		optimized ${OSL_LIB_QUERY}
-		debug ${OSL_LIB_EXEC_DEBUG}
-		debug ${OSL_LIB_COMP_DEBUG}
-		debug ${OSL_LIB_QUERY_DEBUG}
-	)
-	find_path(OSL_INCLUDE_DIR OSL/oslclosure.h PATHS ${CYCLES_OSL}/include)
-	find_program(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin)
-
-	if(OSL_INCLUDE_DIR AND OSL_LIBRARIES AND OSL_COMPILER)
-		set(OSL_FOUND TRUE)
-	else()
-		message(STATUS "OSL not found")
-		set(WITH_CYCLES_OSL OFF)
-	endif()
-endif()

build_files/cmake/platform/platform_win32_mingw.cmake

@@ -1,302 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# The Original Code is Copyright (C) 2016, Blender Foundation
-# All rights reserved.
-#
-# Contributor(s): Sergey Sharybin.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-# Libraries configuration for Windows when compiling with MinGW.
-
-# keep GCC specific stuff here
-include(CheckCSourceCompiles)
-# Setup 64bit and 64bit windows systems
-CHECK_C_SOURCE_COMPILES("
-	#ifndef __MINGW64__
-	#error
-	#endif
-	int main(void) { return 0; }
-	"
-	WITH_MINGW64
-)
-
-if(NOT DEFINED LIBDIR)
-	if(WITH_MINGW64)
-		message(STATUS "Compiling for 64 bit with MinGW-w64.")
-		set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw64)
-	else()
-		message(STATUS "Compiling for 32 bit with MinGW-w32.")
-		set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw32)
-
-		if(WITH_RAYOPTIMIZATION)
-			message(WARNING "MinGW-w32 is known to be unstable with 'WITH_RAYOPTIMIZATION' option enabled.")
-		endif()
-	endif()
-else()
-	message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")
-endif()
-if(NOT EXISTS "${LIBDIR}/")
-	message(FATAL_ERROR "Windows requires pre-compiled libs at: '${LIBDIR}'")
-endif()
-
-list(APPEND PLATFORM_LINKLIBS
-	-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32
-	-lz -lstdc++ -lole32 -luuid -lwsock32 -lpsapi -ldbghelp
-)
-
-if(WITH_INPUT_IME)
-	list(APPEND PLATFORM_LINKLIBS -limm32)
-endif()
-
-set(PLATFORM_CFLAGS "-pipe -funsigned-char -fno-strict-aliasing")
-
-if(WITH_MINGW64)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
-	list(APPEND PLATFORM_LINKLIBS -lpthread)
-
-	add_definitions(-DFREE_WINDOWS64 -DMS_WIN64)
-endif()
-
-add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
-
-add_definitions(-DFREE_WINDOWS)
-
-set(PNG "${LIBDIR}/png")
-set(PNG_INCLUDE_DIRS "${PNG}/include")
-set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
-
-if(WITH_MINGW64)
-	set(JPEG_LIBRARIES jpeg)
-else()
-	set(JPEG_LIBRARIES libjpeg)
-endif()
-set(PNG_LIBRARIES png)
-
-set(ZLIB ${LIBDIR}/zlib)
-set(ZLIB_INCLUDE_DIRS ${ZLIB}/include)
-set(ZLIB_LIBPATH ${ZLIB}/lib)
-set(ZLIB_LIBRARIES z)
-
-set(JPEG "${LIBDIR}/jpeg")
-set(JPEG_INCLUDE_DIR "${JPEG}/include")
-set(JPEG_LIBPATH ${JPEG}/lib) # not cmake defined
-
-# comes with own pthread library
-if(NOT WITH_MINGW64)
-	set(PTHREADS ${LIBDIR}/pthreads)
-	#set(PTHREADS_INCLUDE_DIRS ${PTHREADS}/include)
-	set(PTHREADS_LIBPATH ${PTHREADS}/lib)
-	set(PTHREADS_LIBRARIES pthreadGC2)
-endif()
-
-set(FREETYPE ${LIBDIR}/freetype)
-set(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include ${FREETYPE}/include/freetype2)
-set(FREETYPE_LIBPATH ${FREETYPE}/lib)
-set(FREETYPE_LIBRARY freetype)
-
-if(WITH_FFTW3)
-	set(FFTW3 ${LIBDIR}/fftw3)
-	set(FFTW3_LIBRARIES fftw3)
-	set(FFTW3_INCLUDE_DIRS ${FFTW3}/include)
-	set(FFTW3_LIBPATH ${FFTW3}/lib)
-endif()
-
-if(WITH_OPENCOLLADA)
-	set(OPENCOLLADA ${LIBDIR}/opencollada)
-	set(OPENCOLLADA_INCLUDE_DIRS
-		${OPENCOLLADA}/include/opencollada/COLLADAStreamWriter
-		${OPENCOLLADA}/include/opencollada/COLLADABaseUtils
-		${OPENCOLLADA}/include/opencollada/COLLADAFramework
-		${OPENCOLLADA}/include/opencollada/COLLADASaxFrameworkLoader
-		${OPENCOLLADA}/include/opencollada/GeneratedSaxParser
-	)
-	set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib/opencollada)
-	set(OPENCOLLADA_LIBRARIES
-		OpenCOLLADAStreamWriter
-		OpenCOLLADASaxFrameworkLoader
-		OpenCOLLADAFramework
-		OpenCOLLADABaseUtils
-		GeneratedSaxParser
-		UTF MathMLSolver buffer ftoa xml
-	)
-	set(PCRE_LIBRARIES pcre)
-endif()
-
-if(WITH_CODEC_FFMPEG)
-	set(FFMPEG ${LIBDIR}/ffmpeg)
-	set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
-	if(WITH_MINGW64)
-		set(FFMPEG_LIBRARIES avcodec.dll avformat.dll avdevice.dll avutil.dll swscale.dll swresample.dll)
-	else()
-		set(FFMPEG_LIBRARIES avcodec-55 avformat-55 avdevice-55 avutil-52 swscale-2)
-	endif()
-	set(FFMPEG_LIBPATH ${FFMPEG}/lib)
-endif()
-
-if(WITH_IMAGE_OPENEXR)
-	set(OPENEXR ${LIBDIR}/openexr)
-	set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
-	set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
-	set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread Iex)
-	set(OPENEXR_LIBPATH ${OPENEXR}/lib)
-endif()
-
-if(WITH_IMAGE_TIFF)
-	set(TIFF ${LIBDIR}/tiff)
-	set(TIFF_LIBRARY tiff)
-	set(TIFF_INCLUDE_DIR ${TIFF}/include)
-	set(TIFF_LIBPATH ${TIFF}/lib)
-endif()
-
-if(WITH_JACK)
-	set(JACK ${LIBDIR}/jack)
-	set(JACK_INCLUDE_DIRS ${JACK}/include/jack ${JACK}/include)
-	set(JACK_LIBRARIES jack)
-	set(JACK_LIBPATH ${JACK}/lib)
-
-	# TODO, gives linking errors, force off
-	set(WITH_JACK OFF)
-endif()
-
-if(WITH_PYTHON)
-	# normally cached but not since we include them with blender
-	set(PYTHON_VERSION 3.5) #  CACHE STRING)
-	string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
-	set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}")  # CACHE PATH)
-	set(PYTHON_LIBRARY "${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}mw.lib")  # CACHE FILEPATH)
-	unset(_PYTHON_VERSION_NO_DOTS)
-
-	# uncached vars
-	set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
-	set(PYTHON_LIBRARIES  "${PYTHON_LIBRARY}")
-endif()
-
-if(WITH_BOOST)
-	set(BOOST ${LIBDIR}/boost)
-	set(BOOST_INCLUDE_DIR ${BOOST}/include)
-	if(WITH_MINGW64)
-		set(BOOST_POSTFIX "mgw47-mt-s-1_49")
-		set(BOOST_DEBUG_POSTFIX "mgw47-mt-sd-1_49")
-	else()
-		set(BOOST_POSTFIX "mgw46-mt-s-1_49")
-		set(BOOST_DEBUG_POSTFIX "mgw46-mt-sd-1_49")
-	endif()
-	set(BOOST_LIBRARIES
-		optimized boost_date_time-${BOOST_POSTFIX} boost_filesystem-${BOOST_POSTFIX}
-		boost_regex-${BOOST_POSTFIX}
-		boost_system-${BOOST_POSTFIX} boost_thread-${BOOST_POSTFIX}
-		debug boost_date_time-${BOOST_DEBUG_POSTFIX} boost_filesystem-${BOOST_DEBUG_POSTFIX}
-		boost_regex-${BOOST_DEBUG_POSTFIX}
-		boost_system-${BOOST_DEBUG_POSTFIX} boost_thread-${BOOST_DEBUG_POSTFIX})
-	if(WITH_INTERNATIONAL)
-		set(BOOST_LIBRARIES ${BOOST_LIBRARIES}
-			optimized boost_locale-${BOOST_POSTFIX}
-			debug boost_locale-${BOOST_DEBUG_POSTFIX}
-		)
-	endif()
-	if(WITH_CYCLES_OSL)
-		set(BOOST_LIBRARIES ${BOOST_LIBRARIES}
-			optimized boost_wave-${BOOST_POSTFIX}
-			debug boost_wave-${BOOST_DEBUG_POSTFIX}
-		)
-	endif()
-	set(BOOST_LIBPATH ${BOOST}/lib)
-	set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB -DBOOST_THREAD_USE_LIB ")
-endif()
-
-if(WITH_OPENIMAGEIO)
-	set(OPENIMAGEIO ${LIBDIR}/openimageio)
-	set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
-	set(OPENIMAGEIO_LIBRARIES OpenImageIO)
-	set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
-	set(OPENIMAGEIO_DEFINITIONS "")
-	set(OPENIMAGEIO_IDIFF "${OPENIMAGEIO}/bin/idiff.exe")
-endif()
-
-if(WITH_LLVM)
-	set(LLVM_ROOT_DIR ${LIBDIR}/llvm CACHE PATH	"Path to the LLVM installation")
-	set(LLVM_LIBPATH ${LLVM_ROOT_DIR}/lib)
-	# Explicitly set llvm lib order.
-	#---- WARNING ON GCC ORDER OF LIBS IS IMPORTANT, DO NOT CHANGE! ---------
-	set(LLVM_LIBRARY LLVMSelectionDAG LLVMCodeGen LLVMScalarOpts LLVMAnalysis LLVMArchive
-		LLVMAsmParser LLVMAsmPrinter
-		LLVMBitReader LLVMBitWriter
-		LLVMDebugInfo LLVMExecutionEngine
-		LLVMInstCombine LLVMInstrumentation
-		LLVMInterpreter LLVMJIT
-		LLVMLinker LLVMMC
-		LLVMMCDisassembler LLVMMCJIT
-		LLVMMCParser LLVMObject
-		LLVMRuntimeDyld
-		LLVMSupport
-		LLVMTableGen LLVMTarget
-		LLVMTransformUtils LLVMVectorize
-		LLVMX86AsmParser LLVMX86AsmPrinter
-		LLVMX86CodeGen LLVMX86Desc
-		LLVMX86Disassembler LLVMX86Info
-		LLVMX86Utils LLVMipa
-		LLVMipo LLVMCore)
-	# imagehelp is needed by LLVM 3.1 on MinGW, check lib\Support\Windows\Signals.inc
-	list(APPEND PLATFORM_LINKLIBS -limagehlp)
-endif()
-
-if(WITH_OPENCOLORIO)
-	set(OPENCOLORIO ${LIBDIR}/opencolorio)
-	set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
-	set(OPENCOLORIO_LIBRARIES OpenColorIO)
-	set(OPENCOLORIO_LIBPATH ${OPENCOLORIO}/lib)
-	set(OPENCOLORIO_DEFINITIONS)
-endif()
-
-if(WITH_SDL)
-	set(SDL ${LIBDIR}/sdl)
-	set(SDL_INCLUDE_DIR ${SDL}/include)
-	set(SDL_LIBRARY SDL)
-	set(SDL_LIBPATH ${SDL}/lib)
-endif()
-
-if(WITH_OPENVDB)
-	set(OPENVDB ${LIBDIR}/openvdb)
-	set(OPENVDB_INCLUDE_DIRS ${OPENVDB}/include)
-	set(OPENVDB_LIBRARIES openvdb ${TBB_LIBRARIES})
-	set(OPENVDB_LIBPATH ${LIBDIR}/openvdb/lib)
-	set(OPENVDB_DEFINITIONS)
-endif()
-
-if(WITH_ALEMBIC)
-	# TODO(sergey): For until someone drops by and compiles libraries for
-	# MinGW we allow users to compile their own Alembic library and use
-	# that via find_package(),
-	#
-	# Once precompiled libraries are there we'll use hardcoded locations.
-	find_package_wrapper(Alembic)
-	if(WITH_ALEMBIC_HDF5)
-		set(HDF5_ROOT_DIR ${LIBDIR}/hdf5)
-		find_package_wrapper(HDF5)
-	endif()
-	if(NOT ALEMBIC_FOUND OR (WITH_ALEMBIC_HDF5 AND NOT HDF5_FOUND))
-		set(WITH_ALEMBIC OFF)
-		set(WITH_ALEMBIC_HDF5 OFF)
-	endif()
-endif()
-
-set(PLATFORM_LINKFLAGS "-Xlinker --stack=2097152")
-
-## DISABLE - causes linking errors
-## for re-distribution, so users dont need mingw installed
-# set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -static-libgcc -static-libstdc++")

build_files/cmake/platform/platform_win32_msvc.cmake

@@ -1,485 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# The Original Code is Copyright (C) 2016, Blender Foundation
-# All rights reserved.
-#
-# Contributor(s): Sergey Sharybin.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-# Libraries configuration for Windows when compiling with MSVC.
-
-macro(warn_hardcoded_paths package_name
-	)
-	if(WITH_WINDOWS_FIND_MODULES)
-		message(WARNING "Using HARDCODED ${package_name} locations")
-	endif(WITH_WINDOWS_FIND_MODULES)
-endmacro()
-
-macro(windows_find_package package_name
-	)
-	if(WITH_WINDOWS_FIND_MODULES)
-		find_package( ${package_name})
-	endif(WITH_WINDOWS_FIND_MODULES)
-endmacro()
-
-add_definitions(-DWIN32)
-# Minimum MSVC Version
-if(MSVC_VERSION EQUAL 1800)
-	set(_min_ver "18.0.31101")
-	if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${_min_ver})
-		message(FATAL_ERROR
-			"Visual Studio 2013 (Update 4, ${_min_ver}) required, "
-			"found (${CMAKE_CXX_COMPILER_VERSION})")
-	endif()
-endif()
-if(MSVC_VERSION EQUAL 1900)
-	set(_min_ver "19.0.24210")
-	if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${_min_ver})
-		message(FATAL_ERROR
-			"Visual Studio 2015 (Update 3, ${_min_ver}) required, "
-			"found (${CMAKE_CXX_COMPILER_VERSION})")
-	endif()
-endif()
-unset(_min_ver)
-
-# needed for some MSVC installations
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO")
-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO")
-set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH:NO")
-
-list(APPEND PLATFORM_LINKLIBS
-	ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32
-	advapi32 shfolder shell32 ole32 oleaut32 uuid psapi Dbghelp
-)
-
-if(WITH_INPUT_IME)
-	list(APPEND PLATFORM_LINKLIBS imm32)
-endif()
-
-add_definitions(
-	-D_CRT_NONSTDC_NO_DEPRECATE
-	-D_CRT_SECURE_NO_DEPRECATE
-	-D_SCL_SECURE_NO_DEPRECATE
-	-D_CONSOLE
-	-D_LIB
-)
-
-# MSVC11 needs _ALLOW_KEYWORD_MACROS to build
-add_definitions(-D_ALLOW_KEYWORD_MACROS)
-
-# We want to support Vista level ABI
-add_definitions(-D_WIN32_WINNT=0x600)
-
-# Make cmake find the msvc redistributables
-set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
-include(InstallRequiredSystemLibraries)
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /nologo /J /Gd /MP /EHsc")
-set(CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} /nologo /J /Gd /MP")
-
-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
-set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")
-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
-set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT")
-set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /MT")
-set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} /MT")
-set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MT")
-set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /MT")
-
-set(PLATFORM_LINKFLAGS "/SUBSYSTEM:CONSOLE /STACK:2097152 /INCREMENTAL:NO ")
-set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:msvcmrt.lib /NODEFAULTLIB:msvcurt.lib /NODEFAULTLIB:msvcrtd.lib ")
-
-# Ignore meaningless for us linker warnings.
-set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /ignore:4049 /ignore:4217 /ignore:4221")
-set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /ignore:4221")
-
-# MSVC only, Mingw doesnt need
-if(CMAKE_CL_64)
-	set(PLATFORM_LINKFLAGS "/MACHINE:X64 /OPT:NOREF ${PLATFORM_LINKFLAGS}")
-else()
-	set(PLATFORM_LINKFLAGS "/MACHINE:IX86 /LARGEADDRESSAWARE ${PLATFORM_LINKFLAGS}")
-endif()
-
-set(PLATFORM_LINKFLAGS_DEBUG "/IGNORE:4099 /NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libc.lib")
-
-if(NOT DEFINED LIBDIR)
-
-	# Setup 64bit and 64bit windows systems
-	if(CMAKE_CL_64)
-		message(STATUS "64 bit compiler detected.")
-		set(LIBDIR_BASE "win64")
-	else()
-		message(STATUS "32 bit compiler detected.")
-		set(LIBDIR_BASE "windows")
-	endif()
-
-	if(MSVC_VERSION EQUAL 1900)
-		message(STATUS "Visual Studio 2015 detected.")
-		set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc14)
-	else()
-		message(STATUS "Visual Studio 2013 detected.")
-		set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc12)
-	endif()
-else()
-	message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")
-endif()
-if(NOT EXISTS "${LIBDIR}/")
-	message(FATAL_ERROR "Windows requires pre-compiled libs at: '${LIBDIR}'")
-endif()
-
-# Add each of our libraries to our cmake_prefix_path so find_package() could work
-file(GLOB children RELATIVE ${LIBDIR} ${LIBDIR}/*)
-foreach(child ${children})
-	if(IS_DIRECTORY ${LIBDIR}/${child})
-		list(APPEND CMAKE_PREFIX_PATH  ${LIBDIR}/${child})
-	endif()
-endforeach()
-
-set(ZLIB_INCLUDE_DIRS ${LIBDIR}/zlib/include)
-set(ZLIB_LIBRARIES ${LIBDIR}/zlib/lib/libz_st.lib)
-set(ZLIB_INCLUDE_DIR ${LIBDIR}/zlib/include)
-set(ZLIB_LIBRARY ${LIBDIR}/zlib/lib/libz_st.lib)
-set(ZLIB_DIR ${LIBDIR}/zlib)
-
-windows_find_package(zlib) # we want to find before finding things that depend on it like png
-windows_find_package(png)
-
-if(NOT PNG_FOUND)
-	warn_hardcoded_paths(libpng)
-	set(PNG_PNG_INCLUDE_DIR ${LIBDIR}/png/include)
-	set(PNG_LIBRARIES libpng)
-	set(PNG "${LIBDIR}/png")
-	set(PNG_INCLUDE_DIRS "${PNG}/include")
-	set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
-endif()
-
-set(JPEG_NAMES ${JPEG_NAMES} libjpeg)
-windows_find_package(jpeg REQUIRED)
-if(NOT JPEG_FOUND)
-	warn_hardcoded_paths(jpeg)
-	set(JPEG_INCLUDE_DIR ${LIBDIR}/jpeg/include)
-	set(JPEG_LIBRARIES ${LIBDIR}/jpeg/lib/libjpeg.lib)
-endif()
-
-set(PTHREADS_INCLUDE_DIRS ${LIBDIR}/pthreads/include)
-set(PTHREADS_LIBRARIES ${LIBDIR}/pthreads/lib/pthreadVC2.lib)
-
-set(FREETYPE ${LIBDIR}/freetype)
-set(FREETYPE_INCLUDE_DIRS
-	${LIBDIR}/freetype/include
-	${LIBDIR}/freetype/include/freetype2
-)
-set(FREETYPE_LIBRARY ${LIBDIR}/freetype/lib/freetype2ST.lib)
-windows_find_package(freetype REQUIRED)
-
-if(WITH_FFTW3)
-	set(FFTW3 ${LIBDIR}/fftw3)
-	set(FFTW3_LIBRARIES libfftw)
-	set(FFTW3_INCLUDE_DIRS ${FFTW3}/include)
-	set(FFTW3_LIBPATH ${FFTW3}/lib)
-endif()
-
-if(WITH_OPENCOLLADA)
-	set(OPENCOLLADA ${LIBDIR}/opencollada)
-
-	set(OPENCOLLADA_INCLUDE_DIRS
-		${OPENCOLLADA}/include/opencollada/COLLADAStreamWriter
-		${OPENCOLLADA}/include/opencollada/COLLADABaseUtils
-		${OPENCOLLADA}/include/opencollada/COLLADAFramework
-		${OPENCOLLADA}/include/opencollada/COLLADASaxFrameworkLoader
-		${OPENCOLLADA}/include/opencollada/GeneratedSaxParser
-	)
-
-	set(OPENCOLLADA_LIBRARIES
-		${OPENCOLLADA}/lib/opencollada/OpenCOLLADASaxFrameworkLoader.lib
-		${OPENCOLLADA}/lib/opencollada/OpenCOLLADAFramework.lib
-		${OPENCOLLADA}/lib/opencollada/OpenCOLLADABaseUtils.lib
-		${OPENCOLLADA}/lib/opencollada/OpenCOLLADAStreamWriter.lib
-		${OPENCOLLADA}/lib/opencollada/MathMLSolver.lib
-		${OPENCOLLADA}/lib/opencollada/GeneratedSaxParser.lib
-		${OPENCOLLADA}/lib/opencollada/xml.lib
-		${OPENCOLLADA}/lib/opencollada/buffer.lib
-		${OPENCOLLADA}/lib/opencollada/ftoa.lib
-	)
-
-	if(NOT WITH_LLVM)
-		list(APPEND OPENCOLLADA_LIBRARIES ${OPENCOLLADA}/lib/opencollada/UTF.lib)
-	endif()
-
-	set(PCRE_LIBRARIES
-		${OPENCOLLADA}/lib/opencollada/pcre.lib
-	)
-endif()
-
-if(WITH_CODEC_FFMPEG)
-	set(FFMPEG_INCLUDE_DIRS
-		${LIBDIR}/ffmpeg/include
-		${LIBDIR}/ffmpeg/include/msvc
-	)
-	windows_find_package(FFMPEG)
-	if(NOT FFMPEG_FOUND)
-		warn_hardcoded_paths(ffmpeg)
-		set(FFMPEG_LIBRARY_VERSION 55)
-		set(FFMPEG_LIBRARY_VERSION_AVU 52)
-		set(FFMPEG_LIBRARIES
-			${LIBDIR}/ffmpeg/lib/avcodec-${FFMPEG_LIBRARY_VERSION}.lib
-			${LIBDIR}/ffmpeg/lib/avformat-${FFMPEG_LIBRARY_VERSION}.lib
-			${LIBDIR}/ffmpeg/lib/avdevice-${FFMPEG_LIBRARY_VERSION}.lib
-			${LIBDIR}/ffmpeg/lib/avutil-${FFMPEG_LIBRARY_VERSION_AVU}.lib
-			${LIBDIR}/ffmpeg/lib/swscale-2.lib
-			)
-	endif()
-endif()
-
-if(WITH_IMAGE_OPENEXR)
-	set(OPENEXR_ROOT_DIR ${LIBDIR}/openexr)
-	set(OPENEXR_VERSION "2.1")
-	windows_find_package(OPENEXR REQUIRED)
-	if(NOT OPENEXR_FOUND)
-		warn_hardcoded_paths(OpenEXR)
-		set(OPENEXR ${LIBDIR}/openexr)
-		set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
-		set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR}/include/OpenEXR)
-		set(OPENEXR_LIBPATH ${OPENEXR}/lib)
-		set(OPENEXR_LIBRARIES
-			optimized ${OPENEXR_LIBPATH}/Iex-2_2.lib
-			optimized ${OPENEXR_LIBPATH}/Half.lib
-			optimized ${OPENEXR_LIBPATH}/IlmImf-2_2.lib
-			optimized ${OPENEXR_LIBPATH}/Imath-2_2.lib
-			optimized ${OPENEXR_LIBPATH}/IlmThread-2_2.lib
-			debug ${OPENEXR_LIBPATH}/Iex-2_2_d.lib
-			debug ${OPENEXR_LIBPATH}/Half_d.lib
-			debug ${OPENEXR_LIBPATH}/IlmImf-2_2_d.lib
-			debug ${OPENEXR_LIBPATH}/Imath-2_2_d.lib
-			debug ${OPENEXR_LIBPATH}/IlmThread-2_2_d.lib
-		)
-	endif()
-endif()
-
-if(WITH_IMAGE_TIFF)
-	# Try to find tiff first then complain and set static and maybe wrong paths
-	windows_find_package(TIFF)
-	if(NOT TIFF_FOUND)
-		warn_hardcoded_paths(libtiff)
-		set(TIFF_LIBRARY ${LIBDIR}/tiff/lib/libtiff.lib)
-		set(TIFF_INCLUDE_DIR ${LIBDIR}/tiff/include)
-	endif()
-endif()
-
-if(WITH_JACK)
-	set(JACK_INCLUDE_DIRS
-		${LIBDIR}/jack/include/jack
-		${LIBDIR}/jack/include
-	)
-	set(JACK_LIBRARIES optimized ${LIBDIR}/jack/lib/libjack.lib debug ${LIBDIR}/jack/lib/libjack_d.lib)
-endif()
-
-if(WITH_PYTHON)
-	set(PYTHON_VERSION 3.5) # CACHE STRING)
-
-	string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
-	# Use shared libs for vc2008 and vc2010 until we actually have vc2010 libs
-	set(PYTHON_LIBRARY ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}.lib)
-	unset(_PYTHON_VERSION_NO_DOTS)
-
-	# Shared includes for both vc2008 and vc2010
-	set(PYTHON_INCLUDE_DIR ${LIBDIR}/python/include/python${PYTHON_VERSION})
-
-	# uncached vars
-	set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
-	set(PYTHON_LIBRARIES  "${PYTHON_LIBRARY}")
-endif()
-
-if(WITH_BOOST)
-	if(WITH_CYCLES_OSL)
-		set(boost_extra_libs wave)
-	endif()
-	if(WITH_INTERNATIONAL)
-		list(APPEND boost_extra_libs locale)
-	endif()
-	if(WITH_OPENVDB)
-		list(APPEND boost_extra_libs iostreams)
-	endif()
-	set(Boost_USE_STATIC_RUNTIME ON) # prefix lib
-	set(Boost_USE_MULTITHREADED ON) # suffix -mt
-	set(Boost_USE_STATIC_LIBS ON) # suffix -s
-	if (WITH_WINDOWS_FIND_MODULES)
-		find_package(Boost COMPONENTS date_time filesystem thread regex system ${boost_extra_libs})
-	endif (WITH_WINDOWS_FIND_MODULES)
-	if(NOT Boost_FOUND)
-		warn_hardcoded_paths(BOOST)
-		set(BOOST ${LIBDIR}/boost)
-		set(BOOST_INCLUDE_DIR ${BOOST}/include)
-		if(MSVC12)
-			set(BOOST_LIBPATH ${BOOST}/lib)
-			set(BOOST_POSTFIX "vc120-mt-s-1_60.lib")
-			set(BOOST_DEBUG_POSTFIX "vc120-mt-sgd-1_60.lib")
-		else()
-			set(BOOST_LIBPATH ${BOOST}/lib)
-			set(BOOST_POSTFIX "vc140-mt-s-1_60.lib")
-			set(BOOST_DEBUG_POSTFIX "vc140-mt-sgd-1_60.lib")
-		endif()
-		set(BOOST_LIBRARIES
-			optimized libboost_date_time-${BOOST_POSTFIX}
-			optimized libboost_filesystem-${BOOST_POSTFIX}
-			optimized libboost_regex-${BOOST_POSTFIX}
-			optimized libboost_system-${BOOST_POSTFIX}
-			optimized libboost_thread-${BOOST_POSTFIX}
-			debug libboost_date_time-${BOOST_DEBUG_POSTFIX}
-			debug libboost_filesystem-${BOOST_DEBUG_POSTFIX}
-			debug libboost_regex-${BOOST_DEBUG_POSTFIX}
-			debug libboost_system-${BOOST_DEBUG_POSTFIX}
-			debug libboost_thread-${BOOST_DEBUG_POSTFIX}
-		)
-		if(WITH_CYCLES_OSL)
-			set(BOOST_LIBRARIES ${BOOST_LIBRARIES}
-				optimized libboost_wave-${BOOST_POSTFIX}
-				debug libboost_wave-${BOOST_DEBUG_POSTFIX})
-		endif()
-		if(WITH_INTERNATIONAL)
-			set(BOOST_LIBRARIES ${BOOST_LIBRARIES}
-				optimized libboost_locale-${BOOST_POSTFIX}
-				debug libboost_locale-${BOOST_DEBUG_POSTFIX})
-		endif()
-	else() # we found boost using find_package
-		set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS})
-		set(BOOST_LIBRARIES ${Boost_LIBRARIES})
-		set(BOOST_LIBPATH ${Boost_LIBRARY_DIRS})
-	endif()
-	set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
-endif()
-
-if(WITH_OPENIMAGEIO)
-	windows_find_package(OpenImageIO)
-	set(OPENIMAGEIO ${LIBDIR}/openimageio)
-	set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
-	set(OIIO_OPTIMIZED optimized OpenImageIO optimized OpenImageIO_Util)
-	set(OIIO_DEBUG debug OpenImageIO_d debug OpenImageIO_Util_d)
-	set(OPENIMAGEIO_LIBRARIES ${OIIO_OPTIMIZED} ${OIIO_DEBUG})
-	set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
-	set(OPENIMAGEIO_DEFINITIONS "-DUSE_TBB=0")
-	set(OPENCOLORIO_DEFINITIONS "-DOCIO_STATIC_BUILD")
-	set(OPENIMAGEIO_IDIFF "${OPENIMAGEIO}/bin/idiff.exe")
-	add_definitions(-DOIIO_STATIC_BUILD)
-endif()
-
-if(WITH_LLVM)
-	set(LLVM_ROOT_DIR ${LIBDIR}/llvm CACHE PATH	"Path to the LLVM installation")
-	file(GLOB LLVM_LIBRARY_OPTIMIZED ${LLVM_ROOT_DIR}/lib/*.lib)
-
-	if(EXISTS ${LLVM_ROOT_DIR}/debug/lib)
-		foreach(LLVM_OPTIMIZED_LIB ${LLVM_LIBRARY_OPTIMIZED})
-			get_filename_component(LIBNAME ${LLVM_OPTIMIZED_LIB} ABSOLUTE)
-			list(APPEND LLVM_LIBS optimized ${LIBNAME})
-		endforeach(LLVM_OPTIMIZED_LIB)
-
-		file(GLOB LLVM_LIBRARY_DEBUG ${LLVM_ROOT_DIR}/debug/lib/*.lib)
-
-		foreach(LLVM_DEBUG_LIB ${LLVM_LIBRARY_DEBUG})
-			get_filename_component(LIBNAME ${LLVM_DEBUG_LIB} ABSOLUTE)
-			list(APPEND LLVM_LIBS debug ${LIBNAME})
-		endforeach(LLVM_DEBUG_LIB)
-
-		set(LLVM_LIBRARY ${LLVM_LIBS})
-	else()
-		message(WARNING "LLVM debug libs not present on this system. Using release libs for debug builds.")
-		set(LLVM_LIBRARY ${LLVM_LIBRARY_OPTIMIZED})
-	endif()
-
-endif()
-
-if(WITH_OPENCOLORIO)
-	set(OPENCOLORIO ${LIBDIR}/opencolorio)
-	set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
-	set(OPENCOLORIO_LIBRARIES OpenColorIO)
-	set(OPENCOLORIO_LIBPATH ${LIBDIR}/opencolorio/lib)
-	set(OPENCOLORIO_DEFINITIONS)
-endif()
-
-if(WITH_OPENVDB)
-	set(BLOSC_LIBRARIES optimized ${LIBDIR}/blosc/lib/libblosc.lib debug ${LIBDIR}/blosc/lib/libblosc_d.lib)
-	set(TBB_LIBRARIES optimized ${LIBDIR}/tbb/lib/tbb.lib debug ${LIBDIR}/tbb/lib/tbb_debug.lib)
-	set(TBB_INCLUDE_DIR ${LIBDIR}/tbb/include)
-	set(OPENVDB ${LIBDIR}/openvdb)
-	set(OPENVDB_INCLUDE_DIRS ${OPENVDB}/include ${TBB_INCLUDE_DIR})
-	set(OPENVDB_LIBRARIES optimized openvdb debug openvdb_d ${TBB_LIBRARIES} ${BLOSC_LIBRARIES})
-	set(OPENVDB_LIBPATH ${LIBDIR}/openvdb/lib)
-endif()
-
-if(WITH_ALEMBIC)
-	set(ALEMBIC ${LIBDIR}/alembic)
-	set(ALEMBIC_INCLUDE_DIR ${ALEMBIC}/include)
-	set(ALEMBIC_INCLUDE_DIRS ${ALEMBIC_INCLUDE_DIR})
-	set(ALEMBIC_LIBPATH ${ALEMBIC}/lib)
-	set(ALEMBIC_LIBRARIES optimized alembic debug alembic_d)
-endif()
-
-if(WITH_MOD_CLOTH_ELTOPO)
-	set(LAPACK ${LIBDIR}/lapack)
-	# set(LAPACK_INCLUDE_DIR ${LAPACK}/include)
-	set(LAPACK_LIBPATH ${LAPACK}/lib)
-	set(LAPACK_LIBRARIES
-		${LIBDIR}/lapack/lib/libf2c.lib
-		${LIBDIR}/lapack/lib/clapack_nowrap.lib
-		${LIBDIR}/lapack/lib/BLAS_nowrap.lib
-	)
-endif()
-
-if(WITH_OPENSUBDIV)
-	set(OPENSUBDIV_INCLUDE_DIR ${LIBDIR}/opensubdiv/include)
-	set(OPENSUBDIV_LIBPATH ${LIBDIR}/opensubdiv/lib)
-	set(OPENSUBDIV_LIBRARIES ${OPENSUBDIV_LIBPATH}/osdCPU.lib ${OPENSUBDIV_LIBPATH}/osdGPU.lib)
-	find_package(OpenSubdiv)
-endif()
-
-if(WITH_SDL)
-	set(SDL ${LIBDIR}/sdl)
-	set(SDL_INCLUDE_DIR ${SDL}/include)
-	set(SDL_LIBPATH ${SDL}/lib)
-	# MinGW TODO: Update MinGW to SDL2
-	if(NOT CMAKE_COMPILER_IS_GNUCC)
-		set(SDL_LIBRARY SDL2)
-	else()
-		set(SDL_LIBRARY SDL)
-	endif()
-endif()
-
-# Audio IO
-if(WITH_SYSTEM_AUDASPACE)
-	set(AUDASPACE_INCLUDE_DIRS ${LIBDIR}/audaspace/include/audaspace)
-	set(AUDASPACE_LIBRARIES ${LIBDIR}/audaspace/lib/audaspace.lib)
-	set(AUDASPACE_C_INCLUDE_DIRS ${LIBDIR}/audaspace/include/audaspace)
-	set(AUDASPACE_C_LIBRARIES ${LIBDIR}/audaspace/lib/audaspace-c.lib)
-	set(AUDASPACE_PY_INCLUDE_DIRS ${LIBDIR}/audaspace/include/audaspace)
-	set(AUDASPACE_PY_LIBRARIES ${LIBDIR}/audaspace/lib/audaspace-py.lib)
-endif()
-
-# used in many places so include globally, like OpenGL
-blender_include_dirs_sys("${PTHREADS_INCLUDE_DIRS}")
-
-#find signtool  
-SET(ProgramFilesX86_NAME "ProgramFiles(x86)") #env dislikes the ( ) 
-find_program(SIGNTOOL_EXE signtool
-HINTS
-  "$ENV{${ProgramFilesX86_NAME}}/Windows Kits/10/bin/x86/"
-  "$ENV{ProgramFiles}/Windows Kits/10/bin/x86/"
-  "$ENV{${ProgramFilesX86_NAME}}/Windows Kits/8.1/bin/x86/"
-  "$ENV{ProgramFiles}/Windows Kits/8.1/bin/x86/"
-  "$ENV{${ProgramFilesX86_NAME}}/Windows Kits/8.0/bin/x86/"
-  "$ENV{ProgramFiles}/Windows Kits/8.0/bin/x86/"
-)

build_files/cmake/project_info.py

@@ -39,7 +39,7 @@ __all__ = (
     "is_py",
     "cmake_advanced_info",
     "cmake_compiler_defines",
-    "project_name_get",
+    "project_name_get"
     "init",
 )
 
@@ -214,12 +214,7 @@ def cmake_advanced_info():
 
 def cmake_cache_var(var):
     cache_file = open(join(CMAKE_DIR, "CMakeCache.txt"), encoding='utf-8')
-    lines = [
-        l_strip for l in cache_file
-        for l_strip in (l.strip(),)
-        if l_strip
-        if not l_strip.startswith(("//", "#"))
-    ]
+    lines = [l_strip for l in cache_file for l_strip in (l.strip(),) if l_strip if not l_strip.startswith("//") if not l_strip.startswith("#")]
     cache_file.close()
 
     for l in lines:

build_files/cmake/project_source_info.py

@@ -23,7 +23,7 @@
 __all__ = (
     "build_info",
     "SOURCE_DIR",
-)
+    )
 
 
 import sys

build_files/package_spec/build_archive.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
 # <pep8 compliant>
 

build_files/package_spec/pacman/PKGBUILD

@@ -2,9 +2,11 @@
 
 # custom blender vars
 blender_srcdir=$(dirname $startdir)"/../.."
-blender_version=$(grep "BLENDER_VERSION\s" $blender_srcdir/source/blender/blenkernel/BKE_blender_version.h | awk '{print $3}')
+# value may be formatted: 35042:35051M
+blender_revision=$(svnversion $blender_srcdir | cut -d: -f2 | awk '{print $3}')
+blender_version=$(grep "BLENDER_VERSION\s" $blender_srcdir/source/blender/blenkernel/BKE_blender.h | awk '{print $3}')
 blender_version=$(expr $blender_version / 100).$(expr $blender_version % 100)  # 256 -> 2.56
-blender_version_char=$(sed -ne 's/.*BLENDER_VERSION_CHAR.*\([a-z]\)$/\1/p' $blender_srcdir/source/blender/blenkernel/BKE_blender_version.h)
+blender_version_char=$(sed -ne 's/.*BLENDER_VERSION_CHAR.*\([a-z]\)$/\1/p' $blender_srcdir/source/blender/blenkernel/BKE_blender.h)
 # blender_subversion=$(grep BLENDER_SUBVERSION $blender_srcdir/source/blender/blenkernel/BKE_blender.h | awk '{print $3}')
 
 # map the version a -> 1
@@ -25,9 +27,7 @@ arch=('i686' 'x86_64')
 url="www.blender.org"
 license=('GPL')
 groups=()
-depends=('libjpeg' 'libpng' 'openjpeg' 'libtiff' 'openexr'  'python>=3.5'
-         'gettext' 'libxi' 'libxmu' 'mesa' 'freetype2' 'openal' 'sdl'
-         'libsndfile' 'ffmpeg')
+depends=('libjpeg' 'libpng' 'openjpeg' 'libtiff' 'openexr'  'python>=3.4' 'gettext' 'libxi' 'libxmu' 'mesa' 'freetype2' 'openal' 'sdl' 'libsndfile' 'ffmpeg')
 makedepends=('cmake' 'git')
 optdepends=()
 provides=()

doc/doxygen/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = Blender
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "V2.8x"
+PROJECT_NUMBER         = "V2.7x"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

doc/manpage/blender.1.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
 # ##### BEGIN GPL LICENSE BLOCK #####
 #

doc/python_api/epy/IDProp.py

@@ -0,0 +1,132 @@
+class IDGroup:
+	"""
+	The IDGroup Type
+	================
+	This type supports both iteration and the []
+	operator to get child ID properties.
+	
+	You can also add new properties using the [] operator.
+	For example::
+	
+		group['a float!'] = 0.0
+		group['an int!'] = 0
+		group['a string!'] = "hi!"
+		group['an array!'] = [0, 0, 1.0, 0]
+		
+		group['a subgroup!] = {"float": 0.0, "an int": 1.0, "an array": [1, 2],
+		  "another subgroup": {"a": 0.0, "str": "bleh"}}
+	
+	Note that for arrays, the array type defaults to int unless a float is found
+	while scanning the template list; if any floats are found, then the whole
+	array is float.  Note that double-precision floating point numbers are used for
+	python-created float ID properties and arrays (though the internal C api does 
+	support single-precision floats, and the python code will read them).
+	
+	You can also delete properties with the del operator.  For example:
+	
+	del group['property']
+	
+	To get the type of a property, use the type() operator, for example::
+	
+		if type(group['bleh']) == str: pass
+	
+	To tell if the property is a group or array type, import the Blender.Types module and test
+	against IDGroupType and IDArrayType, like so::
+	
+		from Blender.Types import IDGroupType, IDArrayType.
+	
+		if type(group['bleghr']) == IDGroupType:
+			(do something)
+	
+	@ivar name: The name of the property
+	@type name: string
+	"""
+	
+	def pop(item):
+		"""
+		Pop an item from the group property.
+		@type item: string
+		@param item: The item name.
+		@rtype: can be dict, list, int, float or string.
+		@return: The removed property.	
+		"""
+		
+	def update(updatedict):
+		"""
+		Updates items in the dict, similar to normal python
+		dictionary method .update().
+		@type updatedict: dict
+		@param updatedict: A dict of simple types to derive updated/new IDProperties from.
+		@rtype: None
+		@return: None
+		"""
+	
+	def keys():
+		"""
+		Returns a list of the keys in this property group.
+		@rtype: list of strings.
+		@return: a list of the keys in this property group.	
+		"""
+	
+	def values():
+		"""
+		Returns a list of the values in this property group.
+		
+		Note that unless a value is itself a property group or an array, you 
+		cannot change it by changing the values in this list, you must change them
+		in the parent property group.
+		
+		For example,
+		
+		group['some_property'] = new_value
+		
+		. . .is correct, while,
+		
+		values = group.values()
+		values[0] = new_value
+		
+		. . .is wrong.
+		
+		@rtype: list of strings.
+		@return: a list of the values in this property group.
+		"""
+	
+	def iteritems():
+		"""
+		Implements the python dictionary iteritmes method.
+		
+		For example::
+
+			for k, v in group.iteritems():
+				print "Property name: " + k
+				print "Property value: " + str(v)
+			
+		@rtype: an iterator that spits out items of the form [key, value]
+		@return: an iterator.	
+		"""
+	
+	def convert_to_pyobject():
+		"""
+		Converts the entire property group to a purely python form.
+		
+		@rtype: dict
+		@return: A python dictionary representing the property group
+		"""
+		
+class IDArray:
+	"""
+	The IDArray Type
+	================
+	
+	@ivar type: returns the type of the array, can be either IDP_Int or IDP_Float
+	"""
+	
+	def __getitem__(index):
+		pass
+	
+	def __setitem__(index, value):
+		pass
+	
+	def __len__():
+		pass
+	

doc/python_api/examples/bge.texture.2.py

@@ -6,18 +6,18 @@ usable by OpenGL, they must be processed by a shader. The three shaders presente
 cover all common video capture cases.
 
 This file reflects the current video transfer method implemented in the Decklink module:
-whenever possible the video images are transferred as float texture because this is more
+whenever possible the video images are transferred as float texture because this is more 
 compatible with GPUs. Of course, only the pixel formats that have a correspondant GL format
 can be transferred as float. Look for fg_shaders in this file for an exhaustive list.
 
 Other pixel formats will be transferred as 32 bits integer red-channel texture but this
-won't work with certain GPU (Intel GMA); the corresponding shaders are not shown here.
+won't work with certain GPU (Intel GMA); the corresponding shaders are not shown here. 
 However, it should not be necessary to use any of them as the list below covers all practical
 cases of video capture with all types of Decklink product.
 
 In other words, only use one of the pixel format below and you will be fine. Note that depending
 on the video stream, only certain pixel formats will be allowed (others will throw an exception).
-For example, to capture a PAL video stream, you must use one of the YUV formats.
+For example, to capture a PAL video stream, you must use one of the YUV formats. 
 
 To find which pixel format is suitable for a particular video stream, use the 'Media Express'
 utility that comes with the Decklink software : if you see the video in the 'Log and Capture'
@@ -40,7 +40,7 @@ VertexShader = """
       gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
       gl_TexCoord[0] = gl_MultiTexCoord0;
    }
-
+    
 """
 
 # For use with RGB video stream: the pixel is directly usable
@@ -61,7 +61,7 @@ FragmentShader_R10l = """
         ty = eye+gl_TexCoord[0].y*stereo;
         color = texture(tex, vec2(tx,ty));
         color.a = 0.7;
-        gl_FragColor = color;
+        gl_FragColor = color; 
     }
 """
 
@@ -69,18 +69,18 @@ FragmentShader_R10l = """
 #
 FragmentShader_2vuy = """
     #version 130
-    uniform sampler2D tex;
+    uniform sampler2D tex; 
     // stereo = 1.0 if 2D image, =0.5 if 3D (left eye below, right eye above)
     uniform float stereo;
     // eye = 0.0 for the left eye, 0.5 for the right eye
     uniform float eye;
 
-    void main(void)
+    void main(void) 
     {
         vec4 color;
-        float tx, ty, width, Y, Cb, Cr;
+        float tx, ty, width, Y, Cb, Cr; 
         int px;
-        tx = gl_TexCoord[0].x;
+        tx = gl_TexCoord[0].x; 
         ty = eye+gl_TexCoord[0].y*stereo;
         width = float(textureSize(tex, 0).x);
         color = texture(tex, vec2(tx, ty));
@@ -93,14 +93,14 @@ FragmentShader_2vuy = """
             Y = color.a;
             break;
         }
-        Y = (Y - 0.0625) * 1.168949772;
-        Cb = (color.b - 0.0625) * 1.142857143 - 0.5;
-        Cr = (color.r - 0.0625) * 1.142857143 - 0.5;
-        color.r = Y + 1.5748 * Cr;
+        Y = (Y - 0.0625) * 1.168949772; 
+        Cb = (color.b - 0.0625) * 1.142857143 - 0.5; 
+        Cr = (color.r - 0.0625) * 1.142857143 - 0.5; 
+        color.r = Y + 1.5748 * Cr; 
         color.g = Y - 0.1873 * Cb - 0.4681 * Cr;
         color.b = Y + 1.8556 * Cb;
         color.a = 0.7;
-        gl_FragColor = color;
+        gl_FragColor = color; 
     }
 """
 
@@ -108,19 +108,19 @@ FragmentShader_2vuy = """
 #
 FragmentShader_v210 = """
     #version 130
-    uniform sampler2D tex;
+    uniform sampler2D tex; 
     // stereo = 1.0 if 2D image, =0.5 if 3D (left eye below, right eye above)
     uniform float stereo;
     // eye = 0.0 for the left eye, 0.5 for the right eye
     uniform float eye;
 
-    void main(void)
+    void main(void) 
     {
         vec4 color, color1, color2, color3;
         int px;
-        float tx, ty, width, sx, dx, bx, Y, Cb, Cr;
-        tx = gl_TexCoord[0].x;
-        ty = eye+gl_TexCoord[0].y*stereo;
+        float tx, ty, width, sx, dx, bx, Y, Cb, Cr; 
+        tx = gl_TexCoord[0].x; 
+        ty = eye+gl_TexCoord[0].y*stereo; 
         width = float(textureSize(tex, 0).x);
         // to sample macro pixels (6 pixels in 4 words)
         sx = tx*width*0.25+0.01;
@@ -170,14 +170,14 @@ FragmentShader_v210 = """
             Y = color3.r;
             break;
         }
-        Y = (Y - 0.0625) * 1.168949772;
-        Cb = (Cb - 0.0625) * 1.142857143 - 0.5;
-        Cr = (Cr - 0.0625) * 1.142857143 - 0.5;
-        color.r = Y + 1.5748 * Cr;
+        Y = (Y - 0.0625) * 1.168949772; 
+        Cb = (Cb - 0.0625) * 1.142857143 - 0.5; 
+        Cr = (Cr - 0.0625) * 1.142857143 - 0.5; 
+        color.r = Y + 1.5748 * Cr; 
         color.g = Y - 0.1873 * Cb - 0.4681 * Cr;
         color.b = Y + 1.8556 * Cb;
         color.a = 0.7;
-        gl_FragColor = color;
+        gl_FragColor = color; 
     }
 """
 
@@ -197,15 +197,17 @@ fg_shaders = {
     }
 
 
+    
+
 #
 # Helper function to attach a pixel shader to the material that receives the video frame.
 #
 
 def config_video(obj, format, pixel, is3D=False, mat=0, card=0):
-    if pixel not in fg_shaders:
+    if not pixel in fg_shaders:
         raise('Unsuported shader')
     shader = obj.meshes[0].materials[mat].getShader()
-    if shader is not None and not shader.isValid():
+    if shader != None and not shader.isValid():
         shader.setSource(VertexShader, fg_shaders[pixel], True)
         shader.setSampler('tex', 0)
         shader.setUniformEyef("eye")
@@ -219,19 +221,19 @@ def config_video(obj, format, pixel, is3D=False, mat=0, card=0):
 #
 # Attach this function to an object that has a material with texture
 # and call it once to initialize the object
-#
+# 
 def init(cont):
-    # config_video(cont.owner, 'HD720p5994', '8BitBGRA')
-    # config_video(cont.owner, 'HD720p5994', '8BitYUV')
-    # config_video(cont.owner, 'pal ', '10BitYUV')
-    config_video(cont.owner, 'pal ', '8BitYUV')
-
+    #config_video(cont.owner, 'HD720p5994', '8BitBGRA')    
+    #config_video(cont.owner, 'HD720p5994', '8BitYUV')    
+    #config_video(cont.owner, 'pal ', '10BitYUV')    
+    config_video(cont.owner, 'pal ', '8BitYUV')    
+       
 
 #
 # To be called on every frame
 #
 def play(cont):
     obj = cont.owner
-    video = obj.get("video")
-    if video is not None:
-        video.refresh(True)
+    if hasattr(obj, "video"):
+        obj["video"].refresh(True)
+

doc/python_api/rst/bge.constraints.rst

@@ -8,11 +8,11 @@ Physics Constraints (bge.constraints)
 Examples
 --------
 
-.. include:: __/examples/bge.constraints.py
+.. include:: ../examples/bge.constraints.py
    :start-line: 1
    :end-line: 4
 
-.. literalinclude:: __/examples/bge.constraints.py
+.. literalinclude:: ../examples/bge.constraints.py
    :lines: 6-
 
 

doc/python_api/rst/bge.events.rst

@@ -12,53 +12,53 @@ This module holds key constants for the SCA_KeyboardSensor.
 
 .. code-block:: python
 
-   # Set a connected keyboard sensor to accept F1
-   import bge
+	# Set a connected keyboard sensor to accept F1
+	import bge
 
-   co = bge.logic.getCurrentController()
-   # 'Keyboard' is a keyboard sensor
-   sensor = co.sensors["Keyboard"]
-   sensor.key = bge.events.F1KEY
+	co = bge.logic.getCurrentController()
+	# 'Keyboard' is a keyboard sensor
+	sensor = co.sensors["Keyboard"]
+	sensor.key = bge.events.F1KEY
 
-   code-block:: python
+.. code-block:: python
 
-   # Do the all keys thing
-   import bge
+	# Do the all keys thing
+	import bge
 
-   co = bge.logic.getCurrentController()
-   # 'Keyboard' is a keyboard sensor
-   sensor = co.sensors["Keyboard"]
+	co = bge.logic.getCurrentController()
+	# 'Keyboard' is a keyboard sensor
+	sensor = co.sensors["Keyboard"]
 
-   for key,status in sensor.events:
-   	# key[0] == bge.events.keycode, key[1] = status
-   	if status == bge.logic.KX_INPUT_JUST_ACTIVATED:
-   		if key == bge.events.WKEY:
-   			# Activate Forward!
-   		if key == bge.events.SKEY:
-   			# Activate Backward!
-   		if key == bge.events.AKEY:
-   			# Activate Left!
-   		if key == bge.events.DKEY:
-   			# Activate Right!
+	for key,status in sensor.events:
+		# key[0] == bge.events.keycode, key[1] = status
+		if status == bge.logic.KX_INPUT_JUST_ACTIVATED:
+			if key == bge.events.WKEY:
+				# Activate Forward!
+			if key == bge.events.SKEY:
+				# Activate Backward!
+			if key == bge.events.AKEY:
+				# Activate Left!
+			if key == bge.events.DKEY:
+				# Activate Right!
 
-   code-block:: python
+.. code-block:: python
 
-   # The all keys thing without a keyboard sensor (but you will
-   # need an always sensor with pulse mode on)
-   import bge
+	# The all keys thing without a keyboard sensor (but you will
+	# need an always sensor with pulse mode on)
+	import bge
 
-   # Just shortening names here
-   keyboard = bge.logic.keyboard
-   JUST_ACTIVATED = bge.logic.KX_INPUT_JUST_ACTIVATED
+	# Just shortening names here
+	keyboard = bge.logic.keyboard
+	JUST_ACTIVATED = bge.logic.KX_INPUT_JUST_ACTIVATED
 
-   if keyboard.events[bge.events.WKEY] == JUST_ACTIVATED:
-   	print("Activate Forward!")
-   if keyboard.events[bge.events.SKEY] == JUST_ACTIVATED:
-   	print("Activate Backward!")
-   if keyboard.events[bge.events.AKEY] == JUST_ACTIVATED:
-   	print("Activate Left!")
-   if keyboard.events[bge.events.DKEY] == JUST_ACTIVATED:
-   	print("Activate Right!")
+	if keyboard.events[bge.events.WKEY] == JUST_ACTIVATED:
+		print("Activate Forward!")
+	if keyboard.events[bge.events.SKEY] == JUST_ACTIVATED:
+		print("Activate Backward!")
+	if keyboard.events[bge.events.AKEY] == JUST_ACTIVATED:
+		print("Activate Left!")
+	if keyboard.events[bge.events.DKEY] == JUST_ACTIVATED:
+		print("Activate Right!")
 
 
 *********

doc/python_api/rst/bge.logic.rst

@@ -385,10 +385,9 @@ General functions
    If False, the render is skipped and another logic frame starts immediately.
 
    .. note::
-
       GPU VSync no longer limits the number of frame per second when render is off, 
-      but the *Use Frame Rate* option still regulates the fps. To run as many frames
-      as possible, untick this option (Render Properties, System panel).
+      but the 'Use Frame Rate' option still regulates the fps. To run as many frames
+      as possible, untick this option (Render Properties, System panel)
 
    :arg render: the render flag
    :type render: bool

doc/python_api/rst/bge.render.rst

@@ -98,7 +98,6 @@ Constants
 
    The pixel buffer for offscreen render is a Texture. Argument to :func:`offScreenCreate`
 
-
 *****
 Types
 *****
@@ -108,8 +107,8 @@ Types
    An off-screen render buffer object. 
 
    Use :func:`offScreenCreate` to create it.
-   Currently it can only be used in the :class:`bge.texture.ImageRender`
-   constructor to render on a FBO rather than the default viewport.
+   Currently it can only be used in the :class:`bge.texture.ImageRender` constructor to render on a FBO rather than the 
+   default viewport.
 
   .. attribute:: width
 
@@ -125,14 +124,10 @@ Types
 
   .. attribute:: color
 
-     The underlying OpenGL bind code of the texture object that holds
-     the rendered image, 0 if the FBO is using RenderBuffer.
-     The choice between RenderBuffer and Texture is determined
-     by the target argument of :func:`offScreenCreate`.
+     The underlying OpenGL bind code of the texture object that holds the rendered image, 0 if the FBO is using RenderBuffer. The choice between RenderBuffer and Texture is determined by the target argument of :func:`offScreenCreate`.
 
      :type: integer
 
-
 *********
 Functions
 *********
@@ -415,11 +410,7 @@ Functions
    :type height: integer
    :arg samples: the number of multisample for anti-aliasing (MSAA), 0 to disable MSAA
    :type samples: integer
-   :arg target: the pixel storage: :data:`RAS_OFS_RENDER_BUFFER` to render on RenderBuffers (the default),
-      :data:`RAS_OFS_RENDER_TEXTURE` to render on texture. 
-      The later is interesting if you want to access the texture directly (see :attr:`RASOffScreen.color`).
-      Otherwise the default is preferable as it's more widely supported by GPUs and more efficient.
-      If the GPU does not support MSAA+Texture (e.g. Intel HD GPU), MSAA will be disabled.
+   :arg target: the pixel storage: :data:`RAS_OFS_RENDER_BUFFER` to render on RenderBuffers (the default), :data:`RAS_OFS_RENDER_TEXTURE` to render on texture. The later is interesting if you want to access the texture directly (see :attr:`RASOffScreen.color`). Otherwise the default is preferable as it's more widely supported by GPUs and more efficient. If the GPU does not support MSAA+Texture (e.g. Intel HD GPU), MSAA will be disabled.
    :type target: integer
    :rtype: :class:`RASOffScreen`
 

doc/python_api/rst/bge_types/bge.types.SCA_PythonJoystick.rst

@@ -12,13 +12,13 @@ base class --- :class:`PyObjectPlus`
    .. attribute:: name
 
       The name assigned to the joystick by the operating system. (read-only)
-
+	  
       :type: string
 
    .. attribute:: activeButtons
 
       A list of active button values. (read-only)
-
+	  
       :type: list
 
    .. attribute:: axisValues
@@ -27,10 +27,8 @@ base class --- :class:`PyObjectPlus`
 
       :type: list of ints.
 
-      Each specifying the value of an axis between -1.0 and 1.0
-      depending on how far the axis is pushed, 0 for nothing.
-      The first 2 values are used by most joysticks and gamepads for directional control.
-      3rd and 4th values are only on some joysticks and can be used for arbitary controls.
+      Each specifying the value of an axis between -1.0 and 1.0 depending on how far the axis is pushed, 0 for nothing.
+      The first 2 values are used by most joysticks and gamepads for directional control. 3rd and 4th values are only on some joysticks and can be used for arbitary controls.
 
       * left:[-1.0, 0.0, ...]
       * right:[1.0, 0.0, ...]

doc/python_api/rst/include__bmesh.rst

@@ -1,8 +1,7 @@
 ..
    This document is appended to the auto generated bmesh api doc to avoid clogging up the C files with details.
    to test this run:
-   ./blender.bin -b -noaudio -P doc/python_api/sphinx_doc_gen.py -- \
-                 --partial bmesh* ; cd doc/python_api ; sphinx-build sphinx-in sphinx-out ; cd ../../
+   ./blender.bin -b -noaudio -P doc/python_api/sphinx_doc_gen.py -- --partial bmesh* ; cd doc/python_api ; sphinx-build sphinx-in sphinx-out ; cd ../../
 
 
 Submodules:
@@ -41,7 +40,7 @@ For an overview of BMesh data types and how they reference each other see:
 Example Script
 --------------
 
-.. literalinclude:: __/__/__/release/scripts/templates_py/bmesh_simple.py
+.. literalinclude:: ../../../release/scripts/templates_py/bmesh_simple.py
 
 
 Stand-Alone Module
@@ -60,9 +59,9 @@ There are 2 ways to access BMesh data, you can create a new BMesh by converting
 :class:`bpy.types.BlendData.meshes` or by accessing the current edit mode mesh.
 see: :class:`bmesh.types.BMesh.from_mesh` and :mod:`bmesh.from_edit_mesh` respectively.
 
-When explicitly converting from mesh data python **owns** the data, that is to say -
-that the mesh only exists while python holds a reference to it,
-and the script is responsible for putting it back into a mesh data-block when the edits are done.
+When explicitly converting from mesh data python **owns** the data, that is to say - that the mesh only exists while
+python holds a reference to it, and the script is responsible for putting it back into a mesh data-block when the edits
+are done.
 
 Note that unlike :mod:`bpy`, a BMesh does not necessarily correspond to data in the currently open blend file,
 a BMesh can be created, edited and freed without the user ever seeing or having access to it.

doc/python_api/rst/info_quickstart.rst

@@ -151,7 +151,7 @@ Data Creation/Removal
 ^^^^^^^^^^^^^^^^^^^^^
 
 Those of you familiar with other Python API's may be surprised that
-new data-blocks in the bpy API can't be created by calling the class:
+new datablocks in the bpy API can't be created by calling the class:
 
    >>> bpy.types.Mesh()
    Traceback (most recent call last):
@@ -305,7 +305,7 @@ In Python, this is done by defining a class, which is a subclass of an existing
 Example Operator
 ----------------
 
-.. literalinclude:: __/__/__/release/scripts/templates_py/operator_simple.py
+.. literalinclude:: ../../../release/scripts/templates_py/operator_simple.py
 
 Once this script runs, ``SimpleOperator`` is registered with Blender
 and can be called from the operator search popup or added to the toolbar.
@@ -336,7 +336,7 @@ Example Panel
 Panels register themselves as a class, like an operator.
 Notice the extra ``bl_`` variables used to set the context they display in.
 
-.. literalinclude:: __/__/__/release/scripts/templates_py/ui_panel_simple.py
+.. literalinclude:: ../../../release/scripts/templates_py/ui_panel_simple.py
 
 To run the script:
 
@@ -393,11 +393,11 @@ so these are accessed as normal Python types.
 Internal Types
 --------------
 
-Used for Blender data-blocks and collections: :class:`bpy.types.bpy_struct`
+Used for Blender datablocks and collections: :class:`bpy.types.bpy_struct`
 
 For data that contains its own attributes groups/meshes/bones/scenes... etc.
 
-There are 2 main types that wrap Blenders data, one for data-blocks
+There are 2 main types that wrap Blenders data, one for datablocks
 (known internally as ``bpy_struct``), another for properties.
 
    >>> bpy.context.object

doc/python_api/rst_from_bmesh_opdefines.py

@@ -57,7 +57,7 @@ Operator Example
 ++++++++++++++++
 This script shows how operators can be used to model a link of a chain.
 
-.. literalinclude:: __/examples/bmesh.ops.1.py
+.. literalinclude:: ../examples/bmesh.ops.1.py
 """
 
 

doc/python_api/sphinx_changelog_gen.py

@@ -48,8 +48,7 @@ python doc/python_api/sphinx_changelog_gen.py -- \
 '''
 {"module.name":
     {"parent.class":
-        {"basic_type", "member_name":
-            ("Name", type, range, length, default, descr, f_args, f_arg_types, f_ret_types)}, ...
+        {"basic_type", "member_name": ("Name", type, range, length, default, descr, f_args, f_arg_types, f_ret_types)}, ...
     }, ...
 }
 '''
@@ -100,34 +99,34 @@ def api_dump():
                 prop_range = None
 
             dump_class[prop_id] = (
-                "prop_rna",                 # basic_type
-                prop.name,                  # name
-                prop_type,                  # type
-                prop_range,                 # range
-                prop_length,                # length
-                prop.default,               # default
-                prop.description,           # descr
-                Ellipsis,                   # f_args
-                Ellipsis,                   # f_arg_types
-                Ellipsis,                   # f_ret_types
-            )
+                    "prop_rna",                 # basic_type
+                    prop.name,                  # name
+                    prop_type,                  # type
+                    prop_range,                 # range
+                    prop_length,                # length
+                    prop.default,               # default
+                    prop.description,           # descr
+                    Ellipsis,                   # f_args
+                    Ellipsis,                   # f_arg_types
+                    Ellipsis,                   # f_ret_types
+                    )
         del props
 
         # python props, tricky since we dont know much about them.
         for prop_id, attr in struct_info.get_py_properties():
 
             dump_class[prop_id] = (
-                "prop_py",                  # basic_type
-                Ellipsis,                   # name
-                Ellipsis,                   # type
-                Ellipsis,                   # range
-                Ellipsis,                   # length
-                Ellipsis,                   # default
-                attr.__doc__,               # descr
-                Ellipsis,                   # f_args
-                Ellipsis,                   # f_arg_types
-                Ellipsis,                   # f_ret_types
-            )
+                    "prop_py",                  # basic_type
+                    Ellipsis,                   # name
+                    Ellipsis,                   # type
+                    Ellipsis,                   # range
+                    Ellipsis,                   # length
+                    Ellipsis,                   # default
+                    attr.__doc__,               # descr
+                    Ellipsis,                   # f_args
+                    Ellipsis,                   # f_arg_types
+                    Ellipsis,                   # f_ret_types
+                    )
 
         # kludge func -> props
         funcs = [(func.identifier, func) for func in struct_info.functions]
@@ -138,17 +137,17 @@ def api_dump():
             func_args_type = tuple([prop.type for prop in func.args])
 
             dump_class[func_id] = (
-                "func_rna",                 # basic_type
-                Ellipsis,                   # name
-                Ellipsis,                   # type
-                Ellipsis,                   # range
-                Ellipsis,                   # length
-                Ellipsis,                   # default
-                func.description,           # descr
-                func_args_ids,              # f_args
-                func_args_type,             # f_arg_types
-                func_ret_types,             # f_ret_types
-            )
+                    "func_rna",                 # basic_type
+                    Ellipsis,                   # name
+                    Ellipsis,                   # type
+                    Ellipsis,                   # range
+                    Ellipsis,                   # length
+                    Ellipsis,                   # default
+                    func.description,           # descr
+                    func_args_ids,              # f_args
+                    func_args_type,             # f_arg_types
+                    func_ret_types,             # f_ret_types
+                    )
         del funcs
 
         # kludge func -> props
@@ -159,17 +158,17 @@ def api_dump():
             func_args_ids = tuple(inspect.getargspec(attr).args)
 
             dump_class[func_id] = (
-                "func_py",                  # basic_type
-                Ellipsis,                   # name
-                Ellipsis,                   # type
-                Ellipsis,                   # range
-                Ellipsis,                   # length
-                Ellipsis,                   # default
-                attr.__doc__,               # descr
-                func_args_ids,              # f_args
-                Ellipsis,                   # f_arg_types
-                Ellipsis,                   # f_ret_types
-            )
+                    "func_py",                  # basic_type
+                    Ellipsis,                   # name
+                    Ellipsis,                   # type
+                    Ellipsis,                   # range
+                    Ellipsis,                   # length
+                    Ellipsis,                   # default
+                    attr.__doc__,               # descr
+                    func_args_ids,              # f_args
+                    Ellipsis,                   # f_arg_types
+                    Ellipsis,                   # f_ret_types
+                    )
         del funcs
 
     import pprint
@@ -337,19 +336,15 @@ def main():
 
     parser = argparse.ArgumentParser(description=usage_text, epilog=epilog)
 
-    parser.add_argument(
-        "--dump", dest="dump", action='store_true',
-        help="When set the api will be dumped into blender_version.py")
+    parser.add_argument("--dump", dest="dump", action='store_true',
+            help="When set the api will be dumped into blender_version.py")
 
-    parser.add_argument(
-        "--api_from", dest="api_from", metavar='FILE',
-        help="File to compare from (previous version)")
-    parser.add_argument(
-        "--api_to", dest="api_to", metavar='FILE',
-        help="File to compare from (current)")
-    parser.add_argument(
-        "--api_out", dest="api_out", metavar='FILE',
-        help="Output sphinx changelog")
+    parser.add_argument("--api_from", dest="api_from", metavar='FILE',
+            help="File to compare from (previous version)")
+    parser.add_argument("--api_to", dest="api_to", metavar='FILE',
+            help="File to compare from (current)")
+    parser.add_argument("--api_out", dest="api_out", metavar='FILE',
+            help="Output sphinx changelog")
 
     args = parser.parse_args(argv)  # In this example we wont use the args
 

doc/python_api/sphinx_doc_gen.py

@@ -24,7 +24,7 @@ SCRIPT_HELP_MSG = """
 
 API dump in RST files
 ---------------------
-  Run this script from Blender's root path once you have compiled Blender
+  Run this script from blenders root path once you have compiled blender
 
     ./blender.bin --background -noaudio --python doc/python_api/sphinx_doc_gen.py
 
@@ -61,14 +61,14 @@ Sphinx: PDF generation
 """
 
 try:
-    import bpy  # Blender module
+    import bpy  # blender module
 except ImportError:
     print("\nERROR: this script must run from inside Blender")
     print(SCRIPT_HELP_MSG)
     import sys
     sys.exit()
 
-import rna_info     # Blender module
+import rna_info     # blender module
 
 
 def rna_info_BuildRNAInfo_cache():
@@ -181,13 +181,15 @@ def handle_args():
                         dest="log",
                         default=False,
                         action='store_true',
-                        help="Log the output of the api dump and sphinx|latex "
-                             "warnings and errors (default=False).\n"
-                             "If given, save logs in:\n"
-                             "* OUTPUT_DIR/.bpy.log\n"
-                             "* OUTPUT_DIR/.sphinx-build.log\n"
-                             "* OUTPUT_DIR/.sphinx-build_pdf.log\n"
-                             "* OUTPUT_DIR/.latex_make.log",
+                        help=(
+                        "Log the output of the api dump and sphinx|latex "
+                        "warnings and errors (default=False).\n"
+                        "If given, save logs in:\n"
+                        "* OUTPUT_DIR/.bpy.log\n"
+                        "* OUTPUT_DIR/.sphinx-build.log\n"
+                        "* OUTPUT_DIR/.sphinx-build_pdf.log\n"
+                        "* OUTPUT_DIR/.latex_make.log",
+                        ),
                         required=False)
 
     # parse only the args passed after '--'
@@ -222,12 +224,12 @@ if not ARGS.partial:
     FILTER_BPY_OPS = None
     FILTER_BPY_TYPES = None
     EXCLUDE_INFO_DOCS = False
-    EXCLUDE_MODULES = []
+    EXCLUDE_MODULES = ()
 
 else:
     # can manually edit this too:
-    # FILTER_BPY_OPS = ("import.scene", )  # allow
-    # FILTER_BPY_TYPES = ("bpy_struct", "Operator", "ID")  # allow
+    #FILTER_BPY_OPS = ("import.scene", )  # allow
+    #FILTER_BPY_TYPES = ("bpy_struct", "Operator", "ID")  # allow
     EXCLUDE_INFO_DOCS = True
     EXCLUDE_MODULES = [
         "aud",
@@ -260,7 +262,6 @@ else:
         "bpy_extras",
         "gpu",
         "gpu.offscreen",
-        "idprop.types",
         "mathutils",
         "mathutils.bvhtree",
         "mathutils.geometry",
@@ -274,7 +275,7 @@ else:
         "freestyle.shaders",
         "freestyle.types",
         "freestyle.utils",
-    ]
+        ]
 
     # ------
     # Filter
@@ -300,9 +301,7 @@ else:
     del m
     del fnmatch
 
-    BPY_LOGGER.debug(
-        "Partial Doc Build, Skipping: %s\n" %
-        "\n                             ".join(sorted(EXCLUDE_MODULES)))
+    BPY_LOGGER.debug("Partial Doc Build, Skipping: %s\n" % "\n                             ".join(sorted(EXCLUDE_MODULES)))
 
     #
     # done filtering
@@ -312,39 +311,19 @@ try:
     __import__("aud")
 except ImportError:
     BPY_LOGGER.debug("Warning: Built without 'aud' module, docs incomplete...")
-    EXCLUDE_MODULES.append("aud")
+    EXCLUDE_MODULES = list(EXCLUDE_MODULES) + ["aud"]
 
 try:
     __import__("freestyle")
 except ImportError:
     BPY_LOGGER.debug("Warning: Built without 'freestyle' module, docs incomplete...")
-    EXCLUDE_MODULES.extend([
-        "freestyle",
-        "freestyle.chainingiterators",
-        "freestyle.functions",
-        "freestyle.predicates",
-        "freestyle.shaders",
-        "freestyle.types",
-        "freestyle.utils",
-    ])
-
-# Source files we use, and need to copy to the OUTPUT_DIR
-# to have working out-of-source builds.
-# Note that ".." is replaced by "__" in the RST files,
-# to avoid having to match Blender's source tree.
-EXTRA_SOURCE_FILES = (
-    "../../../release/scripts/templates_py/bmesh_simple.py",
-    "../../../release/scripts/templates_py/operator_simple.py",
-    "../../../release/scripts/templates_py/ui_panel_simple.py",
-    "../../../release/scripts/templates_py/ui_previews_custom_icon.py",
-    "../examples/bge.constraints.py",
-    "../examples/bge.texture.1.py",
-    "../examples/bge.texture.2.py",
-    "../examples/bge.texture.py",
-    "../examples/bmesh.ops.1.py",
-    "../examples/bpy.app.translations.py",
-)
-
+    EXCLUDE_MODULES = list(EXCLUDE_MODULES) + ["freestyle",
+                                               "freestyle.chainingiterators",
+                                               "freestyle.functions",
+                                               "freestyle.predicates",
+                                               "freestyle.shaders",
+                                               "freestyle.types",
+                                               "freestyle.utils"]
 
 # examples
 EXAMPLES_DIR = os.path.abspath(os.path.join(SCRIPT_DIR, "examples"))
@@ -360,59 +339,52 @@ RST_DIR = os.path.abspath(os.path.join(SCRIPT_DIR, "rst"))
 # extra info, not api reference docs
 # stored in ./rst/info_*
 INFO_DOCS = (
-    ("info_quickstart.rst",
-     "Blender/Python Quickstart: new to Blender/scripting and want to get your feet wet?"),
-    ("info_overview.rst",
-     "Blender/Python API Overview: a more complete explanation of Python integration"),
-    ("info_tutorial_addon.rst",
-     "Blender/Python Addon Tutorial: a step by step guide on how to write an addon from scratch"),
-    ("info_api_reference.rst",
-     "Blender/Python API Reference Usage: examples of how to use the API reference docs"),
-    ("info_best_practice.rst",
-     "Best Practice: Conventions to follow for writing good scripts"),
-    ("info_tips_and_tricks.rst",
-     "Tips and Tricks: Hints to help you while writing scripts for Blender"),
-    ("info_gotcha.rst",
-     "Gotcha's: some of the problems you may come up against when writing scripts"),
-)
+    ("info_quickstart.rst", "Blender/Python Quickstart: new to blender/scripting and want to get your feet wet?"),
+    ("info_overview.rst", "Blender/Python API Overview: a more complete explanation of python integration"),
+    ("info_tutorial_addon.rst", "Blender/Python Addon Tutorial: a step by step guide on how to write an addon from scratch"),
+    ("info_api_reference.rst", "Blender/Python API Reference Usage: examples of how to use the API reference docs"),
+    ("info_best_practice.rst", "Best Practice: Conventions to follow for writing good scripts"),
+    ("info_tips_and_tricks.rst", "Tips and Tricks: Hints to help you while writing scripts for blender"),
+    ("info_gotcha.rst", "Gotcha's: some of the problems you may come up against when writing scripts"),
+    )
 
 # only support for properties atm.
 RNA_BLACKLIST = {
     # XXX messes up PDF!, really a bug but for now just workaround.
     "UserPreferencesSystem": {"language", }
-}
+    }
 
 MODULE_GROUPING = {
     "bmesh.types": (
-        ("Base Mesh Type", '-'),
-        "BMesh",
-        ("Mesh Elements", '-'),
-        "BMVert",
-        "BMEdge",
-        "BMFace",
-        "BMLoop",
-        ("Sequence Accessors", '-'),
-        "BMElemSeq",
-        "BMVertSeq",
-        "BMEdgeSeq",
-        "BMFaceSeq",
-        "BMLoopSeq",
-        "BMIter",
-        ("Selection History", '-'),
-        "BMEditSelSeq",
-        "BMEditSelIter",
-        ("Custom-Data Layer Access", '-'),
-        "BMLayerAccessVert",
-        "BMLayerAccessEdge",
-        "BMLayerAccessFace",
-        "BMLayerAccessLoop",
-        "BMLayerCollection",
-        "BMLayerItem",
-        ("Custom-Data Layer Types", '-'),
-        "BMLoopUV",
-        "BMDeformVert"
-    )
-}
+                    ("Base Mesh Type", '-'),
+                    "BMesh",
+                    ("Mesh Elements", '-'),
+                    "BMVert",
+                    "BMEdge",
+                    "BMFace",
+                    "BMLoop",
+                    ("Sequence Accessors", '-'),
+                    "BMElemSeq",
+                    "BMVertSeq",
+                    "BMEdgeSeq",
+                    "BMFaceSeq",
+                    "BMLoopSeq",
+                    "BMIter",
+                    ("Selection History", '-'),
+                    "BMEditSelSeq",
+                    "BMEditSelIter",
+                    ("Custom-Data Layer Access", '-'),
+                    "BMLayerAccessVert",
+                    "BMLayerAccessEdge",
+                    "BMLayerAccessFace",
+                    "BMLayerAccessLoop",
+                    "BMLayerCollection",
+                    "BMLayerItem",
+                    ("Custom-Data Layer Types", '-'),
+                    "BMLoopUV",
+                    "BMDeformVert"
+                    )
+    }
 
 # --------------------configure compile time options----------------------------
 
@@ -488,10 +460,10 @@ MethodDescriptorType = type(dict.get)
 GetSetDescriptorType = type(int.real)
 StaticMethodType = type(staticmethod(lambda: None))
 from types import (
-    MemberDescriptorType,
-    MethodType,
-    FunctionType,
-)
+        MemberDescriptorType,
+        MethodType,
+        FunctionType,
+        )
 
 _BPY_STRUCT_FAKE = "bpy_struct"
 _BPY_PROP_COLLECTION_FAKE = "bpy_prop_collection"
@@ -511,7 +483,7 @@ escape_rst.trans = str.maketrans({
     "|": "\\|",
     "*": "\\*",
     "\\": "\\\\",
-})
+    })
 
 
 def is_struct_seq(value):
@@ -756,7 +728,7 @@ def py_c_func2sphinx(ident, fw, module_name, type_name, identifier, py_func, is_
 
 def pyprop2sphinx(ident, fw, identifier, py_prop):
     '''
-    Python property to sphinx
+    python property to sphinx
     '''
     # readonly properties use "data" directive, variables use "attribute" directive
     if py_prop.fset is None:
@@ -856,8 +828,7 @@ def pymodule2sphinx(basepath, module_name, module, title):
         # naughty, we also add getset's into PyStructs, this is not typical py but also not incorrect.
 
         # type_name is only used for examples and messages
-        # "<class 'bpy.app.handlers'>" --> bpy.app.handlers
-        type_name = str(type(module)).strip("<>").split(" ", 1)[-1][1:-1]
+        type_name = str(type(module)).strip("<>").split(" ", 1)[-1][1:-1]  # "<class 'bpy.app.handlers'>" --> bpy.app.handlers
         if type(descr) == types.GetSetDescriptorType:
             py_descr2sphinx("", fw, descr, module_name, type_name, key)
             attribute_set.add(key)
@@ -918,8 +889,7 @@ def pymodule2sphinx(basepath, module_name, module, title):
     for attribute, value, value_type in module_dir_value_type:
         if value_type == FunctionType:
             pyfunc2sphinx("", fw, module_name, None, attribute, value, is_class=False)
-        # both the same at the moment but to be future proof
-        elif value_type in {types.BuiltinMethodType, types.BuiltinFunctionType}:
+        elif value_type in {types.BuiltinMethodType, types.BuiltinFunctionType}:  # both the same at the moment but to be future proof
             # note: can't get args from these, so dump the string as is
             # this means any module used like this must have fully formatted docstrings.
             py_c_func2sphinx("", fw, module_name, None, attribute, value, is_class=False)
@@ -985,7 +955,7 @@ def pymodule2sphinx(basepath, module_name, module, title):
             if type(descr) == ClassMethodDescriptorType:
                 py_descr2sphinx("   ", fw, descr, module_name, type_name, key)
 
-        # needed for pure Python classes
+        # needed for pure python classes
         for key, descr in descr_items:
             if type(descr) == FunctionType:
                 pyfunc2sphinx("   ", fw, module_name, type_name, key, descr, is_class=True)
@@ -1008,15 +978,12 @@ def pymodule2sphinx(basepath, module_name, module, title):
 
     file.close()
 
-# Changes in Blender will force errors here
+# Changes in blender will force errors here
 context_type_map = {
     "active_base": ("ObjectBase", False),
     "active_bone": ("EditBone", False),
     "active_gpencil_frame": ("GreasePencilLayer", True),
     "active_gpencil_layer": ("GPencilLayer", True),
-    "active_gpencil_brush": ("GPencilSculptBrush", False),
-    "active_gpencil_palette": ("GPencilPalette", True),
-    "active_gpencil_palettecolor": ("GPencilPaletteColor", True),
     "active_node": ("Node", False),
     "active_object": ("Object", False),
     "active_operator": ("Operator", False),
@@ -1099,10 +1066,9 @@ def pycontext2sphinx(basepath):
     fw(title_string("Context Access (bpy.context)", "="))
     fw(".. module:: bpy.context\n")
     fw("\n")
-    fw("The context members available depend on the area of Blender which is currently being accessed.\n")
+    fw("The context members available depend on the area of blender which is currently being accessed.\n")
     fw("\n")
-    fw("Note that all context values are readonly,\n")
-    fw("but may be modified through the data api or by running operators\n\n")
+    fw("Note that all context values are readonly, but may be modified through the data api or by running operators\n\n")
 
     def write_contex_cls():
 
@@ -1125,8 +1091,7 @@ def pycontext2sphinx(basepath):
             if prop.identifier in struct_blacklist:
                 continue
 
-            type_descr = prop.get_type_description(
-                class_fmt=":class:`bpy.types.%s`", collection_id=_BPY_PROP_COLLECTION_ID)
+            type_descr = prop.get_type_description(class_fmt=":class:`bpy.types.%s`", collection_id=_BPY_PROP_COLLECTION_ID)
             fw(".. data:: %s\n\n" % prop.identifier)
             if prop.description:
                 fw("   %s\n\n" % prop.description)
@@ -1146,7 +1111,7 @@ def pycontext2sphinx(basepath):
     del write_contex_cls
     # end
 
-    # nasty, get strings directly from Blender because there is no other way to get it
+    # nasty, get strings directly from blender because there is no other way to get it
     import ctypes
 
     context_strings = (
@@ -1182,9 +1147,7 @@ def pycontext2sphinx(basepath):
     # for member in sorted(unique):
     #     print('        "%s": ("", False),' % member)
     if len(context_type_map) > len(unique):
-        raise Exception(
-            "Some types are not used: %s" %
-            str([member for member in context_type_map if member not in unique]))
+        raise Exception("Some types are not used: %s" % str([member for member in context_type_map if member not in unique]))
     else:
         pass  # will have raised an error above
 
@@ -1263,11 +1226,11 @@ def pyrna2sphinx(basepath):
         fw(ident + ":%s%s: %s\n" % (id_type, identifier, type_descr))
 
     def write_struct(struct):
-        # if not struct.identifier.startswith("Sc") and not struct.identifier.startswith("I"):
-        #     return
+        #if not struct.identifier.startswith("Sc") and not struct.identifier.startswith("I"):
+        #    return
 
-        # if not struct.identifier == "Object":
-        #     return
+        #if not struct.identifier == "Object":
+        #    return
 
         filepath = os.path.join(basepath, "bpy.types.%s.rst" % struct.identifier)
         file = open(filepath, "w", encoding="utf-8")
@@ -1308,11 +1271,7 @@ def pyrna2sphinx(basepath):
             fw(", ".join((":class:`%s`" % base_id) for base_id in base_ids))
             fw("\n\n")
 
-        subclass_ids = [
-            s.identifier for s in structs.values()
-            if s.base is struct
-            if not rna_info.rna_id_ignore(s.identifier)
-        ]
+        subclass_ids = [s.identifier for s in structs.values() if s.base is struct if not rna_info.rna_id_ignore(s.identifier)]
         subclass_ids.sort()
         if subclass_ids:
             fw("subclasses --- \n" + ", ".join((":class:`%s`" % s) for s in subclass_ids) + "\n\n")
@@ -1363,7 +1322,7 @@ def pyrna2sphinx(basepath):
 
             fw("      :type: %s\n\n" % type_descr)
 
-        # Python attributes
+        # python attributes
         py_properties = struct.get_py_properties()
         py_prop = None
         for identifier, py_prop in py_properties:
@@ -1373,8 +1332,7 @@ def pyrna2sphinx(basepath):
         for func in struct.functions:
             args_str = ", ".join(prop.get_arg_default(force=False) for prop in func.args)
 
-            fw("   .. %s:: %s(%s)\n\n" %
-               ("classmethod" if func.is_classmethod else "method", func.identifier, args_str))
+            fw("   .. %s:: %s(%s)\n\n" % ("classmethod" if func.is_classmethod else "method", func.identifier, args_str))
             fw("      %s\n\n" % func.description)
 
             for prop in func.args:
@@ -1385,10 +1343,8 @@ def pyrna2sphinx(basepath):
             elif func.return_values:  # multiple return values
                 fw("      :return (%s):\n" % ", ".join(prop.identifier for prop in func.return_values))
                 for prop in func.return_values:
-                    # TODO, pyrna_enum2sphinx for multiple return values... actually dont
-                    # think we even use this but still!!!
-                    type_descr = prop.get_type_description(
-                        as_ret=True, class_fmt=":class:`%s`", collection_id=_BPY_PROP_COLLECTION_ID)
+                    # TODO, pyrna_enum2sphinx for multiple return values... actually dont think we even use this but still!!!
+                    type_descr = prop.get_type_description(as_ret=True, class_fmt=":class:`%s`", collection_id=_BPY_PROP_COLLECTION_ID)
                     descr = prop.description
                     if not descr:
                         descr = prop.name
@@ -1401,7 +1357,7 @@ def pyrna2sphinx(basepath):
 
             fw("\n")
 
-        # Python methods
+        # python methods
         py_funcs = struct.get_py_functions()
         py_func = None
 
@@ -1424,10 +1380,7 @@ def pyrna2sphinx(basepath):
             del lines[:]
 
             if _BPY_STRUCT_FAKE:
-                descr_items = [
-                    (key, descr) for key, descr in sorted(bpy.types.Struct.__bases__[0].__dict__.items())
-                    if not key.startswith("__")
-                ]
+                descr_items = [(key, descr) for key, descr in sorted(bpy.types.Struct.__bases__[0].__dict__.items()) if not key.startswith("__")]
 
             if _BPY_STRUCT_FAKE:
                 for key, descr in descr_items:
@@ -1523,28 +1476,19 @@ def pyrna2sphinx(basepath):
             fw("\n")
 
             if use_subclasses:
-                subclass_ids = [
-                    s.identifier for s in structs.values()
-                    if s.base is None
-                    if not rna_info.rna_id_ignore(s.identifier)
-                ]
+                subclass_ids = [s.identifier for s in structs.values() if s.base is None if not rna_info.rna_id_ignore(s.identifier)]
                 if subclass_ids:
                     fw("subclasses --- \n" + ", ".join((":class:`%s`" % s) for s in sorted(subclass_ids)) + "\n\n")
 
             fw(".. class:: %s\n\n" % class_name)
             fw("   %s\n\n" % descr_str)
             fw("   .. note::\n\n")
-            fw("      Note that bpy.types.%s is not actually available from within Blender,\n"
-               "      it only exists for the purpose of documentation.\n\n" % class_name)
+            fw("      Note that bpy.types.%s is not actually available from within blender, it only exists for the purpose of documentation.\n\n" % class_name)
 
-            descr_items = [
-                (key, descr) for key, descr in sorted(class_value.__dict__.items())
-                if not key.startswith("__")
-            ]
+            descr_items = [(key, descr) for key, descr in sorted(class_value.__dict__.items()) if not key.startswith("__")]
 
             for key, descr in descr_items:
-                # GetSetDescriptorType, GetSetDescriptorType's are not documented yet
-                if type(descr) == MethodDescriptorType:
+                if type(descr) == MethodDescriptorType:  # GetSetDescriptorType, GetSetDescriptorType's are not documented yet
                     py_descr2sphinx("   ", fw, descr, "bpy.types", class_name, key)
 
             for key, descr in descr_items:
@@ -1555,15 +1499,11 @@ def pyrna2sphinx(basepath):
         # write fake classes
         if _BPY_STRUCT_FAKE:
             class_value = bpy.types.Struct.__bases__[0]
-            fake_bpy_type(
-                class_value, _BPY_STRUCT_FAKE,
-                "built-in base class for all classes in bpy.types.", use_subclasses=True)
+            fake_bpy_type(class_value, _BPY_STRUCT_FAKE, "built-in base class for all classes in bpy.types.", use_subclasses=True)
 
         if _BPY_PROP_COLLECTION_FAKE:
             class_value = bpy.data.objects.__class__
-            fake_bpy_type(
-                class_value, _BPY_PROP_COLLECTION_FAKE,
-                "built-in class used for all collections.", use_subclasses=False)
+            fake_bpy_type(class_value, _BPY_PROP_COLLECTION_FAKE, "built-in class used for all collections.", use_subclasses=False)
 
     # operators
     def write_ops():
@@ -1675,13 +1615,11 @@ def write_rst_contents(basepath):
 
     fw(title_string("Blender Documentation Contents", "%", double=True))
     fw("\n")
-    fw("Welcome, this document is an API reference for Blender %s, built %s.\n" %
-       (BLENDER_VERSION_DOTS, BLENDER_DATE))
+    fw("Welcome, this document is an API reference for Blender %s, built %s.\n" % (BLENDER_VERSION_DOTS, BLENDER_DATE))
     fw("\n")
 
     # fw("`A PDF version of this document is also available <%s>`_\n" % BLENDER_PDF_FILENAME)
-    fw("This site can be downloaded for offline use `Download the full Documentation (zipped HTML files) <%s>`_\n" %
-       BLENDER_ZIP_FILENAME)
+    fw("This site can be downloaded for offline use `Download the full Documentation (zipped HTML files) <%s>`_\n" % BLENDER_ZIP_FILENAME)
 
     fw("\n")
 
@@ -1714,7 +1652,7 @@ def write_rst_contents(basepath):
 
         # C modules
         "bpy.props",
-    )
+        )
 
     for mod in app_modules:
         if mod not in EXCLUDE_MODULES:
@@ -1735,10 +1673,9 @@ def write_rst_contents(basepath):
         "freestyle", "bgl", "blf",
         "gpu", "gpu.offscreen",
         "aud", "bpy_extras",
-        "idprop.types",
         # bmesh, submodules are in own page
         "bmesh",
-    )
+        )
 
     for mod in standalone_modules:
         if mod not in EXCLUDE_MODULES:
@@ -1776,8 +1713,7 @@ def write_rst_contents(basepath):
     fw("      * mesh creation and editing functions\n")
     fw("   \n")
     fw("   These parts of the API are relatively stable and are unlikely to change significantly\n")
-    fw("      * data API, access to attributes of Blender data such as mesh verts, material color,\n")
-    fw("        timeline frames and scene objects\n")
+    fw("      * data API, access to attributes of blender data such as mesh verts, material color, timeline frames and scene objects\n")
     fw("      * user interface functions for defining buttons, creation of menus, headers, panels\n")
     fw("      * render engine integration\n")
     fw("      * modules: bgl, mathutils & game engine.\n")
@@ -1849,11 +1785,11 @@ def write_rst_data(basepath):
         fw(title_string("Data Access (bpy.data)", "="))
         fw(".. module:: bpy\n")
         fw("\n")
-        fw("This module is used for all Blender/Python access.\n")
+        fw("This module is used for all blender/python access.\n")
         fw("\n")
         fw(".. data:: data\n")
         fw("\n")
-        fw("   Access to Blender's internal data\n")
+        fw("   Access to blenders internal data\n")
         fw("\n")
         fw("   :type: :class:`bpy.types.BlendData`\n")
         fw("\n")
@@ -1868,38 +1804,37 @@ def write_rst_importable_modules(basepath):
     Write the rst files of importable modules
     '''
     importable_modules = {
-        # Python_modules
-        "bpy.path": "Path Utilities",
-        "bpy.utils": "Utilities",
-        "bpy_extras": "Extra Utilities",
+        # python_modules
+        "bpy.path"             : "Path Utilities",
+        "bpy.utils"            : "Utilities",
+        "bpy_extras"           : "Extra Utilities",
 
         # C_modules
-        "aud": "Audio System",
-        "blf": "Font Drawing",
-        "gpu.offscreen": "GPU Off-Screen Buffer",
-        "bmesh": "BMesh Module",
-        "bmesh.types": "BMesh Types",
-        "bmesh.utils": "BMesh Utilities",
-        "bmesh.geometry": "BMesh Geometry Utilities",
-        "bpy.app": "Application Data",
-        "bpy.app.handlers": "Application Handlers",
-        "bpy.app.translations": "Application Translations",
-        "bpy.props": "Property Definitions",
-        "idprop.types": "ID Property Access",
-        "mathutils": "Math Types & Utilities",
-        "mathutils.geometry": "Geometry Utilities",
-        "mathutils.bvhtree": "BVHTree Utilities",
-        "mathutils.kdtree": "KDTree Utilities",
+        "aud"                  : "Audio System",
+        "blf"                  : "Font Drawing",
+        "gpu.offscreen"        : "GPU Off-Screen Buffer",
+        "bmesh"                : "BMesh Module",
+        "bmesh.types"          : "BMesh Types",
+        "bmesh.utils"          : "BMesh Utilities",
+        "bmesh.geometry"       : "BMesh Geometry Utilities",
+        "bpy.app"              : "Application Data",
+        "bpy.app.handlers"     : "Application Handlers",
+        "bpy.app.translations" : "Application Translations",
+        "bpy.props"            : "Property Definitions",
+        "mathutils"            : "Math Types & Utilities",
+        "mathutils.geometry"   : "Geometry Utilities",
+        "mathutils.bvhtree"    : "BVHTree Utilities",
+        "mathutils.kdtree"     : "KDTree Utilities",
         "mathutils.interpolate": "Interpolation Utilities",
-        "mathutils.noise": "Noise Utilities",
-        "freestyle": "Freestyle Module",
-        "freestyle.types": "Freestyle Types",
-        "freestyle.predicates": "Freestyle Predicates",
-        "freestyle.functions": "Freestyle Functions",
-        "freestyle.chainingiterators": "Freestyle Chaining Iterators",
-        "freestyle.shaders": "Freestyle Shaders",
-        "freestyle.utils": "Freestyle Utilities",
-    }
+        "mathutils.noise"      : "Noise Utilities",
+        "freestyle"            : "Freestyle Module",
+        "freestyle.types"      : "Freestyle Types",
+        "freestyle.predicates" : "Freestyle Predicates",
+        "freestyle.functions"  : "Freestyle Functions",
+        "freestyle.chainingiterators" : "Freestyle Chaining Iterators",
+        "freestyle.shaders"    : "Freestyle Shaders",
+        "freestyle.utils"      : "Freestyle Utilities",
+        }
     for mod_name, mod_descr in importable_modules.items():
         if mod_name not in EXCLUDE_MODULES:
             module = __import__(mod_name,
@@ -1914,7 +1849,7 @@ def copy_handwritten_rsts(basepath):
         for info, info_desc in INFO_DOCS:
             shutil.copy2(os.path.join(RST_DIR, info), basepath)
 
-    # TODO put this docs in Blender's code and use import as per modules above
+    # TODO put this docs in blender's code and use import as per modules above
     handwritten_modules = [
         "bge.logic",
         "bge.render",
@@ -1955,21 +1890,6 @@ def copy_handwritten_rsts(basepath):
             shutil.copy2(os.path.join(RST_DIR, f), basepath)
 
 
-def copy_handwritten_extra(basepath):
-    for f_src in EXTRA_SOURCE_FILES:
-        if os.sep != "/":
-            f_src = os.sep.join(f_src.split("/"))
-
-        f_dst = f_src.replace("..", "__")
-
-        f_src = os.path.join(RST_DIR, f_src)
-        f_dst = os.path.join(basepath, f_dst)
-
-        os.makedirs(os.path.dirname(f_dst), exist_ok=True)
-
-        shutil.copy2(f_src, f_dst)
-
-
 def rna2sphinx(basepath):
 
     try:
@@ -2001,48 +1921,35 @@ def rna2sphinx(basepath):
     # copy the other rsts
     copy_handwritten_rsts(basepath)
 
-    # copy source files referenced
-    copy_handwritten_extra(basepath)
 
-
-def align_sphinx_in_to_sphinx_in_tmp(dir_src, dir_dst):
+def align_sphinx_in_to_sphinx_in_tmp():
     '''
     Move changed files from SPHINX_IN_TMP to SPHINX_IN
     '''
     import filecmp
 
-    # possible the dir doesn't exist when running recursively
-    os.makedirs(dir_dst, exist_ok=True)
-
-    sphinx_dst_files = set(os.listdir(dir_dst))
-    sphinx_src_files = set(os.listdir(dir_src))
+    sphinx_in_files = set(os.listdir(SPHINX_IN))
+    sphinx_in_tmp_files = set(os.listdir(SPHINX_IN_TMP))
 
     # remove deprecated files that have been removed
-    for f in sorted(sphinx_dst_files):
-        if f not in sphinx_src_files:
+    for f in sorted(sphinx_in_files):
+        if f not in sphinx_in_tmp_files:
             BPY_LOGGER.debug("\tdeprecated: %s" % f)
-            f_dst = os.path.join(dir_dst, f)
-            if os.path.isdir(f_dst):
-                shutil.rmtree(f_dst, True)
-            else:
-                os.remove(f_dst)
+            os.remove(os.path.join(SPHINX_IN, f))
 
     # freshen with new files.
-    for f in sorted(sphinx_src_files):
-        f_src = os.path.join(dir_src, f)
-        f_dst = os.path.join(dir_dst, f)
+    for f in sorted(sphinx_in_tmp_files):
+        f_from = os.path.join(SPHINX_IN_TMP, f)
+        f_to = os.path.join(SPHINX_IN, f)
 
-        if os.path.isdir(f_src):
-            align_sphinx_in_to_sphinx_in_tmp(f_src, f_dst)
-        else:
-            do_copy = True
-            if f in sphinx_dst_files:
-                if filecmp.cmp(f_src, f_dst):
-                    do_copy = False
+        do_copy = True
+        if f in sphinx_in_files:
+            if filecmp.cmp(f_from, f_to):
+                do_copy = False
 
-            if do_copy:
-                BPY_LOGGER.debug("\tupdating: %s" % f)
-                shutil.copy(f_src, f_dst)
+        if do_copy:
+            BPY_LOGGER.debug("\tupdating: %s" % f)
+            shutil.copy(f_from, f_to)
 
 
 def refactor_sphinx_log(sphinx_logfile):
@@ -2129,7 +2036,7 @@ def main():
             shutil.rmtree(SPHINX_OUT_PDF, True)
     else:
         # move changed files in SPHINX_IN
-        align_sphinx_in_to_sphinx_in_tmp(SPHINX_IN_TMP, SPHINX_IN)
+        align_sphinx_in_to_sphinx_in_tmp()
 
     # report which example files weren't used
     EXAMPLE_SET_UNUSED = EXAMPLE_SET - EXAMPLE_SET_USED

doc/python_api/sphinx_doc_gen.sh

@@ -3,6 +3,11 @@
 #   bash doc/python_api/sphinx_doc_gen.sh
 # ssh upload means you need an account on the server
 
+if [ "$1" == "" ] ; then
+	echo "Expected a single argument for the username on blender.org, aborting"
+	exit 1
+fi
+
 # ----------------------------------------------------------------------------
 # Upload vars
 
@@ -17,15 +22,9 @@ if [ -z $BLENDER_BIN ] ; then
 	BLENDER_BIN="./blender.bin"
 fi
 
-if [ "$1" == "" ] ; then
-	echo "Expected a single argument for the username on blender.org, skipping upload step!"
-	DO_UPLOAD=false
-else
-	SSH_USER=$1
-	SSH_HOST=$SSH_USER"@blender.org"
-	SSH_UPLOAD="/data/www/vhosts/www.blender.org/api" # blender_python_api_VERSION, added after
-fi
-
+SSH_USER=$1
+SSH_HOST=$SSH_USER"@blender.org"
+SSH_UPLOAD="/data/www/vhosts/www.blender.org/api" # blender_python_api_VERSION, added after
 
 # ----------------------------------------------------------------------------
 # Blender Version & Info
@@ -34,12 +33,10 @@ fi
 # "_".join(str(v) for v in bpy.app.version)
 # custom blender vars
 blender_srcdir=$(dirname -- $0)/../..
-blender_version_header="$blender_srcdir/source/blender/blenkernel/BKE_blender_version.h"
-blender_version=$(grep "BLENDER_VERSION\s" "$blender_version_header" | awk '{print $3}')
-blender_version_char=$(grep "BLENDER_VERSION_CHAR\s" "$blender_version_header" | awk '{print $3}')
-blender_version_cycle=$(grep "BLENDER_VERSION_CYCLE\s" "$blender_version_header" | awk '{print $3}')
-blender_subversion=$(grep "BLENDER_SUBVERSION\s" "$blender_version_header" | awk '{print $3}')
-unset blender_version_header
+blender_version=$(grep "BLENDER_VERSION\s" "$blender_srcdir/source/blender/blenkernel/BKE_blender_version.h" | awk '{print $3}')
+blender_version_char=$(grep "BLENDER_VERSION_CHAR\s" "$blender_srcdir/source/blender/blenkernel/BKE_blender_version.h" | awk '{print $3}')
+blender_version_cycle=$(grep "BLENDER_VERSION_CYCLE\s" "$blender_srcdir/source/blender/blenkernel/BKE_blender_version.h" | awk '{print $3}')
+blender_subversion=$(grep "BLENDER_SUBVERSION\s" "$blender_srcdir/source/blender/blenkernel/BKE_blender_version.h" | awk '{print $3}')
 
 if [ "$blender_version_cycle" = "release" ] ; then
 	BLENDER_VERSION=$(expr $blender_version / 100)_$(expr $blender_version % 100)$blender_version_char"_release"
@@ -51,8 +48,6 @@ SSH_UPLOAD_FULL=$SSH_UPLOAD/"blender_python_api_"$BLENDER_VERSION
 
 SPHINXBASE=doc/python_api
 
-SPHINX_WORKDIR="$(mktemp --directory --suffix=.sphinx)"
-
 
 # ----------------------------------------------------------------------------
 # Generate reStructuredText (blender/python only)
@@ -64,10 +59,7 @@ if $DO_EXE_BLENDER ; then
 		-noaudio \
 		--factory-startup \
 		--python-exit-code 1 \
-		--python $SPHINXBASE/sphinx_doc_gen.py \
-		-- \
-		--output=$SPHINX_WORKDIR
-
+		--python $SPHINXBASE/sphinx_doc_gen.py
 
 	if (($? != 0)) ; then
 		echo "Generating documentation failed, aborting"
@@ -75,14 +67,15 @@ if $DO_EXE_BLENDER ; then
 	fi
 fi
 
+
 # ----------------------------------------------------------------------------
 # Generate HTML (sphinx)
 
 if $DO_OUT_HTML ; then
-	# sphinx-build -n -b html $SPHINX_WORKDIR/sphinx-in $SPHINX_WORKDIR/sphinx-out
+	# sphinx-build -n -b html $SPHINXBASE/sphinx-in $SPHINXBASE/sphinx-out
 
 	# annoying bug in sphinx makes it very slow unless we do this. should report.
-	cd $SPHINX_WORKDIR
+	cd $SPHINXBASE
 	sphinx-build -b html sphinx-in sphinx-out
 
 	# XXX, saves space on upload and zip, should move HTML outside
@@ -110,21 +103,20 @@ fi
 # Generate PDF (sphinx/laytex)
 
 if $DO_OUT_PDF ; then
-	cd $SPHINX_WORKDIR
-	sphinx-build -n -b latex $SPHINX_WORKDIR/sphinx-in $SPHINX_WORKDIR/sphinx-out
-	make -C $SPHINX_WORKDIR/sphinx-out
-	mv $SPHINX_WORKDIR/sphinx-out/contents.pdf \
-	   $SPHINX_WORKDIR/sphinx-out/blender_python_reference_$BLENDER_VERSION.pdf
+	sphinx-build -n -b latex $SPHINXBASE/sphinx-in $SPHINXBASE/sphinx-out
+	make -C $SPHINXBASE/sphinx-out
+	mv $SPHINXBASE/sphinx-out/contents.pdf $SPHINXBASE/sphinx-out/blender_python_reference_$BLENDER_VERSION.pdf
 fi
 
+
 # ----------------------------------------------------------------------------
 # Upload to blender servers, comment this section for testing
 
 if $DO_UPLOAD ; then
 
-	cp $SPHINX_WORKDIR/sphinx-out/contents.html $SPHINX_WORKDIR/sphinx-out/index.html
+	cp $SPHINXBASE/sphinx-out/contents.html $SPHINXBASE/sphinx-out/index.html
 	ssh $SSH_USER@blender.org 'rm -rf '$SSH_UPLOAD_FULL'/*'
-	rsync --progress -ave "ssh -p 22" $SPHINX_WORKDIR/sphinx-out/* $SSH_HOST:$SSH_UPLOAD_FULL/
+	rsync --progress -ave "ssh -p 22" $SPHINXBASE/sphinx-out/* $SSH_HOST:$SSH_UPLOAD_FULL/
 
 	## symlink the dir to a static URL
 	#ssh $SSH_USER@blender.org 'rm '$SSH_UPLOAD'/250PythonDoc && ln -s '$SSH_UPLOAD_FULL' '$SSH_UPLOAD'/250PythonDoc'
@@ -142,15 +134,11 @@ if $DO_UPLOAD ; then
 
 	if $DO_OUT_PDF ; then
 		# rename so local PDF has matching name.
-		rsync --progress -ave "ssh -p 22" \
-		      $SPHINX_WORKDIR/sphinx-out/blender_python_reference_$BLENDER_VERSION.pdf \
-		      $SSH_HOST:$SSH_UPLOAD_FULL/blender_python_reference_$BLENDER_VERSION.pdf
+		rsync --progress -ave "ssh -p 22" $SPHINXBASE/sphinx-out/blender_python_reference_$BLENDER_VERSION.pdf $SSH_HOST:$SSH_UPLOAD_FULL/blender_python_reference_$BLENDER_VERSION.pdf
 	fi
 
 	if $DO_OUT_HTML_ZIP ; then
-		rsync --progress -ave "ssh -p 22" \
-		      $SPHINX_WORKDIR/blender_python_reference_$BLENDER_VERSION.zip \
-		      $SSH_HOST:$SSH_UPLOAD_FULL/blender_python_reference_$BLENDER_VERSION.zip
+		rsync --progress -ave "ssh -p 22" $SPHINXBASE/blender_python_reference_$BLENDER_VERSION.zip $SSH_HOST:$SSH_UPLOAD_FULL/blender_python_reference_$BLENDER_VERSION.zip
 	fi
 
 fi
@@ -161,5 +149,5 @@ fi
 
 echo ""
 echo "Finished! view the docs from: "
-if $DO_OUT_HTML ; then echo "  html:" $SPHINX_WORKDIR/sphinx-out/contents.html ; fi
-if $DO_OUT_PDF ; then  echo "   pdf:" $SPHINX_WORKDIR/sphinx-out/blender_python_reference_$BLENDER_VERSION.pdf ; fi
+if $DO_OUT_HTML ; then echo "  html:" $SPHINXBASE/sphinx-out/contents.html ; fi
+if $DO_OUT_PDF ; then  echo "   pdf:" $SPHINXBASE/sphinx-out/blender_python_reference_$BLENDER_VERSION.pdf ; fi

doc/python_api/sphinx_doc_update.py

@@ -1,182 +0,0 @@
-#!/usr/bin/env python3
-
-# ##### BEGIN GPL LICENSE BLOCK #####
-#
-#  This program is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License
-#  as published by the Free Software Foundation; either version 2
-#  of the License, or (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software Foundation,
-#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# Contributor(s): Bastien Montagne
-#
-# ##### END GPL LICENSE BLOCK #####
-
-# <pep8 compliant>
-
-"""
-This is a helper script to generate Blender Python API documentation (using Sphinx), and update server data using rsync.
-
-You'll need to specify your user login and password, obviously.
-
-Example usage:
-
-   ./sphinx_doc_update.py --mirror ../../../docs/remote_api_backup/ --source ../.. --blender ../../../build_cmake/bin/blender --user foobar --password barfoo 
-
-"""
-
-import os
-import shutil
-import subprocess
-import sys
-import tempfile
-import zipfile
-
-
-DEFAULT_RSYNC_SERVER = "www.blender.org"
-DEFAULT_RSYNC_ROOT = "/api/"
-DEFAULT_SYMLINK_ROOT = "/data/www/vhosts/www.blender.org/api"
-
-
-def argparse_create():
-    import argparse
-    global __doc__
-
-    # When --help or no args are given, print this help
-    usage_text = __doc__
-
-    parser = argparse.ArgumentParser(description=usage_text,
-                                     formatter_class=argparse.RawDescriptionHelpFormatter)
-
-    parser.add_argument(
-        "--mirror", dest="mirror_dir",
-        metavar='PATH', required=True,
-        help="Path to local rsync mirror of api doc server")
-    parser.add_argument(
-        "--source", dest="source_dir",
-        metavar='PATH', required=True,
-        help="Path to Blender git repository")
-    parser.add_argument(
-        "--blender", dest="blender",
-        metavar='PATH', required=True,
-        help="Path to Blender executable")
-    parser.add_argument(
-        "--rsync-server", dest="rsync_server", default=DEFAULT_RSYNC_SERVER,
-        metavar='RSYNCSERVER', type=str, required=False,
-        help=("rsync server address"))
-    parser.add_argument(
-        "--rsync-root", dest="rsync_root", default=DEFAULT_RSYNC_ROOT,
-        metavar='RSYNCROOT', type=str, required=False,
-        help=("Root path of API doc on rsync server"))
-    parser.add_argument(
-        "--user", dest="user",
-        metavar='USER', type=str, required=True,
-        help=("User to login on rsync server"))
-    parser.add_argument(
-        "--password", dest="password",
-        metavar='PASSWORD', type=str, required=True,
-        help=("Password to login on rsync server"))
-
-    return parser
-
-
-def main():
-    # ----------
-    # Parse Args
-
-    args = argparse_create().parse_args()
-
-    rsync_base = "rsync://%s@%s:%s" % (args.user, args.rsync_server, args.rsync_root)
-
-    # I) Update local mirror using rsync.
-    rsync_mirror_cmd = ("rsync", "--delete-after", "-avzz", rsync_base, args.mirror_dir)
-    subprocess.run(rsync_mirror_cmd, env=dict(os.environ, RSYNC_PASSWORD=args.password))
-
-    with tempfile.TemporaryDirectory() as tmp_dir:
-        # II) Generate doc source in temp dir.
-        doc_gen_cmd = (args.blender, "--background", "-noaudio", "--factory-startup", "--python-exit-code", "1",
-                       "--python", "%s/doc/python_api/sphinx_doc_gen.py" % args.source_dir, "--",
-                       "--output", tmp_dir)
-        subprocess.run(doc_gen_cmd)
-
-        # III) Get Blender version info.
-        blenver = ""
-        getver_file = os.path.join(tmp_dir, "blendver.txt")
-        getver_script = (""
-            "import sys, bpy\n"
-            "with open(sys.argv[-1], 'w') as f:\n"
-            "    f.write('%d_%d%s_release' % (bpy.app.version[0], bpy.app.version[1], bpy.app.version_char)\n"
-            "            if bpy.app.version_cycle in {'rc', 'release'} else '%d_%d_%d' % bpy.app.version)\n")
-        get_ver_cmd = (args.blender, "--background", "-noaudio", "--factory-startup", "--python-exit-code", "1",
-                       "--python-expr", getver_script, "--", getver_file)
-        subprocess.run(get_ver_cmd)
-        with open(getver_file) as f:
-            blenver = f.read()
-        os.remove(getver_file)
-
-        # IV) Build doc.
-        curr_dir = os.getcwd()
-        os.chdir(tmp_dir)
-        sphinx_cmd = ("sphinx-build", "-b", "html", "sphinx-in", "sphinx-out")
-        subprocess.run(sphinx_cmd)
-        shutil.rmtree(os.path.join("sphinx-out", ".doctrees"))
-        os.chdir(curr_dir)
-
-        # V) Cleanup existing matching dir in server mirror (if any), and copy new doc.
-        api_name = "blender_python_api_%s" % blenver
-        api_dir = os.path.join(args.mirror_dir, api_name)
-        if os.path.exists(api_dir):
-            shutil.rmtree(api_dir)
-        os.rename(os.path.join(tmp_dir, "sphinx-out"), api_dir)
-
-    # VI) Create zip archive.
-    zip_name = "blender_python_reference_%s" % blenver
-    zip_path = os.path.join(args.mirror_dir, zip_name)
-    with zipfile.ZipFile(zip_path, 'w') as zf:
-        for de in os.scandir(api_dir):
-            zf.write(de.path, arcname=os.path.join(zip_name, de.name))
-    os.rename(zip_path, os.path.join(api_dir, "%s.zip" % zip_name))
-
-    # VII) Create symlinks and html redirects.
-    #~ os.symlink(os.path.join(DEFAULT_SYMLINK_ROOT, api_name, "contents.html"), os.path.join(api_dir, "index.html"))
-    os.symlink("./contents.html", os.path.join(api_dir, "index.html"))
-    if blenver.endswith("release"):
-        symlink = os.path.join(args.mirror_dir, "blender_python_api_current")
-        os.remove(symlink)
-        os.symlink("./%s" % api_name, symlink)
-        with open(os.path.join(args.mirror_dir, "250PythonDoc/index.html"), 'w') as f:
-            f.write("<html><head><title>Redirecting...</title><meta http-equiv=\"REFRESH\""
-                    "content=\"0;url=../%s/\"></head><body>Redirecting...</body></html>" % api_name)
-    else:
-        symlink = os.path.join(args.mirror_dir, "blender_python_api_master")
-        os.remove(symlink)
-        os.symlink("./%s" % api_name, symlink)
-        with open(os.path.join(args.mirror_dir, "blender_python_api/index.html"), 'w') as f:
-            f.write("<html><head><title>Redirecting...</title><meta http-equiv=\"REFRESH\""
-                    "content=\"0;url=../%s/\"></head><body>Redirecting...</body></html>" % api_name)
-
-    # VIII) Upload (first do a dry-run so user can ensure everything is OK).
-    print("Doc generated in local mirror %s, please check it before uploading "
-          "(hit [Enter] to continue, [Ctrl-C] to exit):" % api_dir)
-    sys.stdin.read(1)
-
-    rsync_mirror_cmd = ("rsync", "--dry-run", "--delete-after", "-avzz", args.mirror_dir, rsync_base)
-    subprocess.run(rsync_mirror_cmd, env=dict(os.environ, RSYNC_PASSWORD=args.password))
-
-    print("Rsync upload simulated, please check every thing is OK (hit [Enter] to continue, [Ctrl-C] to exit):")
-    sys.stdin.read(1)
-
-    rsync_mirror_cmd = ("rsync", "--delete-after", "-avzz", args.mirror_dir, rsync_base)
-    subprocess.run(rsync_mirror_cmd, env=dict(os.environ, RSYNC_PASSWORD=args.password))
-
-
-if __name__ == "__main__":
-    main()

extern/CMakeLists.txt

@@ -29,14 +29,6 @@ add_subdirectory(curve_fit_nd)
 # Otherwise we get warnings here that we cant fix in external projects
 remove_strict_flags()
 
-# Not a strict flag, but noisy for code we don't maintain
-if(CMAKE_COMPILER_IS_GNUCC)
-	remove_cc_flag(
-		"-Wmisleading-indentation"
-	)
-endif()
-
-
 add_subdirectory(rangetree)
 add_subdirectory(wcwidth)
 
@@ -105,7 +97,6 @@ endif()
 
 if(WITH_GTESTS)
 	add_subdirectory(gtest)
-	add_subdirectory(gmock)
 endif()
 
 if(WITH_SDL AND WITH_SDL_DYNLOAD)

extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp

@@ -151,8 +151,8 @@ static btScalar EdgeSeparation(const btBox2dShape* poly1, const btTransform& xf1
 	int index = 0;
 	btScalar minDot = BT_LARGE_FLOAT;
 
-	if( count2 > 0 )
-		index = (int) normal1.minDot( vertices2, count2, minDot);
+    if( count2 > 0 )
+        index = (int) normal1.minDot( vertices2, count2, minDot);
 
 	btVector3 v1 = b2Mul(xf1, vertices1[edge1]);
 	btVector3 v2 = b2Mul(xf2, vertices2[index]);
@@ -174,9 +174,9 @@ static btScalar FindMaxSeparation(int* edgeIndex,
 
 	// Find edge normal on poly1 that has the largest projection onto d.
 	int edge = 0;
-	btScalar maxDot;
-	if( count1 > 0 )
-		edge = (int) dLocal1.maxDot( normals1, count1, maxDot);
+    btScalar maxDot;
+    if( count1 > 0 )
+        edge = (int) dLocal1.maxDot( normals1, count1, maxDot);
 
 	// Get the separation for the edge normal.
 	btScalar s = EdgeSeparation(poly1, xf1, edge, poly2, xf2);

extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp

@@ -232,8 +232,8 @@ void btCompoundCollisionAlgorithm::processCollision (const btCollisionObjectWrap
 		m_compoundShapeRevision = compoundShape->getUpdateRevision();
 	}
 
-	if (m_childCollisionAlgorithms.size()==0)
-		return;
+    if (m_childCollisionAlgorithms.size()==0)
+        return;
     
 	const btDbvt* tree = compoundShape->getDynamicAabbTree();
 	//use a dynamic aabb tree to cull potential child-overlaps

extern/clew/README.blender

@@ -1,5 +1,5 @@
 Project: OpenCL Wrangler
 URL: https://github.com/OpenCLWrangler/clew
 License: Apache 2.0
-Upstream version: 309a653
+Upstream version: 277db43
 Local modifications: None

extern/clew/src/clew.c

@@ -137,17 +137,6 @@ PFNCLCREATEFROMGLTEXTURE3D          __clewCreateFromGLTexture3D         = NULL;
 #endif
 PFNCLGETGLCONTEXTINFOKHR            __clewGetGLContextInfoKHR           = NULL;
 
-static CLEW_DYNLIB_HANDLE dynamic_library_open_find(const char **paths) {
-  int i = 0;
-  while (paths[i] != NULL) {
-      CLEW_DYNLIB_HANDLE lib = CLEW_DYNLIB_OPEN(paths[i]);
-      if (lib != NULL) {
-        return lib;
-      }
-      ++i;
-  }
-  return NULL;
-}
 
 static void clewExit(void)
 {
@@ -162,15 +151,11 @@ static void clewExit(void)
 int clewInit()
 {
 #ifdef _WIN32
-    const char *paths[] = {"OpenCL.dll", NULL};
+    const char *path = "OpenCL.dll";
 #elif defined(__APPLE__)
-    const char *paths[] = {"/Library/Frameworks/OpenCL.framework/OpenCL", NULL};
+    const char *path = "/Library/Frameworks/OpenCL.framework/OpenCL";
 #else
-    const char *paths[] = {"libOpenCL.so",
-                           "libOpenCL.so.0",
-                           "libOpenCL.so.1",
-                           "libOpenCL.so.2",
-                           NULL};
+    const char *path = "libOpenCL.so";
 #endif
 
     int error = 0;
@@ -182,7 +167,7 @@ int clewInit()
     }
 
     //  Load library
-    module = dynamic_library_open_find(paths);
+    module = CLEW_DYNLIB_OPEN(path);
 
     //  Check for errors
     if (module == NULL)

extern/curve_fit_nd/CMakeLists.txt

@@ -26,14 +26,10 @@ set(INC_SYS
 
 set(SRC
 	intern/curve_fit_cubic.c
-	intern/curve_fit_cubic_refit.c
 	intern/curve_fit_corners_detect.c
 
-	curve_fit_nd.h
 	intern/curve_fit_inline.h
-	intern/generic_alloc_impl.h
-	intern/generic_heap.c
-	intern/generic_heap.h
+	curve_fit_nd.h
 )
 
 blender_add_lib(extern_curve_fit_nd "${SRC}" "${INC}" "${INC_SYS}")

extern/curve_fit_nd/README.blender

@@ -1,5 +0,0 @@
-Project: Curve-Fit-nD
-URL: https://github.com/ideasman42/curve-fit-nd
-License: BSD 3-Clause
-Upstream version: Unknown (Last Release)
-Local modifications: None

extern/curve_fit_nd/curve_fit_nd.h

@@ -60,7 +60,6 @@ int curve_fit_cubic_to_points_db(
         const unsigned int  points_len,
         const unsigned int  dims,
         const double        error_threshold,
-        const unsigned int  calc_flag,
         const unsigned int *corners,
         unsigned int        corners_len,
 
@@ -73,7 +72,6 @@ int curve_fit_cubic_to_points_fl(
         const unsigned int  points_len,
         const unsigned int  dims,
         const float         error_threshold,
-        const unsigned int  calc_flag,
         const unsigned int *corners,
         const unsigned int  corners_len,
 
@@ -86,7 +84,6 @@ int curve_fit_cubic_to_points_fl(
  *
  * \param points, points_len: The array of points to calculate a cubics from.
  * \param dims: The number of dimensions for for each element in \a points.
- * \param points_length_cache: Optional pre-calculated lengths between points.
  * \param error_threshold: the error threshold to allow for,
  * \param tan_l, tan_r: Normalized tangents the handles will be aligned to.
  * Note that tangents must both point along the direction of the \a points,
@@ -99,7 +96,6 @@ int curve_fit_cubic_to_points_fl(
 int curve_fit_cubic_to_points_single_db(
         const double      *points,
         const unsigned int points_len,
-        const double      *points_length_cache,
         const unsigned int dims,
         const double       error_threshold,
         const double       tan_l[],
@@ -112,7 +108,6 @@ int curve_fit_cubic_to_points_single_db(
 int curve_fit_cubic_to_points_single_fl(
         const float       *points,
         const unsigned int points_len,
-        const float       *points_length_cache,
         const unsigned int dims,
         const float        error_threshold,
         const float        tan_l[],
@@ -122,42 +117,6 @@ int curve_fit_cubic_to_points_single_fl(
         float   r_handle_r[],
         float  *r_error_sq);
 
-enum {
-	CURVE_FIT_CALC_HIGH_QUALIY          = (1 << 0),
-	CURVE_FIT_CALC_CYCLIC               = (1 << 1),
-};
-
-
-/* curve_fit_cubic_refit.c */
-
-int curve_fit_cubic_to_points_refit_db(
-        const double         *points,
-        const unsigned int    points_len,
-        const unsigned int    dims,
-        const double          error_threshold,
-        const unsigned int    calc_flag,
-        const unsigned int   *corners,
-        unsigned int          corners_len,
-        const double          corner_angle,
-
-        double **r_cubic_array, unsigned int *r_cubic_array_len,
-        unsigned int   **r_cubic_orig_index,
-        unsigned int   **r_corner_index_array, unsigned int *r_corner_index_len);
-
-int curve_fit_cubic_to_points_refit_fl(
-        const float          *points,
-        const unsigned int    points_len,
-        const unsigned int    dims,
-        const float           error_threshold,
-        const unsigned int    calc_flag,
-        const unsigned int   *corners,
-        unsigned int          corners_len,
-        const float           corner_angle,
-
-        float **r_cubic_array, unsigned int *r_cubic_array_len,
-        unsigned int   **r_cubic_orig_index,
-        unsigned int   **r_corner_index_array, unsigned int *r_corner_index_len);
-
 /* curve_fit_corners_detect.c */
 
 /**

extern/curve_fit_nd/intern/curve_fit_cubic.c

@@ -46,12 +46,6 @@
 /* Take curvature into account when calculating the least square solution isn't usable. */
 #define USE_CIRCULAR_FALLBACK
 
-/* Use the maximum distance of any points from the direct line between 2 points
- * to calculate how long the handles need to be.
- * Can do a 'perfect' reversal of subdivision when for curve has symmetrical handles and doesn't change direction
- * (as with an 'S' shape). */
-#define USE_OFFSET_FALLBACK
-
 /* avoid re-calculating lengths multiple times */
 #define USE_LENGTH_CACHE
 
@@ -345,44 +339,6 @@ static double cubic_calc_error(
 	return error_max_sq;
 }
 
-#ifdef USE_OFFSET_FALLBACK
-/**
- * A version #cubic_calc_error where we don't need the split-index and can exit early when over the limit.
- */
-static double cubic_calc_error_simple(
-        const Cubic *cubic,
-        const double *points_offset,
-        const uint points_offset_len,
-        const double *u,
-        const double error_threshold_sq,
-        const uint dims)
-
-{
-	double error_max_sq = 0.0;
-
-	const double *pt_real = points_offset + dims;
-#ifdef USE_VLA
-	double        pt_eval[dims];
-#else
-	double       *pt_eval = alloca(sizeof(double) * dims);
-#endif
-
-	for (uint i = 1; i < points_offset_len - 1; i++, pt_real += dims) {
-		cubic_evaluate(cubic, u[i], dims, pt_eval);
-
-		const double err_sq = len_squared_vnvn(pt_real, pt_eval, dims);
-		if (err_sq >= error_threshold_sq) {
-			return error_threshold_sq;
-		}
-		else if (err_sq >= error_max_sq) {
-			error_max_sq = err_sq;
-		}
-	}
-
-	return error_max_sq;
-}
-#endif
-
 /**
  * Bezier multipliers
  */
@@ -474,7 +430,7 @@ static double points_calc_circumference_factor(
 		 * We could try support this but will likely cause extreme >1 scales which could cause other issues. */
 		// assert(angle >= len_tangent);
 		double factor = (angle / len_tangent);
-		assert(factor < (M_PI / 2) + (DBL_EPSILON * 10));
+		assert(factor < (M_PI / 2) + DBL_EPSILON);
 		return factor;
 	}
 	else {
@@ -574,85 +530,6 @@ static void cubic_from_points_fallback(
 }
 #endif  /* USE_CIRCULAR_FALLBACK */
 
-
-#ifdef USE_OFFSET_FALLBACK
-
-static void cubic_from_points_offset_fallback(
-        const double *points_offset,
-        const uint    points_offset_len,
-        const double  tan_l[],
-        const double  tan_r[],
-        const uint dims,
-
-        Cubic *r_cubic)
-{
-	const double *p0 = &points_offset[0];
-	const double *p3 = &points_offset[(points_offset_len - 1) * dims];
-
-#ifdef USE_VLA
-	double dir_unit[dims];
-	double a[2][dims];
-	double tmp[dims];
-#else
-	double *dir_unit = alloca(sizeof(double) * dims);
-	double *a[2] = {
-	    alloca(sizeof(double) * dims),
-	    alloca(sizeof(double) * dims),
-	};
-	double *tmp = alloca(sizeof(double) * dims);
-#endif
-
-	const double dir_dist = normalize_vn_vnvn(dir_unit, p3, p0, dims);
-	project_plane_vn_vnvn_normalized(a[0], tan_l, dir_unit, dims);
-	project_plane_vn_vnvn_normalized(a[1], tan_r, dir_unit, dims);
-
-	/* only for better accuracy, not essential */
-	normalize_vn(a[0], dims);
-	normalize_vn(a[1], dims);
-
-	mul_vnvn_fl(a[1], a[1], -1, dims);
-
-	double dists[2] = {0, 0};
-
-	const double *pt = &points_offset[dims];
-	for (uint i = 1; i < points_offset_len - 1; i++, pt += dims) {
-		for (uint k = 0; k < 2; k++) {
-			sub_vn_vnvn(tmp, p0, pt, dims);
-			project_vn_vnvn_normalized(tmp, tmp, a[k], dims);
-			dists[k] = max(dists[k], dot_vnvn(tmp, a[k], dims));
-		}
-	}
-
-	double alpha_l = (dists[0] / 0.75) /  dot_vnvn(tan_l, a[0], dims);
-	double alpha_r = (dists[1] / 0.75) / -dot_vnvn(tan_r, a[1], dims);
-
-	if (!(alpha_l > 0.0)) {
-		alpha_l = dir_dist / 3.0;
-	}
-	if (!(alpha_r > 0.0)) {
-		alpha_r = dir_dist / 3.0;
-	}
-
-	double *p1 = CUBIC_PT(r_cubic, 1, dims);
-	double *p2 = CUBIC_PT(r_cubic, 2, dims);
-
-	copy_vnvn(CUBIC_PT(r_cubic, 0, dims), p0, dims);
-	copy_vnvn(CUBIC_PT(r_cubic, 3, dims), p3, dims);
-
-#ifdef USE_ORIG_INDEX_DATA
-	r_cubic->orig_span = (points_offset_len - 1);
-#endif
-
-	/* p1 = p0 - (tan_l * alpha_l);
-	 * p2 = p3 + (tan_r * alpha_r);
-	 */
-	msub_vn_vnvn_fl(p1, p0, tan_l, alpha_l, dims);
-	madd_vn_vnvn_fl(p2, p3, tan_r, alpha_r, dims);
-}
-
-#endif  /* USE_OFFSET_FALLBACK */
-
-
 /**
  * Use least-squares method to find Bezier control points for region.
  */
@@ -742,11 +619,7 @@ static void cubic_from_points(
 	    !(alpha_r >= 0.0))
 	{
 #ifdef USE_CIRCULAR_FALLBACK
-		double alpha_test = points_calc_cubic_scale(p0, p3, tan_l, tan_r, points_offset_coords_length, dims);
-		if (!isfinite(alpha_test)) {
-			alpha_test = len_vnvn(p0, p3, dims) / 3.0;
-		}
-		alpha_l = alpha_r = alpha_test;
+		alpha_l = alpha_r = points_calc_cubic_scale(p0, p3, tan_l, tan_r, points_offset_coords_length, dims);
 #else
 		alpha_l = alpha_r = len_vnvn(p0, p3, dims) / 3.0;
 #endif
@@ -808,11 +681,7 @@ static void cubic_from_points(
 		    p2_dist_sq > dist_sq_max)
 		{
 #ifdef USE_CIRCULAR_FALLBACK
-			double alpha_test = points_calc_cubic_scale(p0, p3, tan_l, tan_r, points_offset_coords_length, dims);
-			if (!isfinite(alpha_test)) {
-				alpha_test = len_vnvn(p0, p3, dims) / 3.0;
-			}
-			alpha_l = alpha_r = alpha_test;
+			alpha_l = alpha_r = points_calc_cubic_scale(p0, p3, tan_l, tan_r, points_offset_coords_length, dims);
 #else
 			alpha_l = alpha_r = len_vnvn(p0, p3, dims) / 3.0;
 #endif
@@ -884,6 +753,7 @@ static double points_calc_coord_length(
 
 #ifdef USE_LENGTH_CACHE
 		length = points_length_cache[i];
+
 		assert(len_vnvn(pt, pt_prev, dims) == points_length_cache[i]);
 #else
 		length = len_vnvn(pt, pt_prev, dims);
@@ -896,7 +766,7 @@ static double points_calc_coord_length(
 	}
 	assert(!is_almost_zero(r_u[points_offset_len - 1]));
 	const double w = r_u[points_offset_len - 1];
-	for (uint i = 1; i < points_offset_len; i++) {
+	for (uint i = 0; i < points_offset_len; i++) {
 		r_u[i] /= w;
 	}
 	return w;
@@ -1048,8 +918,6 @@ static bool fit_cubic_to_points(
 
 	Cubic *cubic_test = alloca(cubic_alloc_size(dims));
 
-	/* Run this so we use the non-circular calculation when the circular-fallback
-	 * in 'cubic_from_points' failed to give a close enough result. */
 #ifdef USE_CIRCULAR_FALLBACK
 	if (!(error_max_sq < error_threshold_sq)) {
 		/* Don't use the cubic calculated above, instead calculate a new fallback cubic,
@@ -1072,28 +940,14 @@ static bool fit_cubic_to_points(
 	}
 #endif
 
-	/* Test the offset fallback */
-#ifdef USE_OFFSET_FALLBACK
-	if (!(error_max_sq < error_threshold_sq)) {
-		/* Using the offset from the curve to calculate cubic handle length may give better results
-		 * try this as a second fallback. */
-		cubic_from_points_offset_fallback(
-		        points_offset, points_offset_len,
-		        tan_l, tan_r, dims, cubic_test);
-		const double error_max_sq_test = cubic_calc_error_simple(
-		        cubic_test, points_offset, points_offset_len, u, error_max_sq, dims);
-
-		if (error_max_sq > error_max_sq_test) {
-			error_max_sq = error_max_sq_test;
-			cubic_copy(r_cubic, cubic_test, dims);
-		}
-	}
-#endif
-
 	*r_error_max_sq = error_max_sq;
 	*r_split_index  = split_index;
 
-	if (!(error_max_sq < error_threshold_sq)) {
+	if (error_max_sq < error_threshold_sq) {
+		free(u);
+		return true;
+	}
+	else {
 		cubic_copy(cubic_test, r_cubic, dims);
 
 		/* If error not too large, try some reparameterization and iteration */
@@ -1111,28 +965,25 @@ static bool fit_cubic_to_points(
 			        points_offset_coords_length,
 #endif
 			        u_prime, tan_l, tan_r, dims, cubic_test);
-
-			const double error_max_sq_test = cubic_calc_error(
+			error_max_sq = cubic_calc_error(
 			        cubic_test, points_offset, points_offset_len, u_prime, dims,
 			        &split_index);
 
-			if (error_max_sq > error_max_sq_test) {
-				error_max_sq = error_max_sq_test;
+			if (error_max_sq < error_threshold_sq) {
+				free(u_prime);
+				free(u);
+
+				cubic_copy(r_cubic, cubic_test, dims);
+				*r_error_max_sq = error_max_sq;
+				*r_split_index  = split_index;
+				return true;
+			}
+			else if (error_max_sq < *r_error_max_sq) {
 				cubic_copy(r_cubic, cubic_test, dims);
 				*r_error_max_sq = error_max_sq;
 				*r_split_index = split_index;
 			}
 
-			if (!(error_max_sq < error_threshold_sq)) {
-				/* continue */
-			}
-			else {
-				assert((error_max_sq < error_threshold_sq));
-				free(u_prime);
-				free(u);
-				return true;
-			}
-
 			SWAP(double *, u, u_prime);
 		}
 		free(u_prime);
@@ -1140,10 +991,6 @@ static bool fit_cubic_to_points(
 
 		return false;
 	}
-	else {
-		free(u);
-		return true;
-	}
 }
 
 static void fit_cubic_to_points_recursive(
@@ -1155,7 +1002,6 @@ static void fit_cubic_to_points_recursive(
         const double  tan_l[],
         const double  tan_r[],
         const double  error_threshold_sq,
-        const uint    calc_flag,
         const uint    dims,
         /* fill in the list */
         CubicList *clist)
@@ -1169,11 +1015,8 @@ static void fit_cubic_to_points_recursive(
 #ifdef USE_LENGTH_CACHE
 	        points_length_cache,
 #endif
-	        tan_l, tan_r,
-	        (calc_flag & CURVE_FIT_CALC_HIGH_QUALIY) ? DBL_EPSILON : error_threshold_sq,
-	        dims,
-	        cubic, &error_max_sq, &split_index) ||
-	    (error_max_sq < error_threshold_sq))
+	        tan_l, tan_r, error_threshold_sq, dims,
+	        cubic, &error_max_sq, &split_index))
 	{
 		cubic_list_prepend(clist, cubic);
 		return;
@@ -1225,13 +1068,13 @@ static void fit_cubic_to_points_recursive(
 #ifdef USE_LENGTH_CACHE
 	        points_length_cache,
 #endif
-	        tan_l, tan_center, error_threshold_sq, calc_flag, dims, clist);
+	        tan_l, tan_center, error_threshold_sq, dims, clist);
 	fit_cubic_to_points_recursive(
 	        &points_offset[split_index * dims], points_offset_len - split_index,
 #ifdef USE_LENGTH_CACHE
 	        points_length_cache + split_index,
 #endif
-	        tan_center, tan_r, error_threshold_sq, calc_flag, dims, clist);
+	        tan_center, tan_r, error_threshold_sq, dims, clist);
 
 }
 
@@ -1254,7 +1097,6 @@ int curve_fit_cubic_to_points_db(
         const uint    points_len,
         const uint    dims,
         const double  error_threshold,
-        const uint    calc_flag,
         const uint   *corners,
         uint          corners_len,
 
@@ -1330,7 +1172,7 @@ int curve_fit_cubic_to_points_db(
 #ifdef USE_LENGTH_CACHE
 			        points_length_cache,
 #endif
-			        tan_l, tan_r, error_threshold_sq, calc_flag, dims, &clist);
+			        tan_l, tan_r, error_threshold_sq, dims, &clist);
 		}
 		else if (points_len == 1) {
 			assert(points_offset_len == 1);
@@ -1397,7 +1239,6 @@ int curve_fit_cubic_to_points_fl(
         const uint    points_len,
         const uint    dims,
         const float   error_threshold,
-        const uint    calc_flag,
         const uint   *corners,
         const uint    corners_len,
 
@@ -1415,7 +1256,7 @@ int curve_fit_cubic_to_points_fl(
 	uint    cubic_array_len = 0;
 
 	int result = curve_fit_cubic_to_points_db(
-	        points_db, points_len, dims, error_threshold, calc_flag, corners, corners_len,
+	        points_db, points_len, dims, error_threshold, corners, corners_len,
 	        &cubic_array_db, &cubic_array_len,
 	        r_cubic_orig_index,
 	        r_corner_index_array, r_corner_index_len);
@@ -1442,7 +1283,6 @@ int curve_fit_cubic_to_points_fl(
 int curve_fit_cubic_to_points_single_db(
         const double *points,
         const uint    points_len,
-        const double *points_length_cache,
         const uint    dims,
         const double  error_threshold,
         const double tan_l[],
@@ -1459,14 +1299,10 @@ int curve_fit_cubic_to_points_single_db(
 	/* in this instance theres no advantage in using length cache,
 	 * since we're not recursively calculating values. */
 #ifdef USE_LENGTH_CACHE
-	double *points_length_cache_alloc = NULL;
-	if (points_length_cache == NULL) {
-		points_length_cache_alloc = malloc(sizeof(double) * points_len);
-		points_calc_coord_length_cache(
-		        points, points_len, dims,
-		        points_length_cache_alloc);
-		points_length_cache = points_length_cache_alloc;
-	}
+	double *points_length_cache = malloc(sizeof(double) * points_len);
+	points_calc_coord_length_cache(
+	        points, points_len, dims,
+	        points_length_cache);
 #endif
 
 	fit_cubic_to_points(
@@ -1479,9 +1315,7 @@ int curve_fit_cubic_to_points_single_db(
 	        cubic, r_error_max_sq, &split_index);
 
 #ifdef USE_LENGTH_CACHE
-	if (points_length_cache_alloc) {
-		free(points_length_cache_alloc);
-	}
+	free(points_length_cache);
 #endif
 
 	copy_vnvn(r_handle_l, CUBIC_PT(cubic, 1, dims), dims);
@@ -1493,7 +1327,6 @@ int curve_fit_cubic_to_points_single_db(
 int curve_fit_cubic_to_points_single_fl(
         const float  *points,
         const uint    points_len,
-        const float  *points_length_cache,
         const uint    dims,
         const float   error_threshold,
         const float   tan_l[],
@@ -1505,15 +1338,9 @@ int curve_fit_cubic_to_points_single_fl(
 {
 	const uint points_flat_len = points_len * dims;
 	double *points_db = malloc(sizeof(double) * points_flat_len);
-	double *points_length_cache_db = NULL;
 
 	copy_vndb_vnfl(points_db, points, points_flat_len);
 
-	if (points_length_cache) {
-		points_length_cache_db = malloc(sizeof(double) * points_len);
-		copy_vndb_vnfl(points_length_cache_db, points_length_cache, points_len);
-	}
-
 #ifdef USE_VLA
 	double tan_l_db[dims];
 	double tan_r_db[dims];
@@ -1531,7 +1358,7 @@ int curve_fit_cubic_to_points_single_fl(
 	copy_vndb_vnfl(tan_r_db, tan_r, dims);
 
 	int result = curve_fit_cubic_to_points_single_db(
-	        points_db, points_len, points_length_cache_db, dims,
+	        points_db, points_len, dims,
 	        (double)error_threshold,
 	        tan_l_db, tan_r_db,
 	        r_handle_l_db, r_handle_r_db,
@@ -1539,10 +1366,6 @@ int curve_fit_cubic_to_points_single_fl(
 
 	free(points_db);
 
-	if (points_length_cache_db) {
-		free(points_length_cache_db);
-	}
-
 	copy_vnfl_vndb(r_handle_l, r_handle_l_db, dims);
 	copy_vnfl_vndb(r_handle_r, r_handle_r_db, dims);
 	*r_error_sq = (float)r_error_sq_db;

extern/curve_fit_nd/intern/curve_fit_inline.h

@@ -290,26 +290,4 @@ MINLINE bool equals_vnvn(
 	return true;
 }
 
-MINLINE void project_vn_vnvn(
-        double v_out[], const double p[], const double v_proj[], const uint dims)
-{
-	const double mul = dot_vnvn(p, v_proj, dims) / dot_vnvn(v_proj, v_proj, dims);
-	mul_vnvn_fl(v_out, v_proj, mul, dims);
-}
-
-MINLINE void project_vn_vnvn_normalized(
-        double v_out[], const double p[], const double v_proj[], const uint dims)
-{
-	const double mul = dot_vnvn(p, v_proj, dims);
-	mul_vnvn_fl(v_out, v_proj, mul, dims);
-}
-
-MINLINE void project_plane_vn_vnvn_normalized(
-        double v_out[], const double v[], const double v_plane[], const uint dims)
-{
-	assert(v != v_out);
-	project_vn_vnvn_normalized(v_out, v, v_plane, dims);
-	sub_vn_vnvn(v_out, v, v_out, dims);
-}
-
 /** \} */

extern/curve_fit_nd/intern/generic_alloc_impl.h

@@ -1,220 +0,0 @@
-/*
- * Copyright (c) 2016, Blender Foundation.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the <organization> nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/**
- * \file generic_alloc_impl.c
- *  \ingroup curve_fit
- *
- * Simple Memory Chunking Allocator
- * ================================
- *
- * Defines need to be set:
- * - #TPOOL_IMPL_PREFIX: Prefix to use for the API.
- * - #TPOOL_ALLOC_TYPE: Struct type this pool handles.
- * - #TPOOL_STRUCT: Name for pool struct name.
- * - #TPOOL_CHUNK_SIZE: Chunk size (optional), use 64kb when not defined.
- *
- * \note #TPOOL_ALLOC_TYPE must be at least ``sizeof(void *)``.
- *
- * Defines the API, uses #TPOOL_IMPL_PREFIX to prefix each function.
- *
- * - *_pool_create()
- * - *_pool_destroy()
- * - *_pool_clear()
- *
- * - *_pool_elem_alloc()
- * - *_pool_elem_calloc()
- * - *_pool_elem_free()
- */
-
-/* check we're not building directly */
-#if !defined(TPOOL_IMPL_PREFIX) || \
-    !defined(TPOOL_ALLOC_TYPE) || \
-    !defined(TPOOL_STRUCT)
-#  error "This file can't be compiled directly, include in another source file"
-#endif
-
-#define _CONCAT_AUX(MACRO_ARG1, MACRO_ARG2) MACRO_ARG1 ## MACRO_ARG2
-#define _CONCAT(MACRO_ARG1, MACRO_ARG2) _CONCAT_AUX(MACRO_ARG1, MACRO_ARG2)
-#define _TPOOL_PREFIX(id) _CONCAT(TPOOL_IMPL_PREFIX, _##id)
-
-/* local identifiers */
-#define pool_create		_TPOOL_PREFIX(pool_create)
-#define pool_destroy	_TPOOL_PREFIX(pool_destroy)
-#define pool_clear		_TPOOL_PREFIX(pool_clear)
-
-#define pool_elem_alloc		_TPOOL_PREFIX(pool_elem_alloc)
-#define pool_elem_calloc	_TPOOL_PREFIX(pool_elem_calloc)
-#define pool_elem_free		_TPOOL_PREFIX(pool_elem_free)
-
-/* private identifiers (only for this file, undefine after) */
-#define pool_alloc_chunk	_TPOOL_PREFIX(pool_alloc_chunk)
-#define TPoolChunk			_TPOOL_PREFIX(TPoolChunk)
-#define TPoolChunkElemFree	_TPOOL_PREFIX(TPoolChunkElemFree)
-
-#ifndef TPOOL_CHUNK_SIZE
-#define  TPOOL_CHUNK_SIZE (1 << 16)  /* 64kb */
-#define _TPOOL_CHUNK_SIZE_UNDEF
-#endif
-
-#ifndef UNLIKELY
-#  ifdef __GNUC__
-#    define UNLIKELY(x)     __builtin_expect(!!(x), 0)
-#  else
-#    define UNLIKELY(x)     (x)
-#  endif
-#endif
-
-#ifdef __GNUC__
-#  define MAYBE_UNUSED __attribute__((unused))
-#else
-#  define MAYBE_UNUSED
-#endif
-
-
-struct TPoolChunk {
-	struct TPoolChunk *prev;
-	unsigned int    size;
-	unsigned int    bufsize;
-	TPOOL_ALLOC_TYPE buf[0];
-};
-
-struct TPoolChunkElemFree {
-	struct TPoolChunkElemFree *next;
-};
-
-struct TPOOL_STRUCT {
-	/* Always keep at least one chunk (never NULL) */
-	struct TPoolChunk *chunk;
-	/* when NULL, allocate a new chunk */
-	struct TPoolChunkElemFree *free;
-};
-
-/**
- * Number of elems to include per #TPoolChunk when no reserved size is passed,
- * or we allocate past the reserved number.
- *
- * \note Optimize number for 64kb allocs.
- */
-#define _TPOOL_CHUNK_DEFAULT_NUM \
-	(((1 << 16) - sizeof(struct TPoolChunk)) / sizeof(TPOOL_ALLOC_TYPE))
-
-
-/** \name Internal Memory Management
- * \{ */
-
-static struct TPoolChunk *pool_alloc_chunk(
-        unsigned int tot_elems, struct TPoolChunk *chunk_prev)
-{
-	struct TPoolChunk *chunk = malloc(
-	        sizeof(struct TPoolChunk) + (sizeof(TPOOL_ALLOC_TYPE) * tot_elems));
-	chunk->prev = chunk_prev;
-	chunk->bufsize = tot_elems;
-	chunk->size = 0;
-	return chunk;
-}
-
-static TPOOL_ALLOC_TYPE *pool_elem_alloc(struct TPOOL_STRUCT *pool)
-{
-	TPOOL_ALLOC_TYPE *elem;
-
-	if (pool->free) {
-		elem = (TPOOL_ALLOC_TYPE *)pool->free;
-		pool->free = pool->free->next;
-	}
-	else {
-		struct TPoolChunk *chunk = pool->chunk;
-		if (UNLIKELY(chunk->size == chunk->bufsize)) {
-			chunk = pool->chunk = pool_alloc_chunk(_TPOOL_CHUNK_DEFAULT_NUM, chunk);
-		}
-		elem = &chunk->buf[chunk->size++];
-	}
-
-	return elem;
-}
-
-MAYBE_UNUSED
-static TPOOL_ALLOC_TYPE *pool_elem_calloc(struct TPOOL_STRUCT *pool)
-{
-	TPOOL_ALLOC_TYPE *elem = pool_elem_alloc(pool);
-	memset(elem, 0, sizeof(*elem));
-	return elem;
-}
-
-static void pool_elem_free(struct TPOOL_STRUCT *pool, TPOOL_ALLOC_TYPE *elem)
-{
-	struct TPoolChunkElemFree *elem_free = (struct TPoolChunkElemFree *)elem;
-	elem_free->next = pool->free;
-	pool->free = elem_free;
-}
-
-static void pool_create(struct TPOOL_STRUCT *pool, unsigned int tot_reserve)
-{
-	pool->chunk = pool_alloc_chunk((tot_reserve > 1) ? tot_reserve : _TPOOL_CHUNK_DEFAULT_NUM, NULL);
-	pool->free = NULL;
-}
-
-MAYBE_UNUSED
-static void pool_clear(struct TPOOL_STRUCT *pool)
-{
-	/* Remove all except the last chunk */
-	while (pool->chunk->prev) {
-		struct TPoolChunk *chunk_prev = pool->chunk->prev;
-		free(pool->chunk);
-		pool->chunk = chunk_prev;
-	}
-	pool->chunk->size = 0;
-	pool->free = NULL;
-}
-
-static void pool_destroy(struct TPOOL_STRUCT *pool)
-{
-	struct TPoolChunk *chunk = pool->chunk;
-	do {
-		struct TPoolChunk *chunk_prev;
-		chunk_prev = chunk->prev;
-		free(chunk);
-		chunk = chunk_prev;
-	} while (chunk);
-
-	pool->chunk = NULL;
-	pool->free = NULL;
-}
-
-/** \} */
-
-#undef _TPOOL_CHUNK_DEFAULT_NUM
-#undef _CONCAT_AUX
-#undef _CONCAT
-#undef _TPOOL_PREFIX
-
-#undef TPoolChunk
-#undef TPoolChunkElemFree
-
-#ifdef _TPOOL_CHUNK_SIZE_UNDEF
-#  undef  TPOOL_CHUNK_SIZE
-#  undef _TPOOL_CHUNK_SIZE_UNDEF
-#endif

extern/curve_fit_nd/intern/generic_heap.c

@@ -1,278 +0,0 @@
-/*
- * Copyright (c) 2016, Blender Foundation.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the <organization> nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** \file generic_heap.c
- *  \ingroup curve_fit
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdbool.h>
-#include <assert.h>
-
-#include "generic_heap.h"
-
-/* swap with a temp value */
-#define SWAP_TVAL(tval, a, b)  {  \
-	(tval) = (a);                 \
-	(a) = (b);                    \
-	(b) = (tval);                 \
-} (void)0
-
-#ifdef __GNUC__
-#  define UNLIKELY(x)     __builtin_expect(!!(x), 0)
-#else
-#  define UNLIKELY(x)     (x)
-#endif
-
-
-/***/
-
-struct HeapNode {
-	void        *ptr;
-	double       value;
-	unsigned int index;
-};
-
-/* heap_* pool allocator */
-#define TPOOL_IMPL_PREFIX  heap
-#define TPOOL_ALLOC_TYPE   HeapNode
-#define TPOOL_STRUCT       HeapMemPool
-#include "generic_alloc_impl.h"
-#undef TPOOL_IMPL_PREFIX
-#undef TPOOL_ALLOC_TYPE
-#undef TPOOL_STRUCT
-
-struct Heap {
-	unsigned int size;
-	unsigned int bufsize;
-	HeapNode **tree;
-
-	struct HeapMemPool pool;
-};
-
-/** \name Internal Functions
- * \{ */
-
-#define HEAP_PARENT(i) (((i) - 1) >> 1)
-#define HEAP_LEFT(i)   (((i) << 1) + 1)
-#define HEAP_RIGHT(i)  (((i) << 1) + 2)
-#define HEAP_COMPARE(a, b) ((a)->value < (b)->value)
-
-#if 0  /* UNUSED */
-#define HEAP_EQUALS(a, b) ((a)->value == (b)->value)
-#endif
-
-static void heap_swap(Heap *heap, const unsigned int i, const unsigned int j)
-{
-
-#if 0
-	SWAP(unsigned int,  heap->tree[i]->index, heap->tree[j]->index);
-	SWAP(HeapNode *,    heap->tree[i],        heap->tree[j]);
-#else
-	HeapNode **tree = heap->tree;
-	union {
-		unsigned int  index;
-		HeapNode     *node;
-	} tmp;
-	SWAP_TVAL(tmp.index, tree[i]->index, tree[j]->index);
-	SWAP_TVAL(tmp.node,  tree[i],        tree[j]);
-#endif
-}
-
-static void heap_down(Heap *heap, unsigned int i)
-{
-	/* size won't change in the loop */
-	const unsigned int size = heap->size;
-
-	while (1) {
-		const unsigned int l = HEAP_LEFT(i);
-		const unsigned int r = HEAP_RIGHT(i);
-		unsigned int smallest;
-
-		smallest = ((l < size) && HEAP_COMPARE(heap->tree[l], heap->tree[i])) ? l : i;
-
-		if ((r < size) && HEAP_COMPARE(heap->tree[r], heap->tree[smallest])) {
-			smallest = r;
-		}
-
-		if (smallest == i) {
-			break;
-		}
-
-		heap_swap(heap, i, smallest);
-		i = smallest;
-	}
-}
-
-static void heap_up(Heap *heap, unsigned int i)
-{
-	while (i > 0) {
-		const unsigned int p = HEAP_PARENT(i);
-
-		if (HEAP_COMPARE(heap->tree[p], heap->tree[i])) {
-			break;
-		}
-		heap_swap(heap, p, i);
-		i = p;
-	}
-}
-
-/** \} */
-
-
-/** \name Public Heap API
- * \{ */
-
-/* use when the size of the heap is known in advance */
-Heap *HEAP_new(unsigned int tot_reserve)
-{
-	Heap *heap = malloc(sizeof(Heap));
-	/* ensure we have at least one so we can keep doubling it */
-	heap->size = 0;
-	heap->bufsize = tot_reserve ? tot_reserve : 1;
-	heap->tree = malloc(heap->bufsize * sizeof(HeapNode *));
-
-	heap_pool_create(&heap->pool, tot_reserve);
-
-	return heap;
-}
-
-void HEAP_free(Heap *heap, HeapFreeFP ptrfreefp)
-{
-	if (ptrfreefp) {
-		unsigned int i;
-
-		for (i = 0; i < heap->size; i++) {
-			ptrfreefp(heap->tree[i]->ptr);
-		}
-	}
-
-	heap_pool_destroy(&heap->pool);
-
-	free(heap->tree);
-	free(heap);
-}
-
-void HEAP_clear(Heap *heap, HeapFreeFP ptrfreefp)
-{
-	if (ptrfreefp) {
-		unsigned int i;
-
-		for (i = 0; i < heap->size; i++) {
-			ptrfreefp(heap->tree[i]->ptr);
-		}
-	}
-	heap->size = 0;
-
-	heap_pool_clear(&heap->pool);
-}
-
-HeapNode *HEAP_insert(Heap *heap, double value, void *ptr)
-{
-	HeapNode *node;
-
-	if (UNLIKELY(heap->size >= heap->bufsize)) {
-		heap->bufsize *= 2;
-		heap->tree = realloc(heap->tree, heap->bufsize * sizeof(*heap->tree));
-	}
-
-	node = heap_pool_elem_alloc(&heap->pool);
-
-	node->ptr = ptr;
-	node->value = value;
-	node->index = heap->size;
-
-	heap->tree[node->index] = node;
-
-	heap->size++;
-
-	heap_up(heap, node->index);
-
-	return node;
-}
-
-bool HEAP_is_empty(Heap *heap)
-{
-	return (heap->size == 0);
-}
-
-unsigned int HEAP_size(Heap *heap)
-{
-	return heap->size;
-}
-
-HeapNode *HEAP_top(Heap *heap)
-{
-	return heap->tree[0];
-}
-
-double HEAP_top_value(Heap *heap)
-{
-	return heap->tree[0]->value;
-}
-
-void *HEAP_popmin(Heap *heap)
-{
-	void *ptr = heap->tree[0]->ptr;
-
-	assert(heap->size != 0);
-
-	heap_pool_elem_free(&heap->pool, heap->tree[0]);
-
-	if (--heap->size) {
-		heap_swap(heap, 0, heap->size);
-		heap_down(heap, 0);
-	}
-
-	return ptr;
-}
-
-void HEAP_remove(Heap *heap, HeapNode *node)
-{
-	unsigned int i = node->index;
-
-	assert(heap->size != 0);
-
-	while (i > 0) {
-		unsigned int p = HEAP_PARENT(i);
-
-		heap_swap(heap, p, i);
-		i = p;
-	}
-
-	HEAP_popmin(heap);
-}
-
-double HEAP_node_value(HeapNode *node)
-{
-	return node->value;
-}
-
-void *HEAP_node_ptr(HeapNode *node)
-{
-	return node->ptr;
-}

extern/curve_fit_nd/intern/generic_heap.h

@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2016, Blender Foundation.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the <organization> nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __GENERIC_HEAP_H__
-#define __GENERIC_HEAP_H__
-
-/** \file generic_heap.h
- *  \ingroup curve_fit
- */
-
-struct Heap;
-struct HeapNode;
-typedef struct Heap Heap;
-typedef struct HeapNode HeapNode;
-
-typedef void (*HeapFreeFP)(void *ptr);
-
-Heap        *HEAP_new(unsigned int tot_reserve);
-bool         HEAP_is_empty(Heap *heap);
-void         HEAP_free(Heap *heap, HeapFreeFP ptrfreefp);
-void        *HEAP_node_ptr(HeapNode *node);
-void         HEAP_remove(Heap *heap, HeapNode *node);
-HeapNode    *HEAP_insert(Heap *heap, double value, void *ptr);
-void        *HEAP_popmin(Heap *heap);
-void         HEAP_clear(Heap *heap, HeapFreeFP ptrfreefp);
-unsigned int HEAP_size(Heap *heap);
-HeapNode    *HEAP_top(Heap *heap);
-double       HEAP_top_value(Heap *heap);
-double       HEAP_node_value(HeapNode *node);
-
-#endif  /* __GENERIC_HEAP_IMPL_H__ */

extern/gmock/CMakeLists.txt

@@ -1,66 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# The Original Code is Copyright (C) 2014, Blender Foundation
-# All rights reserved.
-#
-# Contributor(s): Sergey Sharybin
-#
-# ***** END GPL LICENSE BLOCK *****
-
-set(INC
-  .
-  include
-)
-
-set(INC_SYS
-  ../gtest/include
-)
-
-set(SRC
-  # src/gmock-all.cc
-
-  src/gmock-cardinalities.cc
-  src/gmock.cc
-  src/gmock-internal-utils.cc
-  src/gmock_main.cc
-  src/gmock-matchers.cc
-  src/gmock-spec-builders.cc
-)
-
-set(SRC_HEADERS
-  include/gmock/gmock-actions.h
-  include/gmock/gmock-cardinalities.h
-  include/gmock/gmock-generated-actions.h
-  include/gmock/gmock-generated-function-mockers.h
-  include/gmock/gmock-generated-matchers.h
-  include/gmock/gmock-generated-nice-strict.h
-  include/gmock/gmock.h
-  include/gmock/gmock-matchers.h
-  include/gmock/gmock-more-actions.h
-  include/gmock/gmock-more-matchers.h
-  include/gmock/gmock-spec-builders.h
-  include/gmock/internal/custom/gmock-generated-actions.h
-  include/gmock/internal/custom/gmock-matchers.h
-  include/gmock/internal/custom/gmock-port.h
-  include/gmock/internal/gmock-generated-internal-utils.h
-  include/gmock/internal/gmock-internal-utils.h
-  include/gmock/internal/gmock-port.h
-)
-
-include_directories(${INC})
-include_directories(SYSTEM ${INC_SYS})
-add_library(extern_gmock ${SRC} ${SRC_HEADERS})

extern/gmock/LICENSE

@@ -1,28 +0,0 @@
-Copyright 2008, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

extern/gmock/README.blender

@@ -1,7 +0,0 @@
-Project: Google C++ Testing Framework
-URL: https://github.com/google/googletest
-License: New BSD
-Upstream version: 1.7.0 (ec44c6c)
-Local modifications:
-
-None.

extern/gmock/README.md

@@ -1,333 +0,0 @@
-## Google Mock ##
-
-The Google C++ mocking framework.
-
-### Overview ###
-
-Google's framework for writing and using C++ mock classes.
-It can help you derive better designs of your system and write better tests.
-
-It is inspired by:
-
-  * [jMock](http://www.jmock.org/),
-  * [EasyMock](http://www.easymock.org/), and
-  * [Hamcrest](http://code.google.com/p/hamcrest/),
-
-and designed with C++'s specifics in mind.
-
-Google mock:
-
-  * lets you create mock classes trivially using simple macros.
-  * supports a rich set of matchers and actions.
-  * handles unordered, partially ordered, or completely ordered expectations.
-  * is extensible by users.
-
-We hope you find it useful!
-
-### Features ###
-
-  * Provides a declarative syntax for defining mocks.
-  * Can easily define partial (hybrid) mocks, which are a cross of real
-    and mock objects.
-  * Handles functions of arbitrary types and overloaded functions.
-  * Comes with a rich set of matchers for validating function arguments.
-  * Uses an intuitive syntax for controlling the behavior of a mock.
-  * Does automatic verification of expectations (no record-and-replay needed).
-  * Allows arbitrary (partial) ordering constraints on
-    function calls to be expressed,.
-  * Lets a user extend it by defining new matchers and actions.
-  * Does not use exceptions.
-  * Is easy to learn and use.
-
-Please see the project page above for more information as well as the
-mailing list for questions, discussions, and development.  There is
-also an IRC channel on OFTC (irc.oftc.net) #gtest available.  Please
-join us!
-
-Please note that code under [scripts/generator](scripts/generator/) is
-from [cppclean](http://code.google.com/p/cppclean/) and released under
-the Apache License, which is different from Google Mock's license.
-
-## Getting Started ##
-
-If you are new to the project, we suggest that you read the user
-documentation in the following order:
-
-  * Learn the [basics](../googletest/docs/Primer.md) of
-    Google Test, if you choose to use Google Mock with it (recommended).
-  * Read [Google Mock for Dummies](docs/ForDummies.md).
-  * Read the instructions below on how to build Google Mock.
-
-You can also watch Zhanyong's [talk](http://www.youtube.com/watch?v=sYpCyLI47rM) on Google Mock's usage and implementation.
-
-Once you understand the basics, check out the rest of the docs:
-
-  * [CheatSheet](docs/CheatSheet.md) - all the commonly used stuff
-    at a glance.
-  * [CookBook](docs/CookBook.md) - recipes for getting things done,
-    including advanced techniques.
-
-If you need help, please check the
-[KnownIssues](docs/KnownIssues.md) and
-[FrequentlyAskedQuestions](docs/FrequentlyAskedQuestions.md) before
-posting a question on the
-[discussion group](http://groups.google.com/group/googlemock).
-
-
-### Using Google Mock Without Google Test ###
-
-Google Mock is not a testing framework itself.  Instead, it needs a
-testing framework for writing tests.  Google Mock works seamlessly
-with [Google Test](http://code.google.com/p/googletest/), but
-you can also use it with [any C++ testing framework](googlemock/ForDummies.md#Using_Google_Mock_with_Any_Testing_Framework).
-
-### Requirements for End Users ###
-
-Google Mock is implemented on top of [Google Test](
-http://github.com/google/googletest/), and depends on it.
-You must use the bundled version of Google Test when using Google Mock.
-
-You can also easily configure Google Mock to work with another testing
-framework, although it will still need Google Test.  Please read
-["Using_Google_Mock_with_Any_Testing_Framework"](
-    docs/ForDummies.md#Using_Google_Mock_with_Any_Testing_Framework)
-for instructions.
-
-Google Mock depends on advanced C++ features and thus requires a more
-modern compiler. The following are needed to use Google Mock:
-
-#### Linux Requirements ####
-
-  * GNU-compatible Make or "gmake"
-  * POSIX-standard shell
-  * POSIX(-2) Regular Expressions (regex.h)
-  * C++98-standard-compliant compiler (e.g. GCC 3.4 or newer)
-
-#### Windows Requirements ####
-
-  * Microsoft Visual C++ 8.0 SP1 or newer
-
-#### Mac OS X Requirements ####
-
-  * Mac OS X 10.4 Tiger or newer
-  * Developer Tools Installed
-
-### Requirements for Contributors ###
-
-We welcome patches. If you plan to contribute a patch, you need to
-build Google Mock and its tests, which has further requirements:
-
-  * Automake version 1.9 or newer
-  * Autoconf version 2.59 or newer
-  * Libtool / Libtoolize
-  * Python version 2.3 or newer (for running some of the tests and
-    re-generating certain source files from templates)
-
-### Building Google Mock ###
-
-#### Preparing to Build (Unix only) ####
-
-If you are using a Unix system and plan to use the GNU Autotools build
-system to build Google Mock (described below), you'll need to
-configure it now.
-
-To prepare the Autotools build system:
-
-    cd googlemock
-    autoreconf -fvi
-
-To build Google Mock and your tests that use it, you need to tell your
-build system where to find its headers and source files.  The exact
-way to do it depends on which build system you use, and is usually
-straightforward.
-
-This section shows how you can integrate Google Mock into your
-existing build system.
-
-Suppose you put Google Mock in directory `${GMOCK_DIR}` and Google Test
-in `${GTEST_DIR}` (the latter is `${GMOCK_DIR}/gtest` by default).  To
-build Google Mock, create a library build target (or a project as
-called by Visual Studio and Xcode) to compile
-
-    ${GTEST_DIR}/src/gtest-all.cc and ${GMOCK_DIR}/src/gmock-all.cc
-
-with
-
-    ${GTEST_DIR}/include and ${GMOCK_DIR}/include
-
-in the system header search path, and
-
-    ${GTEST_DIR} and ${GMOCK_DIR}
-
-in the normal header search path.  Assuming a Linux-like system and gcc,
-something like the following will do:
-
-    g++ -isystem ${GTEST_DIR}/include -I${GTEST_DIR} \
-        -isystem ${GMOCK_DIR}/include -I${GMOCK_DIR} \
-        -pthread -c ${GTEST_DIR}/src/gtest-all.cc
-    g++ -isystem ${GTEST_DIR}/include -I${GTEST_DIR} \
-        -isystem ${GMOCK_DIR}/include -I${GMOCK_DIR} \
-        -pthread -c ${GMOCK_DIR}/src/gmock-all.cc
-    ar -rv libgmock.a gtest-all.o gmock-all.o
-
-(We need -pthread as Google Test and Google Mock use threads.)
-
-Next, you should compile your test source file with
-${GTEST\_DIR}/include and ${GMOCK\_DIR}/include in the header search
-path, and link it with gmock and any other necessary libraries:
-
-    g++ -isystem ${GTEST_DIR}/include -isystem ${GMOCK_DIR}/include \
-        -pthread path/to/your_test.cc libgmock.a -o your_test
-
-As an example, the make/ directory contains a Makefile that you can
-use to build Google Mock on systems where GNU make is available
-(e.g. Linux, Mac OS X, and Cygwin).  It doesn't try to build Google
-Mock's own tests.  Instead, it just builds the Google Mock library and
-a sample test.  You can use it as a starting point for your own build
-script.
-
-If the default settings are correct for your environment, the
-following commands should succeed:
-
-    cd ${GMOCK_DIR}/make
-    make
-    ./gmock_test
-
-If you see errors, try to tweak the contents of
-[make/Makefile](make/Makefile) to make them go away.
-
-### Windows ###
-
-The msvc/2005 directory contains VC++ 2005 projects and the msvc/2010
-directory contains VC++ 2010 projects for building Google Mock and
-selected tests.
-
-Change to the appropriate directory and run "msbuild gmock.sln" to
-build the library and tests (or open the gmock.sln in the MSVC IDE).
-If you want to create your own project to use with Google Mock, you'll
-have to configure it to use the `gmock_config` propety sheet.  For that:
-
- * Open the Property Manager window (View | Other Windows | Property Manager)
- * Right-click on your project and select "Add Existing Property Sheet..."
- * Navigate to `gmock_config.vsprops` or `gmock_config.props` and select it.
- * In Project Properties | Configuration Properties | General | Additional
-   Include Directories, type <path to Google Mock>/include.
-
-### Tweaking Google Mock ###
-
-Google Mock can be used in diverse environments.  The default
-configuration may not work (or may not work well) out of the box in
-some environments.  However, you can easily tweak Google Mock by
-defining control macros on the compiler command line.  Generally,
-these macros are named like `GTEST_XYZ` and you define them to either 1
-or 0 to enable or disable a certain feature.
-
-We list the most frequently used macros below.  For a complete list,
-see file [${GTEST\_DIR}/include/gtest/internal/gtest-port.h](
-../googletest/include/gtest/internal/gtest-port.h).
-
-### Choosing a TR1 Tuple Library ###
-
-Google Mock uses the C++ Technical Report 1 (TR1) tuple library
-heavily.  Unfortunately TR1 tuple is not yet widely available with all
-compilers.  The good news is that Google Test 1.4.0+ implements a
-subset of TR1 tuple that's enough for Google Mock's need.  Google Mock
-will automatically use that implementation when the compiler doesn't
-provide TR1 tuple.
-
-Usually you don't need to care about which tuple library Google Test
-and Google Mock use.  However, if your project already uses TR1 tuple,
-you need to tell Google Test and Google Mock to use the same TR1 tuple
-library the rest of your project uses, or the two tuple
-implementations will clash.  To do that, add
-
-    -DGTEST_USE_OWN_TR1_TUPLE=0
-
-to the compiler flags while compiling Google Test, Google Mock, and
-your tests.  If you want to force Google Test and Google Mock to use
-their own tuple library, just add
-
-    -DGTEST_USE_OWN_TR1_TUPLE=1
-
-to the compiler flags instead.
-
-If you want to use Boost's TR1 tuple library with Google Mock, please
-refer to the Boost website (http://www.boost.org/) for how to obtain
-it and set it up.
-
-### As a Shared Library (DLL) ###
-
-Google Mock is compact, so most users can build and link it as a static
-library for the simplicity.  Google Mock can be used as a DLL, but the
-same DLL must contain Google Test as well.  See
-[Google Test's README][gtest_readme]
-for instructions on how to set up necessary compiler settings.
-
-### Tweaking Google Mock ###
-
-Most of Google Test's control macros apply to Google Mock as well.
-Please see [Google Test's README][gtest_readme] for how to tweak them.
-
-### Upgrading from an Earlier Version ###
-
-We strive to keep Google Mock releases backward compatible.
-Sometimes, though, we have to make some breaking changes for the
-users' long-term benefits.  This section describes what you'll need to
-do if you are upgrading from an earlier version of Google Mock.
-
-#### Upgrading from 1.1.0 or Earlier ####
-
-You may need to explicitly enable or disable Google Test's own TR1
-tuple library.  See the instructions in section "[Choosing a TR1 Tuple
-Library](../googletest/#choosing-a-tr1-tuple-library)".
-
-#### Upgrading from 1.4.0 or Earlier ####
-
-On platforms where the pthread library is available, Google Test and
-Google Mock use it in order to be thread-safe.  For this to work, you
-may need to tweak your compiler and/or linker flags.  Please see the
-"[Multi-threaded Tests](../googletest#multi-threaded-tests
-)" section in file Google Test's README for what you may need to do.
-
-If you have custom matchers defined using `MatcherInterface` or
-`MakePolymorphicMatcher()`, you'll need to update their definitions to
-use the new matcher API (
-[monomorphic](http://code.google.com/p/googlemock/wiki/CookBook#Writing_New_Monomorphic_Matchers),
-[polymorphic](http://code.google.com/p/googlemock/wiki/CookBook#Writing_New_Polymorphic_Matchers)).
-Matchers defined using `MATCHER()` or `MATCHER_P*()` aren't affected.
-
-### Developing Google Mock ###
-
-This section discusses how to make your own changes to Google Mock.
-
-#### Testing Google Mock Itself ####
-
-To make sure your changes work as intended and don't break existing
-functionality, you'll want to compile and run Google Test's own tests.
-For that you'll need Autotools.  First, make sure you have followed
-the instructions above to configure Google Mock.
-Then, create a build output directory and enter it.  Next,
-
-    ${GMOCK_DIR}/configure  # try --help for more info
-
-Once you have successfully configured Google Mock, the build steps are
-standard for GNU-style OSS packages.
-
-    make        # Standard makefile following GNU conventions
-    make check  # Builds and runs all tests - all should pass.
-
-Note that when building your project against Google Mock, you are building
-against Google Test as well.  There is no need to configure Google Test
-separately.
-
-#### Contributing a Patch ####
-
-We welcome patches.
-Please read the [Developer's Guide](docs/DevGuide.md)
-for how you can contribute. In particular, make sure you have signed
-the Contributor License Agreement, or we won't be able to accept the
-patch.
-
-Happy testing!
-
-[gtest_readme]: ../googletest/README.md "googletest"

extern/gmock/include/gmock/gmock-cardinalities.h

@@ -1,147 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Author: wan@google.com (Zhanyong Wan)
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements some commonly used cardinalities.  More
-// cardinalities can be defined by the user implementing the
-// CardinalityInterface interface if necessary.
-
-#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_
-#define GMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_
-
-#include <limits.h>
-#include <ostream>  // NOLINT
-#include "gmock/internal/gmock-port.h"
-#include "gtest/gtest.h"
-
-namespace testing {
-
-// To implement a cardinality Foo, define:
-//   1. a class FooCardinality that implements the
-//      CardinalityInterface interface, and
-//   2. a factory function that creates a Cardinality object from a
-//      const FooCardinality*.
-//
-// The two-level delegation design follows that of Matcher, providing
-// consistency for extension developers.  It also eases ownership
-// management as Cardinality objects can now be copied like plain values.
-
-// The implementation of a cardinality.
-class CardinalityInterface {
- public:
-  virtual ~CardinalityInterface() {}
-
-  // Conservative estimate on the lower/upper bound of the number of
-  // calls allowed.
-  virtual int ConservativeLowerBound() const { return 0; }
-  virtual int ConservativeUpperBound() const { return INT_MAX; }
-
-  // Returns true iff call_count calls will satisfy this cardinality.
-  virtual bool IsSatisfiedByCallCount(int call_count) const = 0;
-
-  // Returns true iff call_count calls will saturate this cardinality.
-  virtual bool IsSaturatedByCallCount(int call_count) const = 0;
-
-  // Describes self to an ostream.
-  virtual void DescribeTo(::std::ostream* os) const = 0;
-};
-
-// A Cardinality is a copyable and IMMUTABLE (except by assignment)
-// object that specifies how many times a mock function is expected to
-// be called.  The implementation of Cardinality is just a linked_ptr
-// to const CardinalityInterface, so copying is fairly cheap.
-// Don't inherit from Cardinality!
-class GTEST_API_ Cardinality {
- public:
-  // Constructs a null cardinality.  Needed for storing Cardinality
-  // objects in STL containers.
-  Cardinality() {}
-
-  // Constructs a Cardinality from its implementation.
-  explicit Cardinality(const CardinalityInterface* impl) : impl_(impl) {}
-
-  // Conservative estimate on the lower/upper bound of the number of
-  // calls allowed.
-  int ConservativeLowerBound() const { return impl_->ConservativeLowerBound(); }
-  int ConservativeUpperBound() const { return impl_->ConservativeUpperBound(); }
-
-  // Returns true iff call_count calls will satisfy this cardinality.
-  bool IsSatisfiedByCallCount(int call_count) const {
-    return impl_->IsSatisfiedByCallCount(call_count);
-  }
-
-  // Returns true iff call_count calls will saturate this cardinality.
-  bool IsSaturatedByCallCount(int call_count) const {
-    return impl_->IsSaturatedByCallCount(call_count);
-  }
-
-  // Returns true iff call_count calls will over-saturate this
-  // cardinality, i.e. exceed the maximum number of allowed calls.
-  bool IsOverSaturatedByCallCount(int call_count) const {
-    return impl_->IsSaturatedByCallCount(call_count) &&
-        !impl_->IsSatisfiedByCallCount(call_count);
-  }
-
-  // Describes self to an ostream
-  void DescribeTo(::std::ostream* os) const { impl_->DescribeTo(os); }
-
-  // Describes the given actual call count to an ostream.
-  static void DescribeActualCallCountTo(int actual_call_count,
-                                        ::std::ostream* os);
-
- private:
-  internal::linked_ptr<const CardinalityInterface> impl_;
-};
-
-// Creates a cardinality that allows at least n calls.
-GTEST_API_ Cardinality AtLeast(int n);
-
-// Creates a cardinality that allows at most n calls.
-GTEST_API_ Cardinality AtMost(int n);
-
-// Creates a cardinality that allows any number of calls.
-GTEST_API_ Cardinality AnyNumber();
-
-// Creates a cardinality that allows between min and max calls.
-GTEST_API_ Cardinality Between(int min, int max);
-
-// Creates a cardinality that allows exactly n calls.
-GTEST_API_ Cardinality Exactly(int n);
-
-// Creates a cardinality from its implementation.
-inline Cardinality MakeCardinality(const CardinalityInterface* c) {
-  return Cardinality(c);
-}
-
-}  // namespace testing
-
-#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_

extern/gmock/include/gmock/gmock-generated-nice-strict.h

@@ -1,397 +0,0 @@
-// This file was GENERATED by command:
-//     pump.py gmock-generated-nice-strict.h.pump
-// DO NOT EDIT BY HAND!!!
-
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Author: wan@google.com (Zhanyong Wan)
-
-// Implements class templates NiceMock, NaggyMock, and StrictMock.
-//
-// Given a mock class MockFoo that is created using Google Mock,
-// NiceMock<MockFoo> is a subclass of MockFoo that allows
-// uninteresting calls (i.e. calls to mock methods that have no
-// EXPECT_CALL specs), NaggyMock<MockFoo> is a subclass of MockFoo
-// that prints a warning when an uninteresting call occurs, and
-// StrictMock<MockFoo> is a subclass of MockFoo that treats all
-// uninteresting calls as errors.
-//
-// Currently a mock is naggy by default, so MockFoo and
-// NaggyMock<MockFoo> behave like the same.  However, we will soon
-// switch the default behavior of mocks to be nice, as that in general
-// leads to more maintainable tests.  When that happens, MockFoo will
-// stop behaving like NaggyMock<MockFoo> and start behaving like
-// NiceMock<MockFoo>.
-//
-// NiceMock, NaggyMock, and StrictMock "inherit" the constructors of
-// their respective base class, with up-to 10 arguments.  Therefore
-// you can write NiceMock<MockFoo>(5, "a") to construct a nice mock
-// where MockFoo has a constructor that accepts (int, const char*),
-// for example.
-//
-// A known limitation is that NiceMock<MockFoo>, NaggyMock<MockFoo>,
-// and StrictMock<MockFoo> only works for mock methods defined using
-// the MOCK_METHOD* family of macros DIRECTLY in the MockFoo class.
-// If a mock method is defined in a base class of MockFoo, the "nice"
-// or "strict" modifier may not affect it, depending on the compiler.
-// In particular, nesting NiceMock, NaggyMock, and StrictMock is NOT
-// supported.
-//
-// Another known limitation is that the constructors of the base mock
-// cannot have arguments passed by non-const reference, which are
-// banned by the Google C++ style guide anyway.
-
-#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_NICE_STRICT_H_
-#define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_NICE_STRICT_H_
-
-#include "gmock/gmock-spec-builders.h"
-#include "gmock/internal/gmock-port.h"
-
-namespace testing {
-
-template <class MockClass>
-class NiceMock : public MockClass {
- public:
-  // We don't factor out the constructor body to a common method, as
-  // we have to avoid a possible clash with members of MockClass.
-  NiceMock() {
-    ::testing::Mock::AllowUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  // C++ doesn't (yet) allow inheritance of constructors, so we have
-  // to define it for each arity.
-  template <typename A1>
-  explicit NiceMock(const A1& a1) : MockClass(a1) {
-    ::testing::Mock::AllowUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-  template <typename A1, typename A2>
-  NiceMock(const A1& a1, const A2& a2) : MockClass(a1, a2) {
-    ::testing::Mock::AllowUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  template <typename A1, typename A2, typename A3>
-  NiceMock(const A1& a1, const A2& a2, const A3& a3) : MockClass(a1, a2, a3) {
-    ::testing::Mock::AllowUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  template <typename A1, typename A2, typename A3, typename A4>
-  NiceMock(const A1& a1, const A2& a2, const A3& a3,
-      const A4& a4) : MockClass(a1, a2, a3, a4) {
-    ::testing::Mock::AllowUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  template <typename A1, typename A2, typename A3, typename A4, typename A5>
-  NiceMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
-      const A5& a5) : MockClass(a1, a2, a3, a4, a5) {
-    ::testing::Mock::AllowUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  template <typename A1, typename A2, typename A3, typename A4, typename A5,
-      typename A6>
-  NiceMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
-      const A5& a5, const A6& a6) : MockClass(a1, a2, a3, a4, a5, a6) {
-    ::testing::Mock::AllowUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  template <typename A1, typename A2, typename A3, typename A4, typename A5,
-      typename A6, typename A7>
-  NiceMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
-      const A5& a5, const A6& a6, const A7& a7) : MockClass(a1, a2, a3, a4, a5,
-      a6, a7) {
-    ::testing::Mock::AllowUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  template <typename A1, typename A2, typename A3, typename A4, typename A5,
-      typename A6, typename A7, typename A8>
-  NiceMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
-      const A5& a5, const A6& a6, const A7& a7, const A8& a8) : MockClass(a1,
-      a2, a3, a4, a5, a6, a7, a8) {
-    ::testing::Mock::AllowUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  template <typename A1, typename A2, typename A3, typename A4, typename A5,
-      typename A6, typename A7, typename A8, typename A9>
-  NiceMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
-      const A5& a5, const A6& a6, const A7& a7, const A8& a8,
-      const A9& a9) : MockClass(a1, a2, a3, a4, a5, a6, a7, a8, a9) {
-    ::testing::Mock::AllowUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  template <typename A1, typename A2, typename A3, typename A4, typename A5,
-      typename A6, typename A7, typename A8, typename A9, typename A10>
-  NiceMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
-      const A5& a5, const A6& a6, const A7& a7, const A8& a8, const A9& a9,
-      const A10& a10) : MockClass(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) {
-    ::testing::Mock::AllowUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  virtual ~NiceMock() {
-    ::testing::Mock::UnregisterCallReaction(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(NiceMock);
-};
-
-template <class MockClass>
-class NaggyMock : public MockClass {
- public:
-  // We don't factor out the constructor body to a common method, as
-  // we have to avoid a possible clash with members of MockClass.
-  NaggyMock() {
-    ::testing::Mock::WarnUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  // C++ doesn't (yet) allow inheritance of constructors, so we have
-  // to define it for each arity.
-  template <typename A1>
-  explicit NaggyMock(const A1& a1) : MockClass(a1) {
-    ::testing::Mock::WarnUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-  template <typename A1, typename A2>
-  NaggyMock(const A1& a1, const A2& a2) : MockClass(a1, a2) {
-    ::testing::Mock::WarnUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  template <typename A1, typename A2, typename A3>
-  NaggyMock(const A1& a1, const A2& a2, const A3& a3) : MockClass(a1, a2, a3) {
-    ::testing::Mock::WarnUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  template <typename A1, typename A2, typename A3, typename A4>
-  NaggyMock(const A1& a1, const A2& a2, const A3& a3,
-      const A4& a4) : MockClass(a1, a2, a3, a4) {
-    ::testing::Mock::WarnUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  template <typename A1, typename A2, typename A3, typename A4, typename A5>
-  NaggyMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
-      const A5& a5) : MockClass(a1, a2, a3, a4, a5) {
-    ::testing::Mock::WarnUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  template <typename A1, typename A2, typename A3, typename A4, typename A5,
-      typename A6>
-  NaggyMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
-      const A5& a5, const A6& a6) : MockClass(a1, a2, a3, a4, a5, a6) {
-    ::testing::Mock::WarnUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  template <typename A1, typename A2, typename A3, typename A4, typename A5,
-      typename A6, typename A7>
-  NaggyMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
-      const A5& a5, const A6& a6, const A7& a7) : MockClass(a1, a2, a3, a4, a5,
-      a6, a7) {
-    ::testing::Mock::WarnUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  template <typename A1, typename A2, typename A3, typename A4, typename A5,
-      typename A6, typename A7, typename A8>
-  NaggyMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
-      const A5& a5, const A6& a6, const A7& a7, const A8& a8) : MockClass(a1,
-      a2, a3, a4, a5, a6, a7, a8) {
-    ::testing::Mock::WarnUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  template <typename A1, typename A2, typename A3, typename A4, typename A5,
-      typename A6, typename A7, typename A8, typename A9>
-  NaggyMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
-      const A5& a5, const A6& a6, const A7& a7, const A8& a8,
-      const A9& a9) : MockClass(a1, a2, a3, a4, a5, a6, a7, a8, a9) {
-    ::testing::Mock::WarnUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  template <typename A1, typename A2, typename A3, typename A4, typename A5,
-      typename A6, typename A7, typename A8, typename A9, typename A10>
-  NaggyMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
-      const A5& a5, const A6& a6, const A7& a7, const A8& a8, const A9& a9,
-      const A10& a10) : MockClass(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) {
-    ::testing::Mock::WarnUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  virtual ~NaggyMock() {
-    ::testing::Mock::UnregisterCallReaction(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(NaggyMock);
-};
-
-template <class MockClass>
-class StrictMock : public MockClass {
- public:
-  // We don't factor out the constructor body to a common method, as
-  // we have to avoid a possible clash with members of MockClass.
-  StrictMock() {
-    ::testing::Mock::FailUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  // C++ doesn't (yet) allow inheritance of constructors, so we have
-  // to define it for each arity.
-  template <typename A1>
-  explicit StrictMock(const A1& a1) : MockClass(a1) {
-    ::testing::Mock::FailUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-  template <typename A1, typename A2>
-  StrictMock(const A1& a1, const A2& a2) : MockClass(a1, a2) {
-    ::testing::Mock::FailUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  template <typename A1, typename A2, typename A3>
-  StrictMock(const A1& a1, const A2& a2, const A3& a3) : MockClass(a1, a2, a3) {
-    ::testing::Mock::FailUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  template <typename A1, typename A2, typename A3, typename A4>
-  StrictMock(const A1& a1, const A2& a2, const A3& a3,
-      const A4& a4) : MockClass(a1, a2, a3, a4) {
-    ::testing::Mock::FailUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  template <typename A1, typename A2, typename A3, typename A4, typename A5>
-  StrictMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
-      const A5& a5) : MockClass(a1, a2, a3, a4, a5) {
-    ::testing::Mock::FailUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  template <typename A1, typename A2, typename A3, typename A4, typename A5,
-      typename A6>
-  StrictMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
-      const A5& a5, const A6& a6) : MockClass(a1, a2, a3, a4, a5, a6) {
-    ::testing::Mock::FailUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  template <typename A1, typename A2, typename A3, typename A4, typename A5,
-      typename A6, typename A7>
-  StrictMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
-      const A5& a5, const A6& a6, const A7& a7) : MockClass(a1, a2, a3, a4, a5,
-      a6, a7) {
-    ::testing::Mock::FailUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  template <typename A1, typename A2, typename A3, typename A4, typename A5,
-      typename A6, typename A7, typename A8>
-  StrictMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
-      const A5& a5, const A6& a6, const A7& a7, const A8& a8) : MockClass(a1,
-      a2, a3, a4, a5, a6, a7, a8) {
-    ::testing::Mock::FailUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  template <typename A1, typename A2, typename A3, typename A4, typename A5,
-      typename A6, typename A7, typename A8, typename A9>
-  StrictMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
-      const A5& a5, const A6& a6, const A7& a7, const A8& a8,
-      const A9& a9) : MockClass(a1, a2, a3, a4, a5, a6, a7, a8, a9) {
-    ::testing::Mock::FailUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  template <typename A1, typename A2, typename A3, typename A4, typename A5,
-      typename A6, typename A7, typename A8, typename A9, typename A10>
-  StrictMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
-      const A5& a5, const A6& a6, const A7& a7, const A8& a8, const A9& a9,
-      const A10& a10) : MockClass(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) {
-    ::testing::Mock::FailUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  virtual ~StrictMock() {
-    ::testing::Mock::UnregisterCallReaction(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(StrictMock);
-};
-
-// The following specializations catch some (relatively more common)
-// user errors of nesting nice and strict mocks.  They do NOT catch
-// all possible errors.
-
-// These specializations are declared but not defined, as NiceMock,
-// NaggyMock, and StrictMock cannot be nested.
-
-template <typename MockClass>
-class NiceMock<NiceMock<MockClass> >;
-template <typename MockClass>
-class NiceMock<NaggyMock<MockClass> >;
-template <typename MockClass>
-class NiceMock<StrictMock<MockClass> >;
-
-template <typename MockClass>
-class NaggyMock<NiceMock<MockClass> >;
-template <typename MockClass>
-class NaggyMock<NaggyMock<MockClass> >;
-template <typename MockClass>
-class NaggyMock<StrictMock<MockClass> >;
-
-template <typename MockClass>
-class StrictMock<NiceMock<MockClass> >;
-template <typename MockClass>
-class StrictMock<NaggyMock<MockClass> >;
-template <typename MockClass>
-class StrictMock<StrictMock<MockClass> >;
-
-}  // namespace testing
-
-#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_NICE_STRICT_H_

extern/gmock/include/gmock/gmock-more-actions.h

@@ -1,246 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Author: wan@google.com (Zhanyong Wan)
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements some actions that depend on gmock-generated-actions.h.
-
-#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_
-#define GMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_
-
-#include <algorithm>
-
-#include "gmock/gmock-generated-actions.h"
-
-namespace testing {
-namespace internal {
-
-// Implements the Invoke(f) action.  The template argument
-// FunctionImpl is the implementation type of f, which can be either a
-// function pointer or a functor.  Invoke(f) can be used as an
-// Action<F> as long as f's type is compatible with F (i.e. f can be
-// assigned to a tr1::function<F>).
-template <typename FunctionImpl>
-class InvokeAction {
- public:
-  // The c'tor makes a copy of function_impl (either a function
-  // pointer or a functor).
-  explicit InvokeAction(FunctionImpl function_impl)
-      : function_impl_(function_impl) {}
-
-  template <typename Result, typename ArgumentTuple>
-  Result Perform(const ArgumentTuple& args) {
-    return InvokeHelper<Result, ArgumentTuple>::Invoke(function_impl_, args);
-  }
-
- private:
-  FunctionImpl function_impl_;
-
-  GTEST_DISALLOW_ASSIGN_(InvokeAction);
-};
-
-// Implements the Invoke(object_ptr, &Class::Method) action.
-template <class Class, typename MethodPtr>
-class InvokeMethodAction {
- public:
-  InvokeMethodAction(Class* obj_ptr, MethodPtr method_ptr)
-      : method_ptr_(method_ptr), obj_ptr_(obj_ptr) {}
-
-  template <typename Result, typename ArgumentTuple>
-  Result Perform(const ArgumentTuple& args) const {
-    return InvokeHelper<Result, ArgumentTuple>::InvokeMethod(
-        obj_ptr_, method_ptr_, args);
-  }
-
- private:
-  // The order of these members matters.  Reversing the order can trigger
-  // warning C4121 in MSVC (see
-  // http://computer-programming-forum.com/7-vc.net/6fbc30265f860ad1.htm ).
-  const MethodPtr method_ptr_;
-  Class* const obj_ptr_;
-
-  GTEST_DISALLOW_ASSIGN_(InvokeMethodAction);
-};
-
-// An internal replacement for std::copy which mimics its behavior. This is
-// necessary because Visual Studio deprecates ::std::copy, issuing warning 4996.
-// However Visual Studio 2010 and later do not honor #pragmas which disable that
-// warning.
-template<typename InputIterator, typename OutputIterator>
-inline OutputIterator CopyElements(InputIterator first,
-                                   InputIterator last,
-                                   OutputIterator output) {
-  for (; first != last; ++first, ++output) {
-    *output = *first;
-  }
-  return output;
-}
-
-}  // namespace internal
-
-// Various overloads for Invoke().
-
-// Creates an action that invokes 'function_impl' with the mock
-// function's arguments.
-template <typename FunctionImpl>
-PolymorphicAction<internal::InvokeAction<FunctionImpl> > Invoke(
-    FunctionImpl function_impl) {
-  return MakePolymorphicAction(
-      internal::InvokeAction<FunctionImpl>(function_impl));
-}
-
-// Creates an action that invokes the given method on the given object
-// with the mock function's arguments.
-template <class Class, typename MethodPtr>
-PolymorphicAction<internal::InvokeMethodAction<Class, MethodPtr> > Invoke(
-    Class* obj_ptr, MethodPtr method_ptr) {
-  return MakePolymorphicAction(
-      internal::InvokeMethodAction<Class, MethodPtr>(obj_ptr, method_ptr));
-}
-
-// WithoutArgs(inner_action) can be used in a mock function with a
-// non-empty argument list to perform inner_action, which takes no
-// argument.  In other words, it adapts an action accepting no
-// argument to one that accepts (and ignores) arguments.
-template <typename InnerAction>
-inline internal::WithArgsAction<InnerAction>
-WithoutArgs(const InnerAction& action) {
-  return internal::WithArgsAction<InnerAction>(action);
-}
-
-// WithArg<k>(an_action) creates an action that passes the k-th
-// (0-based) argument of the mock function to an_action and performs
-// it.  It adapts an action accepting one argument to one that accepts
-// multiple arguments.  For convenience, we also provide
-// WithArgs<k>(an_action) (defined below) as a synonym.
-template <int k, typename InnerAction>
-inline internal::WithArgsAction<InnerAction, k>
-WithArg(const InnerAction& action) {
-  return internal::WithArgsAction<InnerAction, k>(action);
-}
-
-// The ACTION*() macros trigger warning C4100 (unreferenced formal
-// parameter) in MSVC with -W4.  Unfortunately they cannot be fixed in
-// the macro definition, as the warnings are generated when the macro
-// is expanded and macro expansion cannot contain #pragma.  Therefore
-// we suppress them here.
-#ifdef _MSC_VER
-# pragma warning(push)
-# pragma warning(disable:4100)
-#endif
-
-// Action ReturnArg<k>() returns the k-th argument of the mock function.
-ACTION_TEMPLATE(ReturnArg,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_0_VALUE_PARAMS()) {
-  return ::testing::get<k>(args);
-}
-
-// Action SaveArg<k>(pointer) saves the k-th (0-based) argument of the
-// mock function to *pointer.
-ACTION_TEMPLATE(SaveArg,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_1_VALUE_PARAMS(pointer)) {
-  *pointer = ::testing::get<k>(args);
-}
-
-// Action SaveArgPointee<k>(pointer) saves the value pointed to
-// by the k-th (0-based) argument of the mock function to *pointer.
-ACTION_TEMPLATE(SaveArgPointee,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_1_VALUE_PARAMS(pointer)) {
-  *pointer = *::testing::get<k>(args);
-}
-
-// Action SetArgReferee<k>(value) assigns 'value' to the variable
-// referenced by the k-th (0-based) argument of the mock function.
-ACTION_TEMPLATE(SetArgReferee,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_1_VALUE_PARAMS(value)) {
-  typedef typename ::testing::tuple_element<k, args_type>::type argk_type;
-  // Ensures that argument #k is a reference.  If you get a compiler
-  // error on the next line, you are using SetArgReferee<k>(value) in
-  // a mock function whose k-th (0-based) argument is not a reference.
-  GTEST_COMPILE_ASSERT_(internal::is_reference<argk_type>::value,
-                        SetArgReferee_must_be_used_with_a_reference_argument);
-  ::testing::get<k>(args) = value;
-}
-
-// Action SetArrayArgument<k>(first, last) copies the elements in
-// source range [first, last) to the array pointed to by the k-th
-// (0-based) argument, which can be either a pointer or an
-// iterator. The action does not take ownership of the elements in the
-// source range.
-ACTION_TEMPLATE(SetArrayArgument,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_2_VALUE_PARAMS(first, last)) {
-  // Visual Studio deprecates ::std::copy, so we use our own copy in that case.
-#ifdef _MSC_VER
-  internal::CopyElements(first, last, ::testing::get<k>(args));
-#else
-  ::std::copy(first, last, ::testing::get<k>(args));
-#endif
-}
-
-// Action DeleteArg<k>() deletes the k-th (0-based) argument of the mock
-// function.
-ACTION_TEMPLATE(DeleteArg,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_0_VALUE_PARAMS()) {
-  delete ::testing::get<k>(args);
-}
-
-// This action returns the value pointed to by 'pointer'.
-ACTION_P(ReturnPointee, pointer) { return *pointer; }
-
-// Action Throw(exception) can be used in a mock function of any type
-// to throw the given exception.  Any copyable value can be thrown.
-#if GTEST_HAS_EXCEPTIONS
-
-// Suppresses the 'unreachable code' warning that VC generates in opt modes.
-# ifdef _MSC_VER
-#  pragma warning(push)          // Saves the current warning state.
-#  pragma warning(disable:4702)  // Temporarily disables warning 4702.
-# endif
-ACTION_P(Throw, exception) { throw exception; }
-# ifdef _MSC_VER
-#  pragma warning(pop)           // Restores the warning state.
-# endif
-
-#endif  // GTEST_HAS_EXCEPTIONS
-
-#ifdef _MSC_VER
-# pragma warning(pop)
-#endif
-
-}  // namespace testing
-
-#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_

extern/gmock/include/gmock/gmock-more-matchers.h

@@ -1,58 +0,0 @@
-// Copyright 2013, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Author: marcus.boerger@google.com (Marcus Boerger)
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements some matchers that depend on gmock-generated-matchers.h.
-//
-// Note that tests are implemented in gmock-matchers_test.cc rather than
-// gmock-more-matchers-test.cc.
-
-#ifndef GMOCK_GMOCK_MORE_MATCHERS_H_
-#define GMOCK_GMOCK_MORE_MATCHERS_H_
-
-#include "gmock/gmock-generated-matchers.h"
-
-namespace testing {
-
-// Defines a matcher that matches an empty container. The container must
-// support both size() and empty(), which all STL-like containers provide.
-MATCHER(IsEmpty, negation ? "isn't empty" : "is empty") {
-  if (arg.empty()) {
-    return true;
-  }
-  *result_listener << "whose size is " << arg.size();
-  return false;
-}
-
-}  // namespace testing
-
-#endif  // GMOCK_GMOCK_MORE_MATCHERS_H_

extern/gmock/include/gmock/gmock.h

@@ -1,94 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Author: wan@google.com (Zhanyong Wan)
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This is the main header file a user should include.
-
-#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_H_
-#define GMOCK_INCLUDE_GMOCK_GMOCK_H_
-
-// This file implements the following syntax:
-//
-//   ON_CALL(mock_object.Method(...))
-//     .With(...) ?
-//     .WillByDefault(...);
-//
-// where With() is optional and WillByDefault() must appear exactly
-// once.
-//
-//   EXPECT_CALL(mock_object.Method(...))
-//     .With(...) ?
-//     .Times(...) ?
-//     .InSequence(...) *
-//     .WillOnce(...) *
-//     .WillRepeatedly(...) ?
-//     .RetiresOnSaturation() ? ;
-//
-// where all clauses are optional and WillOnce() can be repeated.
-
-#include "gmock/gmock-actions.h"
-#include "gmock/gmock-cardinalities.h"
-#include "gmock/gmock-generated-actions.h"
-#include "gmock/gmock-generated-function-mockers.h"
-#include "gmock/gmock-generated-nice-strict.h"
-#include "gmock/gmock-generated-matchers.h"
-#include "gmock/gmock-matchers.h"
-#include "gmock/gmock-more-actions.h"
-#include "gmock/gmock-more-matchers.h"
-#include "gmock/internal/gmock-internal-utils.h"
-
-namespace testing {
-
-// Declares Google Mock flags that we want a user to use programmatically.
-GMOCK_DECLARE_bool_(catch_leaked_mocks);
-GMOCK_DECLARE_string_(verbose);
-
-// Initializes Google Mock.  This must be called before running the
-// tests.  In particular, it parses the command line for the flags
-// that Google Mock recognizes.  Whenever a Google Mock flag is seen,
-// it is removed from argv, and *argc is decremented.
-//
-// No value is returned.  Instead, the Google Mock flag variables are
-// updated.
-//
-// Since Google Test is needed for Google Mock to work, this function
-// also initializes Google Test and parses its flags, if that hasn't
-// been done.
-GTEST_API_ void InitGoogleMock(int* argc, char** argv);
-
-// This overloaded version can be used in Windows programs compiled in
-// UNICODE mode.
-GTEST_API_ void InitGoogleMock(int* argc, wchar_t** argv);
-
-}  // namespace testing
-
-#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_H_

extern/gmock/include/gmock/internal/custom/gmock-generated-actions.h

@@ -1,8 +0,0 @@
-// This file was GENERATED by command:
-//     pump.py gmock-generated-actions.h.pump
-// DO NOT EDIT BY HAND!!!
-
-#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
-#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
-
-#endif  // GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_

extern/gmock/include/gmock/internal/custom/gmock-matchers.h

@@ -1,39 +0,0 @@
-// Copyright 2015, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// ============================================================
-// An installation-specific extension point for gmock-matchers.h.
-// ============================================================
-//
-// Adds google3 callback support to CallableTraits.
-//
-#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_MATCHERS_H_
-#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_MATCHERS_H_
-
-#endif  //  GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_MATCHERS_H_

extern/gmock/include/gmock/internal/custom/gmock-port.h

@@ -1,46 +0,0 @@
-// Copyright 2015, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Injection point for custom user configurations.
-// The following macros can be defined:
-//
-//   Flag related macros:
-//     GMOCK_DECLARE_bool_(name)
-//     GMOCK_DECLARE_int32_(name)
-//     GMOCK_DECLARE_string_(name)
-//     GMOCK_DEFINE_bool_(name, default_val, doc)
-//     GMOCK_DEFINE_int32_(name, default_val, doc)
-//     GMOCK_DEFINE_string_(name, default_val, doc)
-//
-// ** Custom implementation starts here **
-
-#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
-#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
-
-#endif  // GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_

extern/gmock/include/gmock/internal/gmock-generated-internal-utils.h

@@ -1,279 +0,0 @@
-// This file was GENERATED by command:
-//     pump.py gmock-generated-internal-utils.h.pump
-// DO NOT EDIT BY HAND!!!
-
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Author: wan@google.com (Zhanyong Wan)
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file contains template meta-programming utility classes needed
-// for implementing Google Mock.
-
-#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_GENERATED_INTERNAL_UTILS_H_
-#define GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_GENERATED_INTERNAL_UTILS_H_
-
-#include "gmock/internal/gmock-port.h"
-
-namespace testing {
-
-template <typename T>
-class Matcher;
-
-namespace internal {
-
-// An IgnoredValue object can be implicitly constructed from ANY value.
-// This is used in implementing the IgnoreResult(a) action.
-class IgnoredValue {
- public:
-  // This constructor template allows any value to be implicitly
-  // converted to IgnoredValue.  The object has no data member and
-  // doesn't try to remember anything about the argument.  We
-  // deliberately omit the 'explicit' keyword in order to allow the
-  // conversion to be implicit.
-  template <typename T>
-  IgnoredValue(const T& /* ignored */) {}  // NOLINT(runtime/explicit)
-};
-
-// MatcherTuple<T>::type is a tuple type where each field is a Matcher
-// for the corresponding field in tuple type T.
-template <typename Tuple>
-struct MatcherTuple;
-
-template <>
-struct MatcherTuple< ::testing::tuple<> > {
-  typedef ::testing::tuple< > type;
-};
-
-template <typename A1>
-struct MatcherTuple< ::testing::tuple<A1> > {
-  typedef ::testing::tuple<Matcher<A1> > type;
-};
-
-template <typename A1, typename A2>
-struct MatcherTuple< ::testing::tuple<A1, A2> > {
-  typedef ::testing::tuple<Matcher<A1>, Matcher<A2> > type;
-};
-
-template <typename A1, typename A2, typename A3>
-struct MatcherTuple< ::testing::tuple<A1, A2, A3> > {
-  typedef ::testing::tuple<Matcher<A1>, Matcher<A2>, Matcher<A3> > type;
-};
-
-template <typename A1, typename A2, typename A3, typename A4>
-struct MatcherTuple< ::testing::tuple<A1, A2, A3, A4> > {
-  typedef ::testing::tuple<Matcher<A1>, Matcher<A2>, Matcher<A3>,
-      Matcher<A4> > type;
-};
-
-template <typename A1, typename A2, typename A3, typename A4, typename A5>
-struct MatcherTuple< ::testing::tuple<A1, A2, A3, A4, A5> > {
-  typedef ::testing::tuple<Matcher<A1>, Matcher<A2>, Matcher<A3>, Matcher<A4>,
-      Matcher<A5> > type;
-};
-
-template <typename A1, typename A2, typename A3, typename A4, typename A5,
-    typename A6>
-struct MatcherTuple< ::testing::tuple<A1, A2, A3, A4, A5, A6> > {
-  typedef ::testing::tuple<Matcher<A1>, Matcher<A2>, Matcher<A3>, Matcher<A4>,
-      Matcher<A5>, Matcher<A6> > type;
-};
-
-template <typename A1, typename A2, typename A3, typename A4, typename A5,
-    typename A6, typename A7>
-struct MatcherTuple< ::testing::tuple<A1, A2, A3, A4, A5, A6, A7> > {
-  typedef ::testing::tuple<Matcher<A1>, Matcher<A2>, Matcher<A3>, Matcher<A4>,
-      Matcher<A5>, Matcher<A6>, Matcher<A7> > type;
-};
-
-template <typename A1, typename A2, typename A3, typename A4, typename A5,
-    typename A6, typename A7, typename A8>
-struct MatcherTuple< ::testing::tuple<A1, A2, A3, A4, A5, A6, A7, A8> > {
-  typedef ::testing::tuple<Matcher<A1>, Matcher<A2>, Matcher<A3>, Matcher<A4>,
-      Matcher<A5>, Matcher<A6>, Matcher<A7>, Matcher<A8> > type;
-};
-
-template <typename A1, typename A2, typename A3, typename A4, typename A5,
-    typename A6, typename A7, typename A8, typename A9>
-struct MatcherTuple< ::testing::tuple<A1, A2, A3, A4, A5, A6, A7, A8, A9> > {
-  typedef ::testing::tuple<Matcher<A1>, Matcher<A2>, Matcher<A3>, Matcher<A4>,
-      Matcher<A5>, Matcher<A6>, Matcher<A7>, Matcher<A8>, Matcher<A9> > type;
-};
-
-template <typename A1, typename A2, typename A3, typename A4, typename A5,
-    typename A6, typename A7, typename A8, typename A9, typename A10>
-struct MatcherTuple< ::testing::tuple<A1, A2, A3, A4, A5, A6, A7, A8, A9,
-    A10> > {
-  typedef ::testing::tuple<Matcher<A1>, Matcher<A2>, Matcher<A3>, Matcher<A4>,
-      Matcher<A5>, Matcher<A6>, Matcher<A7>, Matcher<A8>, Matcher<A9>,
-      Matcher<A10> > type;
-};
-
-// Template struct Function<F>, where F must be a function type, contains
-// the following typedefs:
-//
-//   Result:               the function's return type.
-//   ArgumentN:            the type of the N-th argument, where N starts with 1.
-//   ArgumentTuple:        the tuple type consisting of all parameters of F.
-//   ArgumentMatcherTuple: the tuple type consisting of Matchers for all
-//                         parameters of F.
-//   MakeResultVoid:       the function type obtained by substituting void
-//                         for the return type of F.
-//   MakeResultIgnoredValue:
-//                         the function type obtained by substituting Something
-//                         for the return type of F.
-template <typename F>
-struct Function;
-
-template <typename R>
-struct Function<R()> {
-  typedef R Result;
-  typedef ::testing::tuple<> ArgumentTuple;
-  typedef typename MatcherTuple<ArgumentTuple>::type ArgumentMatcherTuple;
-  typedef void MakeResultVoid();
-  typedef IgnoredValue MakeResultIgnoredValue();
-};
-
-template <typename R, typename A1>
-struct Function<R(A1)>
-    : Function<R()> {
-  typedef A1 Argument1;
-  typedef ::testing::tuple<A1> ArgumentTuple;
-  typedef typename MatcherTuple<ArgumentTuple>::type ArgumentMatcherTuple;
-  typedef void MakeResultVoid(A1);
-  typedef IgnoredValue MakeResultIgnoredValue(A1);
-};
-
-template <typename R, typename A1, typename A2>
-struct Function<R(A1, A2)>
-    : Function<R(A1)> {
-  typedef A2 Argument2;
-  typedef ::testing::tuple<A1, A2> ArgumentTuple;
-  typedef typename MatcherTuple<ArgumentTuple>::type ArgumentMatcherTuple;
-  typedef void MakeResultVoid(A1, A2);
-  typedef IgnoredValue MakeResultIgnoredValue(A1, A2);
-};
-
-template <typename R, typename A1, typename A2, typename A3>
-struct Function<R(A1, A2, A3)>
-    : Function<R(A1, A2)> {
-  typedef A3 Argument3;
-  typedef ::testing::tuple<A1, A2, A3> ArgumentTuple;
-  typedef typename MatcherTuple<ArgumentTuple>::type ArgumentMatcherTuple;
-  typedef void MakeResultVoid(A1, A2, A3);
-  typedef IgnoredValue MakeResultIgnoredValue(A1, A2, A3);
-};
-
-template <typename R, typename A1, typename A2, typename A3, typename A4>
-struct Function<R(A1, A2, A3, A4)>
-    : Function<R(A1, A2, A3)> {
-  typedef A4 Argument4;
-  typedef ::testing::tuple<A1, A2, A3, A4> ArgumentTuple;
-  typedef typename MatcherTuple<ArgumentTuple>::type ArgumentMatcherTuple;
-  typedef void MakeResultVoid(A1, A2, A3, A4);
-  typedef IgnoredValue MakeResultIgnoredValue(A1, A2, A3, A4);
-};
-
-template <typename R, typename A1, typename A2, typename A3, typename A4,
-    typename A5>
-struct Function<R(A1, A2, A3, A4, A5)>
-    : Function<R(A1, A2, A3, A4)> {
-  typedef A5 Argument5;
-  typedef ::testing::tuple<A1, A2, A3, A4, A5> ArgumentTuple;
-  typedef typename MatcherTuple<ArgumentTuple>::type ArgumentMatcherTuple;
-  typedef void MakeResultVoid(A1, A2, A3, A4, A5);
-  typedef IgnoredValue MakeResultIgnoredValue(A1, A2, A3, A4, A5);
-};
-
-template <typename R, typename A1, typename A2, typename A3, typename A4,
-    typename A5, typename A6>
-struct Function<R(A1, A2, A3, A4, A5, A6)>
-    : Function<R(A1, A2, A3, A4, A5)> {
-  typedef A6 Argument6;
-  typedef ::testing::tuple<A1, A2, A3, A4, A5, A6> ArgumentTuple;
-  typedef typename MatcherTuple<ArgumentTuple>::type ArgumentMatcherTuple;
-  typedef void MakeResultVoid(A1, A2, A3, A4, A5, A6);
-  typedef IgnoredValue MakeResultIgnoredValue(A1, A2, A3, A4, A5, A6);
-};
-
-template <typename R, typename A1, typename A2, typename A3, typename A4,
-    typename A5, typename A6, typename A7>
-struct Function<R(A1, A2, A3, A4, A5, A6, A7)>
-    : Function<R(A1, A2, A3, A4, A5, A6)> {
-  typedef A7 Argument7;
-  typedef ::testing::tuple<A1, A2, A3, A4, A5, A6, A7> ArgumentTuple;
-  typedef typename MatcherTuple<ArgumentTuple>::type ArgumentMatcherTuple;
-  typedef void MakeResultVoid(A1, A2, A3, A4, A5, A6, A7);
-  typedef IgnoredValue MakeResultIgnoredValue(A1, A2, A3, A4, A5, A6, A7);
-};
-
-template <typename R, typename A1, typename A2, typename A3, typename A4,
-    typename A5, typename A6, typename A7, typename A8>
-struct Function<R(A1, A2, A3, A4, A5, A6, A7, A8)>
-    : Function<R(A1, A2, A3, A4, A5, A6, A7)> {
-  typedef A8 Argument8;
-  typedef ::testing::tuple<A1, A2, A3, A4, A5, A6, A7, A8> ArgumentTuple;
-  typedef typename MatcherTuple<ArgumentTuple>::type ArgumentMatcherTuple;
-  typedef void MakeResultVoid(A1, A2, A3, A4, A5, A6, A7, A8);
-  typedef IgnoredValue MakeResultIgnoredValue(A1, A2, A3, A4, A5, A6, A7, A8);
-};
-
-template <typename R, typename A1, typename A2, typename A3, typename A4,
-    typename A5, typename A6, typename A7, typename A8, typename A9>
-struct Function<R(A1, A2, A3, A4, A5, A6, A7, A8, A9)>
-    : Function<R(A1, A2, A3, A4, A5, A6, A7, A8)> {
-  typedef A9 Argument9;
-  typedef ::testing::tuple<A1, A2, A3, A4, A5, A6, A7, A8, A9> ArgumentTuple;
-  typedef typename MatcherTuple<ArgumentTuple>::type ArgumentMatcherTuple;
-  typedef void MakeResultVoid(A1, A2, A3, A4, A5, A6, A7, A8, A9);
-  typedef IgnoredValue MakeResultIgnoredValue(A1, A2, A3, A4, A5, A6, A7, A8,
-      A9);
-};
-
-template <typename R, typename A1, typename A2, typename A3, typename A4,
-    typename A5, typename A6, typename A7, typename A8, typename A9,
-    typename A10>
-struct Function<R(A1, A2, A3, A4, A5, A6, A7, A8, A9, A10)>
-    : Function<R(A1, A2, A3, A4, A5, A6, A7, A8, A9)> {
-  typedef A10 Argument10;
-  typedef ::testing::tuple<A1, A2, A3, A4, A5, A6, A7, A8, A9,
-      A10> ArgumentTuple;
-  typedef typename MatcherTuple<ArgumentTuple>::type ArgumentMatcherTuple;
-  typedef void MakeResultVoid(A1, A2, A3, A4, A5, A6, A7, A8, A9, A10);
-  typedef IgnoredValue MakeResultIgnoredValue(A1, A2, A3, A4, A5, A6, A7, A8,
-      A9, A10);
-};
-
-}  // namespace internal
-
-}  // namespace testing
-
-#endif  // GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_GENERATED_INTERNAL_UTILS_H_

extern/gmock/include/gmock/internal/gmock-internal-utils.h

@@ -1,511 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Author: wan@google.com (Zhanyong Wan)
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file defines some utilities useful for implementing Google
-// Mock.  They are subject to change without notice, so please DO NOT
-// USE THEM IN USER CODE.
-
-#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_
-#define GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_
-
-#include <stdio.h>
-#include <ostream>  // NOLINT
-#include <string>
-
-#include "gmock/internal/gmock-generated-internal-utils.h"
-#include "gmock/internal/gmock-port.h"
-#include "gtest/gtest.h"
-
-namespace testing {
-namespace internal {
-
-// Converts an identifier name to a space-separated list of lower-case
-// words.  Each maximum substring of the form [A-Za-z][a-z]*|\d+ is
-// treated as one word.  For example, both "FooBar123" and
-// "foo_bar_123" are converted to "foo bar 123".
-GTEST_API_ string ConvertIdentifierNameToWords(const char* id_name);
-
-// PointeeOf<Pointer>::type is the type of a value pointed to by a
-// Pointer, which can be either a smart pointer or a raw pointer.  The
-// following default implementation is for the case where Pointer is a
-// smart pointer.
-template <typename Pointer>
-struct PointeeOf {
-  // Smart pointer classes define type element_type as the type of
-  // their pointees.
-  typedef typename Pointer::element_type type;
-};
-// This specialization is for the raw pointer case.
-template <typename T>
-struct PointeeOf<T*> { typedef T type; };  // NOLINT
-
-// GetRawPointer(p) returns the raw pointer underlying p when p is a
-// smart pointer, or returns p itself when p is already a raw pointer.
-// The following default implementation is for the smart pointer case.
-template <typename Pointer>
-inline const typename Pointer::element_type* GetRawPointer(const Pointer& p) {
-  return p.get();
-}
-// This overloaded version is for the raw pointer case.
-template <typename Element>
-inline Element* GetRawPointer(Element* p) { return p; }
-
-// This comparator allows linked_ptr to be stored in sets.
-template <typename T>
-struct LinkedPtrLessThan {
-  bool operator()(const ::testing::internal::linked_ptr<T>& lhs,
-                  const ::testing::internal::linked_ptr<T>& rhs) const {
-    return lhs.get() < rhs.get();
-  }
-};
-
-// Symbian compilation can be done with wchar_t being either a native
-// type or a typedef.  Using Google Mock with OpenC without wchar_t
-// should require the definition of _STLP_NO_WCHAR_T.
-//
-// MSVC treats wchar_t as a native type usually, but treats it as the
-// same as unsigned short when the compiler option /Zc:wchar_t- is
-// specified.  It defines _NATIVE_WCHAR_T_DEFINED symbol when wchar_t
-// is a native type.
-#if (GTEST_OS_SYMBIAN && defined(_STLP_NO_WCHAR_T)) || \
-    (defined(_MSC_VER) && !defined(_NATIVE_WCHAR_T_DEFINED))
-// wchar_t is a typedef.
-#else
-# define GMOCK_WCHAR_T_IS_NATIVE_ 1
-#endif
-
-// signed wchar_t and unsigned wchar_t are NOT in the C++ standard.
-// Using them is a bad practice and not portable.  So DON'T use them.
-//
-// Still, Google Mock is designed to work even if the user uses signed
-// wchar_t or unsigned wchar_t (obviously, assuming the compiler
-// supports them).
-//
-// To gcc,
-//   wchar_t == signed wchar_t != unsigned wchar_t == unsigned int
-#ifdef __GNUC__
-// signed/unsigned wchar_t are valid types.
-# define GMOCK_HAS_SIGNED_WCHAR_T_ 1
-#endif
-
-// In what follows, we use the term "kind" to indicate whether a type
-// is bool, an integer type (excluding bool), a floating-point type,
-// or none of them.  This categorization is useful for determining
-// when a matcher argument type can be safely converted to another
-// type in the implementation of SafeMatcherCast.
-enum TypeKind {
-  kBool, kInteger, kFloatingPoint, kOther
-};
-
-// KindOf<T>::value is the kind of type T.
-template <typename T> struct KindOf {
-  enum { value = kOther };  // The default kind.
-};
-
-// This macro declares that the kind of 'type' is 'kind'.
-#define GMOCK_DECLARE_KIND_(type, kind) \
-  template <> struct KindOf<type> { enum { value = kind }; }
-
-GMOCK_DECLARE_KIND_(bool, kBool);
-
-// All standard integer types.
-GMOCK_DECLARE_KIND_(char, kInteger);
-GMOCK_DECLARE_KIND_(signed char, kInteger);
-GMOCK_DECLARE_KIND_(unsigned char, kInteger);
-GMOCK_DECLARE_KIND_(short, kInteger);  // NOLINT
-GMOCK_DECLARE_KIND_(unsigned short, kInteger);  // NOLINT
-GMOCK_DECLARE_KIND_(int, kInteger);
-GMOCK_DECLARE_KIND_(unsigned int, kInteger);
-GMOCK_DECLARE_KIND_(long, kInteger);  // NOLINT
-GMOCK_DECLARE_KIND_(unsigned long, kInteger);  // NOLINT
-
-#if GMOCK_WCHAR_T_IS_NATIVE_
-GMOCK_DECLARE_KIND_(wchar_t, kInteger);
-#endif
-
-// Non-standard integer types.
-GMOCK_DECLARE_KIND_(Int64, kInteger);
-GMOCK_DECLARE_KIND_(UInt64, kInteger);
-
-// All standard floating-point types.
-GMOCK_DECLARE_KIND_(float, kFloatingPoint);
-GMOCK_DECLARE_KIND_(double, kFloatingPoint);
-GMOCK_DECLARE_KIND_(long double, kFloatingPoint);
-
-#undef GMOCK_DECLARE_KIND_
-
-// Evaluates to the kind of 'type'.
-#define GMOCK_KIND_OF_(type) \
-  static_cast< ::testing::internal::TypeKind>( \
-      ::testing::internal::KindOf<type>::value)
-
-// Evaluates to true iff integer type T is signed.
-#define GMOCK_IS_SIGNED_(T) (static_cast<T>(-1) < 0)
-
-// LosslessArithmeticConvertibleImpl<kFromKind, From, kToKind, To>::value
-// is true iff arithmetic type From can be losslessly converted to
-// arithmetic type To.
-//
-// It's the user's responsibility to ensure that both From and To are
-// raw (i.e. has no CV modifier, is not a pointer, and is not a
-// reference) built-in arithmetic types, kFromKind is the kind of
-// From, and kToKind is the kind of To; the value is
-// implementation-defined when the above pre-condition is violated.
-template <TypeKind kFromKind, typename From, TypeKind kToKind, typename To>
-struct LosslessArithmeticConvertibleImpl : public false_type {};
-
-// Converting bool to bool is lossless.
-template <>
-struct LosslessArithmeticConvertibleImpl<kBool, bool, kBool, bool>
-    : public true_type {};  // NOLINT
-
-// Converting bool to any integer type is lossless.
-template <typename To>
-struct LosslessArithmeticConvertibleImpl<kBool, bool, kInteger, To>
-    : public true_type {};  // NOLINT
-
-// Converting bool to any floating-point type is lossless.
-template <typename To>
-struct LosslessArithmeticConvertibleImpl<kBool, bool, kFloatingPoint, To>
-    : public true_type {};  // NOLINT
-
-// Converting an integer to bool is lossy.
-template <typename From>
-struct LosslessArithmeticConvertibleImpl<kInteger, From, kBool, bool>
-    : public false_type {};  // NOLINT
-
-// Converting an integer to another non-bool integer is lossless iff
-// the target type's range encloses the source type's range.
-template <typename From, typename To>
-struct LosslessArithmeticConvertibleImpl<kInteger, From, kInteger, To>
-    : public bool_constant<
-      // When converting from a smaller size to a larger size, we are
-      // fine as long as we are not converting from signed to unsigned.
-      ((sizeof(From) < sizeof(To)) &&
-       (!GMOCK_IS_SIGNED_(From) || GMOCK_IS_SIGNED_(To))) ||
-      // When converting between the same size, the signedness must match.
-      ((sizeof(From) == sizeof(To)) &&
-       (GMOCK_IS_SIGNED_(From) == GMOCK_IS_SIGNED_(To)))> {};  // NOLINT
-
-#undef GMOCK_IS_SIGNED_
-
-// Converting an integer to a floating-point type may be lossy, since
-// the format of a floating-point number is implementation-defined.
-template <typename From, typename To>
-struct LosslessArithmeticConvertibleImpl<kInteger, From, kFloatingPoint, To>
-    : public false_type {};  // NOLINT
-
-// Converting a floating-point to bool is lossy.
-template <typename From>
-struct LosslessArithmeticConvertibleImpl<kFloatingPoint, From, kBool, bool>
-    : public false_type {};  // NOLINT
-
-// Converting a floating-point to an integer is lossy.
-template <typename From, typename To>
-struct LosslessArithmeticConvertibleImpl<kFloatingPoint, From, kInteger, To>
-    : public false_type {};  // NOLINT
-
-// Converting a floating-point to another floating-point is lossless
-// iff the target type is at least as big as the source type.
-template <typename From, typename To>
-struct LosslessArithmeticConvertibleImpl<
-  kFloatingPoint, From, kFloatingPoint, To>
-    : public bool_constant<sizeof(From) <= sizeof(To)> {};  // NOLINT
-
-// LosslessArithmeticConvertible<From, To>::value is true iff arithmetic
-// type From can be losslessly converted to arithmetic type To.
-//
-// It's the user's responsibility to ensure that both From and To are
-// raw (i.e. has no CV modifier, is not a pointer, and is not a
-// reference) built-in arithmetic types; the value is
-// implementation-defined when the above pre-condition is violated.
-template <typename From, typename To>
-struct LosslessArithmeticConvertible
-    : public LosslessArithmeticConvertibleImpl<
-  GMOCK_KIND_OF_(From), From, GMOCK_KIND_OF_(To), To> {};  // NOLINT
-
-// This interface knows how to report a Google Mock failure (either
-// non-fatal or fatal).
-class FailureReporterInterface {
- public:
-  // The type of a failure (either non-fatal or fatal).
-  enum FailureType {
-    kNonfatal, kFatal
-  };
-
-  virtual ~FailureReporterInterface() {}
-
-  // Reports a failure that occurred at the given source file location.
-  virtual void ReportFailure(FailureType type, const char* file, int line,
-                             const string& message) = 0;
-};
-
-// Returns the failure reporter used by Google Mock.
-GTEST_API_ FailureReporterInterface* GetFailureReporter();
-
-// Asserts that condition is true; aborts the process with the given
-// message if condition is false.  We cannot use LOG(FATAL) or CHECK()
-// as Google Mock might be used to mock the log sink itself.  We
-// inline this function to prevent it from showing up in the stack
-// trace.
-inline void Assert(bool condition, const char* file, int line,
-                   const string& msg) {
-  if (!condition) {
-    GetFailureReporter()->ReportFailure(FailureReporterInterface::kFatal,
-                                        file, line, msg);
-  }
-}
-inline void Assert(bool condition, const char* file, int line) {
-  Assert(condition, file, line, "Assertion failed.");
-}
-
-// Verifies that condition is true; generates a non-fatal failure if
-// condition is false.
-inline void Expect(bool condition, const char* file, int line,
-                   const string& msg) {
-  if (!condition) {
-    GetFailureReporter()->ReportFailure(FailureReporterInterface::kNonfatal,
-                                        file, line, msg);
-  }
-}
-inline void Expect(bool condition, const char* file, int line) {
-  Expect(condition, file, line, "Expectation failed.");
-}
-
-// Severity level of a log.
-enum LogSeverity {
-  kInfo = 0,
-  kWarning = 1
-};
-
-// Valid values for the --gmock_verbose flag.
-
-// All logs (informational and warnings) are printed.
-const char kInfoVerbosity[] = "info";
-// Only warnings are printed.
-const char kWarningVerbosity[] = "warning";
-// No logs are printed.
-const char kErrorVerbosity[] = "error";
-
-// Returns true iff a log with the given severity is visible according
-// to the --gmock_verbose flag.
-GTEST_API_ bool LogIsVisible(LogSeverity severity);
-
-// Prints the given message to stdout iff 'severity' >= the level
-// specified by the --gmock_verbose flag.  If stack_frames_to_skip >=
-// 0, also prints the stack trace excluding the top
-// stack_frames_to_skip frames.  In opt mode, any positive
-// stack_frames_to_skip is treated as 0, since we don't know which
-// function calls will be inlined by the compiler and need to be
-// conservative.
-GTEST_API_ void Log(LogSeverity severity,
-                    const string& message,
-                    int stack_frames_to_skip);
-
-// TODO(wan@google.com): group all type utilities together.
-
-// Type traits.
-
-// is_reference<T>::value is non-zero iff T is a reference type.
-template <typename T> struct is_reference : public false_type {};
-template <typename T> struct is_reference<T&> : public true_type {};
-
-// type_equals<T1, T2>::value is non-zero iff T1 and T2 are the same type.
-template <typename T1, typename T2> struct type_equals : public false_type {};
-template <typename T> struct type_equals<T, T> : public true_type {};
-
-// remove_reference<T>::type removes the reference from type T, if any.
-template <typename T> struct remove_reference { typedef T type; };  // NOLINT
-template <typename T> struct remove_reference<T&> { typedef T type; }; // NOLINT
-
-// DecayArray<T>::type turns an array type U[N] to const U* and preserves
-// other types.  Useful for saving a copy of a function argument.
-template <typename T> struct DecayArray { typedef T type; };  // NOLINT
-template <typename T, size_t N> struct DecayArray<T[N]> {
-  typedef const T* type;
-};
-// Sometimes people use arrays whose size is not available at the use site
-// (e.g. extern const char kNamePrefix[]).  This specialization covers that
-// case.
-template <typename T> struct DecayArray<T[]> {
-  typedef const T* type;
-};
-
-// Disable MSVC warnings for infinite recursion, since in this case the
-// the recursion is unreachable.
-#ifdef _MSC_VER
-# pragma warning(push)
-# pragma warning(disable:4717)
-#endif
-
-// Invalid<T>() is usable as an expression of type T, but will terminate
-// the program with an assertion failure if actually run.  This is useful
-// when a value of type T is needed for compilation, but the statement
-// will not really be executed (or we don't care if the statement
-// crashes).
-template <typename T>
-inline T Invalid() {
-  Assert(false, "", -1, "Internal error: attempt to return invalid value");
-  // This statement is unreachable, and would never terminate even if it
-  // could be reached. It is provided only to placate compiler warnings
-  // about missing return statements.
-  return Invalid<T>();
-}
-
-#ifdef _MSC_VER
-# pragma warning(pop)
-#endif
-
-// Given a raw type (i.e. having no top-level reference or const
-// modifier) RawContainer that's either an STL-style container or a
-// native array, class StlContainerView<RawContainer> has the
-// following members:
-//
-//   - type is a type that provides an STL-style container view to
-//     (i.e. implements the STL container concept for) RawContainer;
-//   - const_reference is a type that provides a reference to a const
-//     RawContainer;
-//   - ConstReference(raw_container) returns a const reference to an STL-style
-//     container view to raw_container, which is a RawContainer.
-//   - Copy(raw_container) returns an STL-style container view of a
-//     copy of raw_container, which is a RawContainer.
-//
-// This generic version is used when RawContainer itself is already an
-// STL-style container.
-template <class RawContainer>
-class StlContainerView {
- public:
-  typedef RawContainer type;
-  typedef const type& const_reference;
-
-  static const_reference ConstReference(const RawContainer& container) {
-    // Ensures that RawContainer is not a const type.
-    testing::StaticAssertTypeEq<RawContainer,
-        GTEST_REMOVE_CONST_(RawContainer)>();
-    return container;
-  }
-  static type Copy(const RawContainer& container) { return container; }
-};
-
-// This specialization is used when RawContainer is a native array type.
-template <typename Element, size_t N>
-class StlContainerView<Element[N]> {
- public:
-  typedef GTEST_REMOVE_CONST_(Element) RawElement;
-  typedef internal::NativeArray<RawElement> type;
-  // NativeArray<T> can represent a native array either by value or by
-  // reference (selected by a constructor argument), so 'const type'
-  // can be used to reference a const native array.  We cannot
-  // 'typedef const type& const_reference' here, as that would mean
-  // ConstReference() has to return a reference to a local variable.
-  typedef const type const_reference;
-
-  static const_reference ConstReference(const Element (&array)[N]) {
-    // Ensures that Element is not a const type.
-    testing::StaticAssertTypeEq<Element, RawElement>();
-#if GTEST_OS_SYMBIAN
-    // The Nokia Symbian compiler confuses itself in template instantiation
-    // for this call without the cast to Element*:
-    // function call '[testing::internal::NativeArray<char *>].NativeArray(
-    //     {lval} const char *[4], long, testing::internal::RelationToSource)'
-    //     does not match
-    // 'testing::internal::NativeArray<char *>::NativeArray(
-    //     char *const *, unsigned int, testing::internal::RelationToSource)'
-    // (instantiating: 'testing::internal::ContainsMatcherImpl
-    //     <const char * (&)[4]>::Matches(const char * (&)[4]) const')
-    // (instantiating: 'testing::internal::StlContainerView<char *[4]>::
-    //     ConstReference(const char * (&)[4])')
-    // (and though the N parameter type is mismatched in the above explicit
-    // conversion of it doesn't help - only the conversion of the array).
-    return type(const_cast<Element*>(&array[0]), N,
-                RelationToSourceReference());
-#else
-    return type(array, N, RelationToSourceReference());
-#endif  // GTEST_OS_SYMBIAN
-  }
-  static type Copy(const Element (&array)[N]) {
-#if GTEST_OS_SYMBIAN
-    return type(const_cast<Element*>(&array[0]), N, RelationToSourceCopy());
-#else
-    return type(array, N, RelationToSourceCopy());
-#endif  // GTEST_OS_SYMBIAN
-  }
-};
-
-// This specialization is used when RawContainer is a native array
-// represented as a (pointer, size) tuple.
-template <typename ElementPointer, typename Size>
-class StlContainerView< ::testing::tuple<ElementPointer, Size> > {
- public:
-  typedef GTEST_REMOVE_CONST_(
-      typename internal::PointeeOf<ElementPointer>::type) RawElement;
-  typedef internal::NativeArray<RawElement> type;
-  typedef const type const_reference;
-
-  static const_reference ConstReference(
-      const ::testing::tuple<ElementPointer, Size>& array) {
-    return type(get<0>(array), get<1>(array), RelationToSourceReference());
-  }
-  static type Copy(const ::testing::tuple<ElementPointer, Size>& array) {
-    return type(get<0>(array), get<1>(array), RelationToSourceCopy());
-  }
-};
-
-// The following specialization prevents the user from instantiating
-// StlContainer with a reference type.
-template <typename T> class StlContainerView<T&>;
-
-// A type transform to remove constness from the first part of a pair.
-// Pairs like that are used as the value_type of associative containers,
-// and this transform produces a similar but assignable pair.
-template <typename T>
-struct RemoveConstFromKey {
-  typedef T type;
-};
-
-// Partially specialized to remove constness from std::pair<const K, V>.
-template <typename K, typename V>
-struct RemoveConstFromKey<std::pair<const K, V> > {
-  typedef std::pair<K, V> type;
-};
-
-// Mapping from booleans to types. Similar to boost::bool_<kValue> and
-// std::integral_constant<bool, kValue>.
-template <bool kValue>
-struct BooleanConstant {};
-
-}  // namespace internal
-}  // namespace testing
-
-#endif  // GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_
-

extern/gmock/include/gmock/internal/gmock-port.h

@@ -1,91 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Author: vadimb@google.com (Vadim Berman)
-//
-// Low-level types and utilities for porting Google Mock to various
-// platforms.  All macros ending with _ and symbols defined in an
-// internal namespace are subject to change without notice.  Code
-// outside Google Mock MUST NOT USE THEM DIRECTLY.  Macros that don't
-// end with _ are part of Google Mock's public API and can be used by
-// code outside Google Mock.
-
-#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_
-#define GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_
-
-#include <assert.h>
-#include <stdlib.h>
-#include <iostream>
-
-// Most of the utilities needed for porting Google Mock are also
-// required for Google Test and are defined in gtest-port.h.
-//
-// Note to maintainers: to reduce code duplication, prefer adding
-// portability utilities to Google Test's gtest-port.h instead of
-// here, as Google Mock depends on Google Test.  Only add a utility
-// here if it's truly specific to Google Mock.
-#include "gtest/internal/gtest-linked_ptr.h"
-#include "gtest/internal/gtest-port.h"
-#include "gmock/internal/custom/gmock-port.h"
-
-// To avoid conditional compilation everywhere, we make it
-// gmock-port.h's responsibility to #include the header implementing
-// tr1/tuple.  gmock-port.h does this via gtest-port.h, which is
-// guaranteed to pull in the tuple header.
-
-// For MS Visual C++, check the compiler version. At least VS 2003 is
-// required to compile Google Mock.
-#if defined(_MSC_VER) && _MSC_VER < 1310
-# error "At least Visual C++ 2003 (7.1) is required to compile Google Mock."
-#endif
-
-// Macro for referencing flags.  This is public as we want the user to
-// use this syntax to reference Google Mock flags.
-#define GMOCK_FLAG(name) FLAGS_gmock_##name
-
-#if !defined(GMOCK_DECLARE_bool_)
-
-// Macros for declaring flags.
-#define GMOCK_DECLARE_bool_(name) extern GTEST_API_ bool GMOCK_FLAG(name)
-#define GMOCK_DECLARE_int32_(name) \
-    extern GTEST_API_ ::testing::internal::Int32 GMOCK_FLAG(name)
-#define GMOCK_DECLARE_string_(name) \
-    extern GTEST_API_ ::std::string GMOCK_FLAG(name)
-
-// Macros for defining flags.
-#define GMOCK_DEFINE_bool_(name, default_val, doc) \
-    GTEST_API_ bool GMOCK_FLAG(name) = (default_val)
-#define GMOCK_DEFINE_int32_(name, default_val, doc) \
-    GTEST_API_ ::testing::internal::Int32 GMOCK_FLAG(name) = (default_val)
-#define GMOCK_DEFINE_string_(name, default_val, doc) \
-    GTEST_API_ ::std::string GMOCK_FLAG(name) = (default_val)
-
-#endif  // !defined(GMOCK_DECLARE_bool_)
-
-#endif  // GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_

extern/gmock/src/gmock-all.cc

@@ -1,47 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Author: wan@google.com (Zhanyong Wan)
-//
-// Google C++ Mocking Framework (Google Mock)
-//
-// This file #includes all Google Mock implementation .cc files.  The
-// purpose is to allow a user to build Google Mock by compiling this
-// file alone.
-
-// This line ensures that gmock.h can be compiled on its own, even
-// when it's fused.
-#include "gmock/gmock.h"
-
-// The following lines pull in the real gmock *.cc files.
-#include "src/gmock-cardinalities.cc"
-#include "src/gmock-internal-utils.cc"
-#include "src/gmock-matchers.cc"
-#include "src/gmock-spec-builders.cc"
-#include "src/gmock.cc"

extern/gmock/src/gmock-cardinalities.cc

@@ -1,156 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Author: wan@google.com (Zhanyong Wan)
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements cardinalities.
-
-#include "gmock/gmock-cardinalities.h"
-
-#include <limits.h>
-#include <ostream>  // NOLINT
-#include <sstream>
-#include <string>
-#include "gmock/internal/gmock-internal-utils.h"
-#include "gtest/gtest.h"
-
-namespace testing {
-
-namespace {
-
-// Implements the Between(m, n) cardinality.
-class BetweenCardinalityImpl : public CardinalityInterface {
- public:
-  BetweenCardinalityImpl(int min, int max)
-      : min_(min >= 0 ? min : 0),
-        max_(max >= min_ ? max : min_) {
-    std::stringstream ss;
-    if (min < 0) {
-      ss << "The invocation lower bound must be >= 0, "
-         << "but is actually " << min << ".";
-      internal::Expect(false, __FILE__, __LINE__, ss.str());
-    } else if (max < 0) {
-      ss << "The invocation upper bound must be >= 0, "
-         << "but is actually " << max << ".";
-      internal::Expect(false, __FILE__, __LINE__, ss.str());
-    } else if (min > max) {
-      ss << "The invocation upper bound (" << max
-         << ") must be >= the invocation lower bound (" << min
-         << ").";
-      internal::Expect(false, __FILE__, __LINE__, ss.str());
-    }
-  }
-
-  // Conservative estimate on the lower/upper bound of the number of
-  // calls allowed.
-  virtual int ConservativeLowerBound() const { return min_; }
-  virtual int ConservativeUpperBound() const { return max_; }
-
-  virtual bool IsSatisfiedByCallCount(int call_count) const {
-    return min_ <= call_count && call_count <= max_;
-  }
-
-  virtual bool IsSaturatedByCallCount(int call_count) const {
-    return call_count >= max_;
-  }
-
-  virtual void DescribeTo(::std::ostream* os) const;
-
- private:
-  const int min_;
-  const int max_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(BetweenCardinalityImpl);
-};
-
-// Formats "n times" in a human-friendly way.
-inline internal::string FormatTimes(int n) {
-  if (n == 1) {
-    return "once";
-  } else if (n == 2) {
-    return "twice";
-  } else {
-    std::stringstream ss;
-    ss << n << " times";
-    return ss.str();
-  }
-}
-
-// Describes the Between(m, n) cardinality in human-friendly text.
-void BetweenCardinalityImpl::DescribeTo(::std::ostream* os) const {
-  if (min_ == 0) {
-    if (max_ == 0) {
-      *os << "never called";
-    } else if (max_ == INT_MAX) {
-      *os << "called any number of times";
-    } else {
-      *os << "called at most " << FormatTimes(max_);
-    }
-  } else if (min_ == max_) {
-    *os << "called " << FormatTimes(min_);
-  } else if (max_ == INT_MAX) {
-    *os << "called at least " << FormatTimes(min_);
-  } else {
-    // 0 < min_ < max_ < INT_MAX
-    *os << "called between " << min_ << " and " << max_ << " times";
-  }
-}
-
-}  // Unnamed namespace
-
-// Describes the given call count to an ostream.
-void Cardinality::DescribeActualCallCountTo(int actual_call_count,
-                                            ::std::ostream* os) {
-  if (actual_call_count > 0) {
-    *os << "called " << FormatTimes(actual_call_count);
-  } else {
-    *os << "never called";
-  }
-}
-
-// Creates a cardinality that allows at least n calls.
-GTEST_API_ Cardinality AtLeast(int n) { return Between(n, INT_MAX); }
-
-// Creates a cardinality that allows at most n calls.
-GTEST_API_ Cardinality AtMost(int n) { return Between(0, n); }
-
-// Creates a cardinality that allows any number of calls.
-GTEST_API_ Cardinality AnyNumber() { return AtLeast(0); }
-
-// Creates a cardinality that allows between min and max calls.
-GTEST_API_ Cardinality Between(int min, int max) {
-  return Cardinality(new BetweenCardinalityImpl(min, max));
-}
-
-// Creates a cardinality that allows exactly n calls.
-GTEST_API_ Cardinality Exactly(int n) { return Between(n, n); }
-
-}  // namespace testing

extern/gmock/src/gmock-internal-utils.cc

@@ -1,174 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Author: wan@google.com (Zhanyong Wan)
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file defines some utilities useful for implementing Google
-// Mock.  They are subject to change without notice, so please DO NOT
-// USE THEM IN USER CODE.
-
-#include "gmock/internal/gmock-internal-utils.h"
-
-#include <ctype.h>
-#include <ostream>  // NOLINT
-#include <string>
-#include "gmock/gmock.h"
-#include "gmock/internal/gmock-port.h"
-#include "gtest/gtest.h"
-
-namespace testing {
-namespace internal {
-
-// Converts an identifier name to a space-separated list of lower-case
-// words.  Each maximum substring of the form [A-Za-z][a-z]*|\d+ is
-// treated as one word.  For example, both "FooBar123" and
-// "foo_bar_123" are converted to "foo bar 123".
-GTEST_API_ string ConvertIdentifierNameToWords(const char* id_name) {
-  string result;
-  char prev_char = '\0';
-  for (const char* p = id_name; *p != '\0'; prev_char = *(p++)) {
-    // We don't care about the current locale as the input is
-    // guaranteed to be a valid C++ identifier name.
-    const bool starts_new_word = IsUpper(*p) ||
-        (!IsAlpha(prev_char) && IsLower(*p)) ||
-        (!IsDigit(prev_char) && IsDigit(*p));
-
-    if (IsAlNum(*p)) {
-      if (starts_new_word && result != "")
-        result += ' ';
-      result += ToLower(*p);
-    }
-  }
-  return result;
-}
-
-// This class reports Google Mock failures as Google Test failures.  A
-// user can define another class in a similar fashion if he intends to
-// use Google Mock with a testing framework other than Google Test.
-class GoogleTestFailureReporter : public FailureReporterInterface {
- public:
-  virtual void ReportFailure(FailureType type, const char* file, int line,
-                             const string& message) {
-    AssertHelper(type == kFatal ?
-                 TestPartResult::kFatalFailure :
-                 TestPartResult::kNonFatalFailure,
-                 file,
-                 line,
-                 message.c_str()) = Message();
-    if (type == kFatal) {
-      posix::Abort();
-    }
-  }
-};
-
-// Returns the global failure reporter.  Will create a
-// GoogleTestFailureReporter and return it the first time called.
-GTEST_API_ FailureReporterInterface* GetFailureReporter() {
-  // Points to the global failure reporter used by Google Mock.  gcc
-  // guarantees that the following use of failure_reporter is
-  // thread-safe.  We may need to add additional synchronization to
-  // protect failure_reporter if we port Google Mock to other
-  // compilers.
-  static FailureReporterInterface* const failure_reporter =
-      new GoogleTestFailureReporter();
-  return failure_reporter;
-}
-
-// Protects global resources (stdout in particular) used by Log().
-static GTEST_DEFINE_STATIC_MUTEX_(g_log_mutex);
-
-// Returns true iff a log with the given severity is visible according
-// to the --gmock_verbose flag.
-GTEST_API_ bool LogIsVisible(LogSeverity severity) {
-  if (GMOCK_FLAG(verbose) == kInfoVerbosity) {
-    // Always show the log if --gmock_verbose=info.
-    return true;
-  } else if (GMOCK_FLAG(verbose) == kErrorVerbosity) {
-    // Always hide it if --gmock_verbose=error.
-    return false;
-  } else {
-    // If --gmock_verbose is neither "info" nor "error", we treat it
-    // as "warning" (its default value).
-    return severity == kWarning;
-  }
-}
-
-// Prints the given message to stdout iff 'severity' >= the level
-// specified by the --gmock_verbose flag.  If stack_frames_to_skip >=
-// 0, also prints the stack trace excluding the top
-// stack_frames_to_skip frames.  In opt mode, any positive
-// stack_frames_to_skip is treated as 0, since we don't know which
-// function calls will be inlined by the compiler and need to be
-// conservative.
-GTEST_API_ void Log(LogSeverity severity,
-                    const string& message,
-                    int stack_frames_to_skip) {
-  if (!LogIsVisible(severity))
-    return;
-
-  // Ensures that logs from different threads don't interleave.
-  MutexLock l(&g_log_mutex);
-
-  // "using ::std::cout;" doesn't work with Symbian's STLport, where cout is a
-  // macro.
-
-  if (severity == kWarning) {
-    // Prints a GMOCK WARNING marker to make the warnings easily searchable.
-    std::cout << "\nGMOCK WARNING:";
-  }
-  // Pre-pends a new-line to message if it doesn't start with one.
-  if (message.empty() || message[0] != '\n') {
-    std::cout << "\n";
-  }
-  std::cout << message;
-  if (stack_frames_to_skip >= 0) {
-#ifdef NDEBUG
-    // In opt mode, we have to be conservative and skip no stack frame.
-    const int actual_to_skip = 0;
-#else
-    // In dbg mode, we can do what the caller tell us to do (plus one
-    // for skipping this function's stack frame).
-    const int actual_to_skip = stack_frames_to_skip + 1;
-#endif  // NDEBUG
-
-    // Appends a new-line to message if it doesn't end with one.
-    if (!message.empty() && *message.rbegin() != '\n') {
-      std::cout << "\n";
-    }
-    std::cout << "Stack trace:\n"
-         << ::testing::internal::GetCurrentOsStackTraceExceptTop(
-             ::testing::UnitTest::GetInstance(), actual_to_skip);
-  }
-  std::cout << ::std::flush;
-}
-
-}  // namespace internal
-}  // namespace testing

extern/gmock/src/gmock-matchers.cc

@@ -1,498 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Author: wan@google.com (Zhanyong Wan)
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements Matcher<const string&>, Matcher<string>, and
-// utilities for defining matchers.
-
-#include "gmock/gmock-matchers.h"
-#include "gmock/gmock-generated-matchers.h"
-
-#include <string.h>
-#include <sstream>
-#include <string>
-
-namespace testing {
-
-// Constructs a matcher that matches a const string& whose value is
-// equal to s.
-Matcher<const internal::string&>::Matcher(const internal::string& s) {
-  *this = Eq(s);
-}
-
-// Constructs a matcher that matches a const string& whose value is
-// equal to s.
-Matcher<const internal::string&>::Matcher(const char* s) {
-  *this = Eq(internal::string(s));
-}
-
-// Constructs a matcher that matches a string whose value is equal to s.
-Matcher<internal::string>::Matcher(const internal::string& s) { *this = Eq(s); }
-
-// Constructs a matcher that matches a string whose value is equal to s.
-Matcher<internal::string>::Matcher(const char* s) {
-  *this = Eq(internal::string(s));
-}
-
-#if GTEST_HAS_STRING_PIECE_
-// Constructs a matcher that matches a const StringPiece& whose value is
-// equal to s.
-Matcher<const StringPiece&>::Matcher(const internal::string& s) {
-  *this = Eq(s);
-}
-
-// Constructs a matcher that matches a const StringPiece& whose value is
-// equal to s.
-Matcher<const StringPiece&>::Matcher(const char* s) {
-  *this = Eq(internal::string(s));
-}
-
-// Constructs a matcher that matches a const StringPiece& whose value is
-// equal to s.
-Matcher<const StringPiece&>::Matcher(StringPiece s) {
-  *this = Eq(s.ToString());
-}
-
-// Constructs a matcher that matches a StringPiece whose value is equal to s.
-Matcher<StringPiece>::Matcher(const internal::string& s) {
-  *this = Eq(s);
-}
-
-// Constructs a matcher that matches a StringPiece whose value is equal to s.
-Matcher<StringPiece>::Matcher(const char* s) {
-  *this = Eq(internal::string(s));
-}
-
-// Constructs a matcher that matches a StringPiece whose value is equal to s.
-Matcher<StringPiece>::Matcher(StringPiece s) {
-  *this = Eq(s.ToString());
-}
-#endif  // GTEST_HAS_STRING_PIECE_
-
-namespace internal {
-
-// Joins a vector of strings as if they are fields of a tuple; returns
-// the joined string.
-GTEST_API_ string JoinAsTuple(const Strings& fields) {
-  switch (fields.size()) {
-    case 0:
-      return "";
-    case 1:
-      return fields[0];
-    default:
-      string result = "(" + fields[0];
-      for (size_t i = 1; i < fields.size(); i++) {
-        result += ", ";
-        result += fields[i];
-      }
-      result += ")";
-      return result;
-  }
-}
-
-// Returns the description for a matcher defined using the MATCHER*()
-// macro where the user-supplied description string is "", if
-// 'negation' is false; otherwise returns the description of the
-// negation of the matcher.  'param_values' contains a list of strings
-// that are the print-out of the matcher's parameters.
-GTEST_API_ string FormatMatcherDescription(bool negation,
-                                           const char* matcher_name,
-                                           const Strings& param_values) {
-  string result = ConvertIdentifierNameToWords(matcher_name);
-  if (param_values.size() >= 1)
-    result += " " + JoinAsTuple(param_values);
-  return negation ? "not (" + result + ")" : result;
-}
-
-// FindMaxBipartiteMatching and its helper class.
-//
-// Uses the well-known Ford-Fulkerson max flow method to find a maximum
-// bipartite matching. Flow is considered to be from left to right.
-// There is an implicit source node that is connected to all of the left
-// nodes, and an implicit sink node that is connected to all of the
-// right nodes. All edges have unit capacity.
-//
-// Neither the flow graph nor the residual flow graph are represented
-// explicitly. Instead, they are implied by the information in 'graph' and
-// a vector<int> called 'left_' whose elements are initialized to the
-// value kUnused. This represents the initial state of the algorithm,
-// where the flow graph is empty, and the residual flow graph has the
-// following edges:
-//   - An edge from source to each left_ node
-//   - An edge from each right_ node to sink
-//   - An edge from each left_ node to each right_ node, if the
-//     corresponding edge exists in 'graph'.
-//
-// When the TryAugment() method adds a flow, it sets left_[l] = r for some
-// nodes l and r. This induces the following changes:
-//   - The edges (source, l), (l, r), and (r, sink) are added to the
-//     flow graph.
-//   - The same three edges are removed from the residual flow graph.
-//   - The reverse edges (l, source), (r, l), and (sink, r) are added
-//     to the residual flow graph, which is a directional graph
-//     representing unused flow capacity.
-//
-// When the method augments a flow (moving left_[l] from some r1 to some
-// other r2), this can be thought of as "undoing" the above steps with
-// respect to r1 and "redoing" them with respect to r2.
-//
-// It bears repeating that the flow graph and residual flow graph are
-// never represented explicitly, but can be derived by looking at the
-// information in 'graph' and in left_.
-//
-// As an optimization, there is a second vector<int> called right_ which
-// does not provide any new information. Instead, it enables more
-// efficient queries about edges entering or leaving the right-side nodes
-// of the flow or residual flow graphs. The following invariants are
-// maintained:
-//
-// left[l] == kUnused or right[left[l]] == l
-// right[r] == kUnused or left[right[r]] == r
-//
-// . [ source ]                                        .
-// .   |||                                             .
-// .   |||                                             .
-// .   ||\--> left[0]=1  ---\    right[0]=-1 ----\     .
-// .   ||                   |                    |     .
-// .   |\---> left[1]=-1    \--> right[1]=0  ---\|     .
-// .   |                                        ||     .
-// .   \----> left[2]=2  ------> right[2]=2  --\||     .
-// .                                           |||     .
-// .         elements           matchers       vvv     .
-// .                                         [ sink ]  .
-//
-// See Also:
-//   [1] Cormen, et al (2001). "Section 26.2: The Ford-Fulkerson method".
-//       "Introduction to Algorithms (Second ed.)", pp. 651-664.
-//   [2] "Ford-Fulkerson algorithm", Wikipedia,
-//       'http://en.wikipedia.org/wiki/Ford%E2%80%93Fulkerson_algorithm'
-class MaxBipartiteMatchState {
- public:
-  explicit MaxBipartiteMatchState(const MatchMatrix& graph)
-      : graph_(&graph),
-        left_(graph_->LhsSize(), kUnused),
-        right_(graph_->RhsSize(), kUnused) {
-  }
-
-  // Returns the edges of a maximal match, each in the form {left, right}.
-  ElementMatcherPairs Compute() {
-    // 'seen' is used for path finding { 0: unseen, 1: seen }.
-    ::std::vector<char> seen;
-    // Searches the residual flow graph for a path from each left node to
-    // the sink in the residual flow graph, and if one is found, add flow
-    // to the graph. It's okay to search through the left nodes once. The
-    // edge from the implicit source node to each previously-visited left
-    // node will have flow if that left node has any path to the sink
-    // whatsoever. Subsequent augmentations can only add flow to the
-    // network, and cannot take away that previous flow unit from the source.
-    // Since the source-to-left edge can only carry one flow unit (or,
-    // each element can be matched to only one matcher), there is no need
-    // to visit the left nodes more than once looking for augmented paths.
-    // The flow is known to be possible or impossible by looking at the
-    // node once.
-    for (size_t ilhs = 0; ilhs < graph_->LhsSize(); ++ilhs) {
-      // Reset the path-marking vector and try to find a path from
-      // source to sink starting at the left_[ilhs] node.
-      GTEST_CHECK_(left_[ilhs] == kUnused)
-          << "ilhs: " << ilhs << ", left_[ilhs]: " << left_[ilhs];
-      // 'seen' initialized to 'graph_->RhsSize()' copies of 0.
-      seen.assign(graph_->RhsSize(), 0);
-      TryAugment(ilhs, &seen);
-    }
-    ElementMatcherPairs result;
-    for (size_t ilhs = 0; ilhs < left_.size(); ++ilhs) {
-      size_t irhs = left_[ilhs];
-      if (irhs == kUnused) continue;
-      result.push_back(ElementMatcherPair(ilhs, irhs));
-    }
-    return result;
-  }
-
- private:
-  static const size_t kUnused = static_cast<size_t>(-1);
-
-  // Perform a depth-first search from left node ilhs to the sink.  If a
-  // path is found, flow is added to the network by linking the left and
-  // right vector elements corresponding each segment of the path.
-  // Returns true if a path to sink was found, which means that a unit of
-  // flow was added to the network. The 'seen' vector elements correspond
-  // to right nodes and are marked to eliminate cycles from the search.
-  //
-  // Left nodes will only be explored at most once because they
-  // are accessible from at most one right node in the residual flow
-  // graph.
-  //
-  // Note that left_[ilhs] is the only element of left_ that TryAugment will
-  // potentially transition from kUnused to another value. Any other
-  // left_ element holding kUnused before TryAugment will be holding it
-  // when TryAugment returns.
-  //
-  bool TryAugment(size_t ilhs, ::std::vector<char>* seen) {
-    for (size_t irhs = 0; irhs < graph_->RhsSize(); ++irhs) {
-      if ((*seen)[irhs])
-        continue;
-      if (!graph_->HasEdge(ilhs, irhs))
-        continue;
-      // There's an available edge from ilhs to irhs.
-      (*seen)[irhs] = 1;
-      // Next a search is performed to determine whether
-      // this edge is a dead end or leads to the sink.
-      //
-      // right_[irhs] == kUnused means that there is residual flow from
-      // right node irhs to the sink, so we can use that to finish this
-      // flow path and return success.
-      //
-      // Otherwise there is residual flow to some ilhs. We push flow
-      // along that path and call ourselves recursively to see if this
-      // ultimately leads to sink.
-      if (right_[irhs] == kUnused || TryAugment(right_[irhs], seen)) {
-        // Add flow from left_[ilhs] to right_[irhs].
-        left_[ilhs] = irhs;
-        right_[irhs] = ilhs;
-        return true;
-      }
-    }
-    return false;
-  }
-
-  const MatchMatrix* graph_;  // not owned
-  // Each element of the left_ vector represents a left hand side node
-  // (i.e. an element) and each element of right_ is a right hand side
-  // node (i.e. a matcher). The values in the left_ vector indicate
-  // outflow from that node to a node on the the right_ side. The values
-  // in the right_ indicate inflow, and specify which left_ node is
-  // feeding that right_ node, if any. For example, left_[3] == 1 means
-  // there's a flow from element #3 to matcher #1. Such a flow would also
-  // be redundantly represented in the right_ vector as right_[1] == 3.
-  // Elements of left_ and right_ are either kUnused or mutually
-  // referent. Mutually referent means that left_[right_[i]] = i and
-  // right_[left_[i]] = i.
-  ::std::vector<size_t> left_;
-  ::std::vector<size_t> right_;
-
-  GTEST_DISALLOW_ASSIGN_(MaxBipartiteMatchState);
-};
-
-const size_t MaxBipartiteMatchState::kUnused;
-
-GTEST_API_ ElementMatcherPairs
-FindMaxBipartiteMatching(const MatchMatrix& g) {
-  return MaxBipartiteMatchState(g).Compute();
-}
-
-static void LogElementMatcherPairVec(const ElementMatcherPairs& pairs,
-                                     ::std::ostream* stream) {
-  typedef ElementMatcherPairs::const_iterator Iter;
-  ::std::ostream& os = *stream;
-  os << "{";
-  const char *sep = "";
-  for (Iter it = pairs.begin(); it != pairs.end(); ++it) {
-    os << sep << "\n  ("
-       << "element #" << it->first << ", "
-       << "matcher #" << it->second << ")";
-    sep = ",";
-  }
-  os << "\n}";
-}
-
-// Tries to find a pairing, and explains the result.
-GTEST_API_ bool FindPairing(const MatchMatrix& matrix,
-                            MatchResultListener* listener) {
-  ElementMatcherPairs matches = FindMaxBipartiteMatching(matrix);
-
-  size_t max_flow = matches.size();
-  bool result = (max_flow == matrix.RhsSize());
-
-  if (!result) {
-    if (listener->IsInterested()) {
-      *listener << "where no permutation of the elements can "
-                   "satisfy all matchers, and the closest match is "
-                << max_flow << " of " << matrix.RhsSize()
-                << " matchers with the pairings:\n";
-      LogElementMatcherPairVec(matches, listener->stream());
-    }
-    return false;
-  }
-
-  if (matches.size() > 1) {
-    if (listener->IsInterested()) {
-      const char *sep = "where:\n";
-      for (size_t mi = 0; mi < matches.size(); ++mi) {
-        *listener << sep << " - element #" << matches[mi].first
-                  << " is matched by matcher #" << matches[mi].second;
-        sep = ",\n";
-      }
-    }
-  }
-  return true;
-}
-
-bool MatchMatrix::NextGraph() {
-  for (size_t ilhs = 0; ilhs < LhsSize(); ++ilhs) {
-    for (size_t irhs = 0; irhs < RhsSize(); ++irhs) {
-      char& b = matched_[SpaceIndex(ilhs, irhs)];
-      if (!b) {
-        b = 1;
-        return true;
-      }
-      b = 0;
-    }
-  }
-  return false;
-}
-
-void MatchMatrix::Randomize() {
-  for (size_t ilhs = 0; ilhs < LhsSize(); ++ilhs) {
-    for (size_t irhs = 0; irhs < RhsSize(); ++irhs) {
-      char& b = matched_[SpaceIndex(ilhs, irhs)];
-      b = static_cast<char>(rand() & 1);  // NOLINT
-    }
-  }
-}
-
-string MatchMatrix::DebugString() const {
-  ::std::stringstream ss;
-  const char *sep = "";
-  for (size_t i = 0; i < LhsSize(); ++i) {
-    ss << sep;
-    for (size_t j = 0; j < RhsSize(); ++j) {
-      ss << HasEdge(i, j);
-    }
-    sep = ";";
-  }
-  return ss.str();
-}
-
-void UnorderedElementsAreMatcherImplBase::DescribeToImpl(
-    ::std::ostream* os) const {
-  if (matcher_describers_.empty()) {
-    *os << "is empty";
-    return;
-  }
-  if (matcher_describers_.size() == 1) {
-    *os << "has " << Elements(1) << " and that element ";
-    matcher_describers_[0]->DescribeTo(os);
-    return;
-  }
-  *os << "has " << Elements(matcher_describers_.size())
-      << " and there exists some permutation of elements such that:\n";
-  const char* sep = "";
-  for (size_t i = 0; i != matcher_describers_.size(); ++i) {
-    *os << sep << " - element #" << i << " ";
-    matcher_describers_[i]->DescribeTo(os);
-    sep = ", and\n";
-  }
-}
-
-void UnorderedElementsAreMatcherImplBase::DescribeNegationToImpl(
-    ::std::ostream* os) const {
-  if (matcher_describers_.empty()) {
-    *os << "isn't empty";
-    return;
-  }
-  if (matcher_describers_.size() == 1) {
-    *os << "doesn't have " << Elements(1)
-        << ", or has " << Elements(1) << " that ";
-    matcher_describers_[0]->DescribeNegationTo(os);
-    return;
-  }
-  *os << "doesn't have " << Elements(matcher_describers_.size())
-      << ", or there exists no permutation of elements such that:\n";
-  const char* sep = "";
-  for (size_t i = 0; i != matcher_describers_.size(); ++i) {
-    *os << sep << " - element #" << i << " ";
-    matcher_describers_[i]->DescribeTo(os);
-    sep = ", and\n";
-  }
-}
-
-// Checks that all matchers match at least one element, and that all
-// elements match at least one matcher. This enables faster matching
-// and better error reporting.
-// Returns false, writing an explanation to 'listener', if and only
-// if the success criteria are not met.
-bool UnorderedElementsAreMatcherImplBase::
-VerifyAllElementsAndMatchersAreMatched(
-    const ::std::vector<string>& element_printouts,
-    const MatchMatrix& matrix,
-    MatchResultListener* listener) const {
-  bool result = true;
-  ::std::vector<char> element_matched(matrix.LhsSize(), 0);
-  ::std::vector<char> matcher_matched(matrix.RhsSize(), 0);
-
-  for (size_t ilhs = 0; ilhs < matrix.LhsSize(); ilhs++) {
-    for (size_t irhs = 0; irhs < matrix.RhsSize(); irhs++) {
-      char matched = matrix.HasEdge(ilhs, irhs);
-      element_matched[ilhs] |= matched;
-      matcher_matched[irhs] |= matched;
-    }
-  }
-
-  {
-    const char* sep =
-        "where the following matchers don't match any elements:\n";
-    for (size_t mi = 0; mi < matcher_matched.size(); ++mi) {
-      if (matcher_matched[mi])
-        continue;
-      result = false;
-      if (listener->IsInterested()) {
-        *listener << sep << "matcher #" << mi << ": ";
-        matcher_describers_[mi]->DescribeTo(listener->stream());
-        sep = ",\n";
-      }
-    }
-  }
-
-  {
-    const char* sep =
-        "where the following elements don't match any matchers:\n";
-    const char* outer_sep = "";
-    if (!result) {
-      outer_sep = "\nand ";
-    }
-    for (size_t ei = 0; ei < element_matched.size(); ++ei) {
-      if (element_matched[ei])
-        continue;
-      result = false;
-      if (listener->IsInterested()) {
-        *listener << outer_sep << sep << "element #" << ei << ": "
-                  << element_printouts[ei];
-        sep = ",\n";
-        outer_sep = "";
-      }
-    }
-  }
-  return result;
-}
-
-}  // namespace internal
-}  // namespace testing

extern/gmock/src/gmock-spec-builders.cc

@@ -1,823 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Author: wan@google.com (Zhanyong Wan)
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements the spec builder syntax (ON_CALL and
-// EXPECT_CALL).
-
-#include "gmock/gmock-spec-builders.h"
-
-#include <stdlib.h>
-#include <iostream>  // NOLINT
-#include <map>
-#include <set>
-#include <string>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-#if GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC
-# include <unistd.h>  // NOLINT
-#endif
-
-namespace testing {
-namespace internal {
-
-// Protects the mock object registry (in class Mock), all function
-// mockers, and all expectations.
-GTEST_API_ GTEST_DEFINE_STATIC_MUTEX_(g_gmock_mutex);
-
-// Logs a message including file and line number information.
-GTEST_API_ void LogWithLocation(testing::internal::LogSeverity severity,
-                                const char* file, int line,
-                                const string& message) {
-  ::std::ostringstream s;
-  s << file << ":" << line << ": " << message << ::std::endl;
-  Log(severity, s.str(), 0);
-}
-
-// Constructs an ExpectationBase object.
-ExpectationBase::ExpectationBase(const char* a_file,
-                                 int a_line,
-                                 const string& a_source_text)
-    : file_(a_file),
-      line_(a_line),
-      source_text_(a_source_text),
-      cardinality_specified_(false),
-      cardinality_(Exactly(1)),
-      call_count_(0),
-      retired_(false),
-      extra_matcher_specified_(false),
-      repeated_action_specified_(false),
-      retires_on_saturation_(false),
-      last_clause_(kNone),
-      action_count_checked_(false) {}
-
-// Destructs an ExpectationBase object.
-ExpectationBase::~ExpectationBase() {}
-
-// Explicitly specifies the cardinality of this expectation.  Used by
-// the subclasses to implement the .Times() clause.
-void ExpectationBase::SpecifyCardinality(const Cardinality& a_cardinality) {
-  cardinality_specified_ = true;
-  cardinality_ = a_cardinality;
-}
-
-// Retires all pre-requisites of this expectation.
-void ExpectationBase::RetireAllPreRequisites()
-    GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-  if (is_retired()) {
-    // We can take this short-cut as we never retire an expectation
-    // until we have retired all its pre-requisites.
-    return;
-  }
-
-  for (ExpectationSet::const_iterator it = immediate_prerequisites_.begin();
-       it != immediate_prerequisites_.end(); ++it) {
-    ExpectationBase* const prerequisite = it->expectation_base().get();
-    if (!prerequisite->is_retired()) {
-      prerequisite->RetireAllPreRequisites();
-      prerequisite->Retire();
-    }
-  }
-}
-
-// Returns true iff all pre-requisites of this expectation have been
-// satisfied.
-bool ExpectationBase::AllPrerequisitesAreSatisfied() const
-    GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-  g_gmock_mutex.AssertHeld();
-  for (ExpectationSet::const_iterator it = immediate_prerequisites_.begin();
-       it != immediate_prerequisites_.end(); ++it) {
-    if (!(it->expectation_base()->IsSatisfied()) ||
-        !(it->expectation_base()->AllPrerequisitesAreSatisfied()))
-      return false;
-  }
-  return true;
-}
-
-// Adds unsatisfied pre-requisites of this expectation to 'result'.
-void ExpectationBase::FindUnsatisfiedPrerequisites(ExpectationSet* result) const
-    GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-  g_gmock_mutex.AssertHeld();
-  for (ExpectationSet::const_iterator it = immediate_prerequisites_.begin();
-       it != immediate_prerequisites_.end(); ++it) {
-    if (it->expectation_base()->IsSatisfied()) {
-      // If *it is satisfied and has a call count of 0, some of its
-      // pre-requisites may not be satisfied yet.
-      if (it->expectation_base()->call_count_ == 0) {
-        it->expectation_base()->FindUnsatisfiedPrerequisites(result);
-      }
-    } else {
-      // Now that we know *it is unsatisfied, we are not so interested
-      // in whether its pre-requisites are satisfied.  Therefore we
-      // don't recursively call FindUnsatisfiedPrerequisites() here.
-      *result += *it;
-    }
-  }
-}
-
-// Describes how many times a function call matching this
-// expectation has occurred.
-void ExpectationBase::DescribeCallCountTo(::std::ostream* os) const
-    GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-  g_gmock_mutex.AssertHeld();
-
-  // Describes how many times the function is expected to be called.
-  *os << "         Expected: to be ";
-  cardinality().DescribeTo(os);
-  *os << "\n           Actual: ";
-  Cardinality::DescribeActualCallCountTo(call_count(), os);
-
-  // Describes the state of the expectation (e.g. is it satisfied?
-  // is it active?).
-  *os << " - " << (IsOverSaturated() ? "over-saturated" :
-                   IsSaturated() ? "saturated" :
-                   IsSatisfied() ? "satisfied" : "unsatisfied")
-      << " and "
-      << (is_retired() ? "retired" : "active");
-}
-
-// Checks the action count (i.e. the number of WillOnce() and
-// WillRepeatedly() clauses) against the cardinality if this hasn't
-// been done before.  Prints a warning if there are too many or too
-// few actions.
-void ExpectationBase::CheckActionCountIfNotDone() const
-    GTEST_LOCK_EXCLUDED_(mutex_) {
-  bool should_check = false;
-  {
-    MutexLock l(&mutex_);
-    if (!action_count_checked_) {
-      action_count_checked_ = true;
-      should_check = true;
-    }
-  }
-
-  if (should_check) {
-    if (!cardinality_specified_) {
-      // The cardinality was inferred - no need to check the action
-      // count against it.
-      return;
-    }
-
-    // The cardinality was explicitly specified.
-    const int action_count = static_cast<int>(untyped_actions_.size());
-    const int upper_bound = cardinality().ConservativeUpperBound();
-    const int lower_bound = cardinality().ConservativeLowerBound();
-    bool too_many;  // True if there are too many actions, or false
-    // if there are too few.
-    if (action_count > upper_bound ||
-        (action_count == upper_bound && repeated_action_specified_)) {
-      too_many = true;
-    } else if (0 < action_count && action_count < lower_bound &&
-               !repeated_action_specified_) {
-      too_many = false;
-    } else {
-      return;
-    }
-
-    ::std::stringstream ss;
-    DescribeLocationTo(&ss);
-    ss << "Too " << (too_many ? "many" : "few")
-       << " actions specified in " << source_text() << "...\n"
-       << "Expected to be ";
-    cardinality().DescribeTo(&ss);
-    ss << ", but has " << (too_many ? "" : "only ")
-       << action_count << " WillOnce()"
-       << (action_count == 1 ? "" : "s");
-    if (repeated_action_specified_) {
-      ss << " and a WillRepeatedly()";
-    }
-    ss << ".";
-    Log(kWarning, ss.str(), -1);  // -1 means "don't print stack trace".
-  }
-}
-
-// Implements the .Times() clause.
-void ExpectationBase::UntypedTimes(const Cardinality& a_cardinality) {
-  if (last_clause_ == kTimes) {
-    ExpectSpecProperty(false,
-                       ".Times() cannot appear "
-                       "more than once in an EXPECT_CALL().");
-  } else {
-    ExpectSpecProperty(last_clause_ < kTimes,
-                       ".Times() cannot appear after "
-                       ".InSequence(), .WillOnce(), .WillRepeatedly(), "
-                       "or .RetiresOnSaturation().");
-  }
-  last_clause_ = kTimes;
-
-  SpecifyCardinality(a_cardinality);
-}
-
-// Points to the implicit sequence introduced by a living InSequence
-// object (if any) in the current thread or NULL.
-GTEST_API_ ThreadLocal<Sequence*> g_gmock_implicit_sequence;
-
-// Reports an uninteresting call (whose description is in msg) in the
-// manner specified by 'reaction'.
-void ReportUninterestingCall(CallReaction reaction, const string& msg) {
-  // Include a stack trace only if --gmock_verbose=info is specified.
-  const int stack_frames_to_skip =
-      GMOCK_FLAG(verbose) == kInfoVerbosity ? 3 : -1;
-  switch (reaction) {
-    case kAllow:
-      Log(kInfo, msg, stack_frames_to_skip);
-      break;
-    case kWarn:
-      Log(kWarning,
-          msg +
-          "\nNOTE: You can safely ignore the above warning unless this "
-          "call should not happen.  Do not suppress it by blindly adding "
-          "an EXPECT_CALL() if you don't mean to enforce the call.  "
-          "See https://github.com/google/googletest/blob/master/googlemock/docs/CookBook.md#"
-          "knowing-when-to-expect for details.\n",
-          stack_frames_to_skip);
-      break;
-    default:  // FAIL
-      Expect(false, NULL, -1, msg);
-  }
-}
-
-UntypedFunctionMockerBase::UntypedFunctionMockerBase()
-    : mock_obj_(NULL), name_("") {}
-
-UntypedFunctionMockerBase::~UntypedFunctionMockerBase() {}
-
-// Sets the mock object this mock method belongs to, and registers
-// this information in the global mock registry.  Will be called
-// whenever an EXPECT_CALL() or ON_CALL() is executed on this mock
-// method.
-void UntypedFunctionMockerBase::RegisterOwner(const void* mock_obj)
-    GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-  {
-    MutexLock l(&g_gmock_mutex);
-    mock_obj_ = mock_obj;
-  }
-  Mock::Register(mock_obj, this);
-}
-
-// Sets the mock object this mock method belongs to, and sets the name
-// of the mock function.  Will be called upon each invocation of this
-// mock function.
-void UntypedFunctionMockerBase::SetOwnerAndName(const void* mock_obj,
-                                                const char* name)
-    GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-  // We protect name_ under g_gmock_mutex in case this mock function
-  // is called from two threads concurrently.
-  MutexLock l(&g_gmock_mutex);
-  mock_obj_ = mock_obj;
-  name_ = name;
-}
-
-// Returns the name of the function being mocked.  Must be called
-// after RegisterOwner() or SetOwnerAndName() has been called.
-const void* UntypedFunctionMockerBase::MockObject() const
-    GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-  const void* mock_obj;
-  {
-    // We protect mock_obj_ under g_gmock_mutex in case this mock
-    // function is called from two threads concurrently.
-    MutexLock l(&g_gmock_mutex);
-    Assert(mock_obj_ != NULL, __FILE__, __LINE__,
-           "MockObject() must not be called before RegisterOwner() or "
-           "SetOwnerAndName() has been called.");
-    mock_obj = mock_obj_;
-  }
-  return mock_obj;
-}
-
-// Returns the name of this mock method.  Must be called after
-// SetOwnerAndName() has been called.
-const char* UntypedFunctionMockerBase::Name() const
-    GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-  const char* name;
-  {
-    // We protect name_ under g_gmock_mutex in case this mock
-    // function is called from two threads concurrently.
-    MutexLock l(&g_gmock_mutex);
-    Assert(name_ != NULL, __FILE__, __LINE__,
-           "Name() must not be called before SetOwnerAndName() has "
-           "been called.");
-    name = name_;
-  }
-  return name;
-}
-
-// Calculates the result of invoking this mock function with the given
-// arguments, prints it, and returns it.  The caller is responsible
-// for deleting the result.
-UntypedActionResultHolderBase*
-UntypedFunctionMockerBase::UntypedInvokeWith(const void* const untyped_args)
-    GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-  if (untyped_expectations_.size() == 0) {
-    // No expectation is set on this mock method - we have an
-    // uninteresting call.
-
-    // We must get Google Mock's reaction on uninteresting calls
-    // made on this mock object BEFORE performing the action,
-    // because the action may DELETE the mock object and make the
-    // following expression meaningless.
-    const CallReaction reaction =
-        Mock::GetReactionOnUninterestingCalls(MockObject());
-
-    // True iff we need to print this call's arguments and return
-    // value.  This definition must be kept in sync with
-    // the behavior of ReportUninterestingCall().
-    const bool need_to_report_uninteresting_call =
-        // If the user allows this uninteresting call, we print it
-        // only when he wants informational messages.
-        reaction == kAllow ? LogIsVisible(kInfo) :
-        // If the user wants this to be a warning, we print it only
-        // when he wants to see warnings.
-        reaction == kWarn ? LogIsVisible(kWarning) :
-        // Otherwise, the user wants this to be an error, and we
-        // should always print detailed information in the error.
-        true;
-
-    if (!need_to_report_uninteresting_call) {
-      // Perform the action without printing the call information.
-      return this->UntypedPerformDefaultAction(untyped_args, "");
-    }
-
-    // Warns about the uninteresting call.
-    ::std::stringstream ss;
-    this->UntypedDescribeUninterestingCall(untyped_args, &ss);
-
-    // Calculates the function result.
-    UntypedActionResultHolderBase* const result =
-        this->UntypedPerformDefaultAction(untyped_args, ss.str());
-
-    // Prints the function result.
-    if (result != NULL)
-      result->PrintAsActionResult(&ss);
-
-    ReportUninterestingCall(reaction, ss.str());
-    return result;
-  }
-
-  bool is_excessive = false;
-  ::std::stringstream ss;
-  ::std::stringstream why;
-  ::std::stringstream loc;
-  const void* untyped_action = NULL;
-
-  // The UntypedFindMatchingExpectation() function acquires and
-  // releases g_gmock_mutex.
-  const ExpectationBase* const untyped_expectation =
-      this->UntypedFindMatchingExpectation(
-          untyped_args, &untyped_action, &is_excessive,
-          &ss, &why);
-  const bool found = untyped_expectation != NULL;
-
-  // True iff we need to print the call's arguments and return value.
-  // This definition must be kept in sync with the uses of Expect()
-  // and Log() in this function.
-  const bool need_to_report_call =
-      !found || is_excessive || LogIsVisible(kInfo);
-  if (!need_to_report_call) {
-    // Perform the action without printing the call information.
-    return
-        untyped_action == NULL ?
-        this->UntypedPerformDefaultAction(untyped_args, "") :
-        this->UntypedPerformAction(untyped_action, untyped_args);
-  }
-
-  ss << "    Function call: " << Name();
-  this->UntypedPrintArgs(untyped_args, &ss);
-
-  // In case the action deletes a piece of the expectation, we
-  // generate the message beforehand.
-  if (found && !is_excessive) {
-    untyped_expectation->DescribeLocationTo(&loc);
-  }
-
-  UntypedActionResultHolderBase* const result =
-      untyped_action == NULL ?
-      this->UntypedPerformDefaultAction(untyped_args, ss.str()) :
-      this->UntypedPerformAction(untyped_action, untyped_args);
-  if (result != NULL)
-    result->PrintAsActionResult(&ss);
-  ss << "\n" << why.str();
-
-  if (!found) {
-    // No expectation matches this call - reports a failure.
-    Expect(false, NULL, -1, ss.str());
-  } else if (is_excessive) {
-    // We had an upper-bound violation and the failure message is in ss.
-    Expect(false, untyped_expectation->file(),
-           untyped_expectation->line(), ss.str());
-  } else {
-    // We had an expected call and the matching expectation is
-    // described in ss.
-    Log(kInfo, loc.str() + ss.str(), 2);
-  }
-
-  return result;
-}
-
-// Returns an Expectation object that references and co-owns exp,
-// which must be an expectation on this mock function.
-Expectation UntypedFunctionMockerBase::GetHandleOf(ExpectationBase* exp) {
-  for (UntypedExpectations::const_iterator it =
-           untyped_expectations_.begin();
-       it != untyped_expectations_.end(); ++it) {
-    if (it->get() == exp) {
-      return Expectation(*it);
-    }
-  }
-
-  Assert(false, __FILE__, __LINE__, "Cannot find expectation.");
-  return Expectation();
-  // The above statement is just to make the code compile, and will
-  // never be executed.
-}
-
-// Verifies that all expectations on this mock function have been
-// satisfied.  Reports one or more Google Test non-fatal failures
-// and returns false if not.
-bool UntypedFunctionMockerBase::VerifyAndClearExpectationsLocked()
-    GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-  g_gmock_mutex.AssertHeld();
-  bool expectations_met = true;
-  for (UntypedExpectations::const_iterator it =
-           untyped_expectations_.begin();
-       it != untyped_expectations_.end(); ++it) {
-    ExpectationBase* const untyped_expectation = it->get();
-    if (untyped_expectation->IsOverSaturated()) {
-      // There was an upper-bound violation.  Since the error was
-      // already reported when it occurred, there is no need to do
-      // anything here.
-      expectations_met = false;
-    } else if (!untyped_expectation->IsSatisfied()) {
-      expectations_met = false;
-      ::std::stringstream ss;
-      ss  << "Actual function call count doesn't match "
-          << untyped_expectation->source_text() << "...\n";
-      // No need to show the source file location of the expectation
-      // in the description, as the Expect() call that follows already
-      // takes care of it.
-      untyped_expectation->MaybeDescribeExtraMatcherTo(&ss);
-      untyped_expectation->DescribeCallCountTo(&ss);
-      Expect(false, untyped_expectation->file(),
-             untyped_expectation->line(), ss.str());
-    }
-  }
-
-  // Deleting our expectations may trigger other mock objects to be deleted, for
-  // example if an action contains a reference counted smart pointer to that
-  // mock object, and that is the last reference. So if we delete our
-  // expectations within the context of the global mutex we may deadlock when
-  // this method is called again. Instead, make a copy of the set of
-  // expectations to delete, clear our set within the mutex, and then clear the
-  // copied set outside of it.
-  UntypedExpectations expectations_to_delete;
-  untyped_expectations_.swap(expectations_to_delete);
-
-  g_gmock_mutex.Unlock();
-  expectations_to_delete.clear();
-  g_gmock_mutex.Lock();
-
-  return expectations_met;
-}
-
-}  // namespace internal
-
-// Class Mock.
-
-namespace {
-
-typedef std::set<internal::UntypedFunctionMockerBase*> FunctionMockers;
-
-// The current state of a mock object.  Such information is needed for
-// detecting leaked mock objects and explicitly verifying a mock's
-// expectations.
-struct MockObjectState {
-  MockObjectState()
-      : first_used_file(NULL), first_used_line(-1), leakable(false) {}
-
-  // Where in the source file an ON_CALL or EXPECT_CALL is first
-  // invoked on this mock object.
-  const char* first_used_file;
-  int first_used_line;
-  ::std::string first_used_test_case;
-  ::std::string first_used_test;
-  bool leakable;  // true iff it's OK to leak the object.
-  FunctionMockers function_mockers;  // All registered methods of the object.
-};
-
-// A global registry holding the state of all mock objects that are
-// alive.  A mock object is added to this registry the first time
-// Mock::AllowLeak(), ON_CALL(), or EXPECT_CALL() is called on it.  It
-// is removed from the registry in the mock object's destructor.
-class MockObjectRegistry {
- public:
-  // Maps a mock object (identified by its address) to its state.
-  typedef std::map<const void*, MockObjectState> StateMap;
-
-  // This destructor will be called when a program exits, after all
-  // tests in it have been run.  By then, there should be no mock
-  // object alive.  Therefore we report any living object as test
-  // failure, unless the user explicitly asked us to ignore it.
-  ~MockObjectRegistry() {
-    // "using ::std::cout;" doesn't work with Symbian's STLport, where cout is
-    // a macro.
-
-    if (!GMOCK_FLAG(catch_leaked_mocks))
-      return;
-
-    int leaked_count = 0;
-    for (StateMap::const_iterator it = states_.begin(); it != states_.end();
-         ++it) {
-      if (it->second.leakable)  // The user said it's fine to leak this object.
-        continue;
-
-      // TODO(wan@google.com): Print the type of the leaked object.
-      // This can help the user identify the leaked object.
-      std::cout << "\n";
-      const MockObjectState& state = it->second;
-      std::cout << internal::FormatFileLocation(state.first_used_file,
-                                                state.first_used_line);
-      std::cout << " ERROR: this mock object";
-      if (state.first_used_test != "") {
-        std::cout << " (used in test " << state.first_used_test_case << "."
-             << state.first_used_test << ")";
-      }
-      std::cout << " should be deleted but never is. Its address is @"
-           << it->first << ".";
-      leaked_count++;
-    }
-    if (leaked_count > 0) {
-      std::cout << "\nERROR: " << leaked_count
-           << " leaked mock " << (leaked_count == 1 ? "object" : "objects")
-           << " found at program exit.\n";
-      std::cout.flush();
-      ::std::cerr.flush();
-      // RUN_ALL_TESTS() has already returned when this destructor is
-      // called.  Therefore we cannot use the normal Google Test
-      // failure reporting mechanism.
-      _exit(1);  // We cannot call exit() as it is not reentrant and
-                 // may already have been called.
-    }
-  }
-
-  StateMap& states() { return states_; }
-
- private:
-  StateMap states_;
-};
-
-// Protected by g_gmock_mutex.
-MockObjectRegistry g_mock_object_registry;
-
-// Maps a mock object to the reaction Google Mock should have when an
-// uninteresting method is called.  Protected by g_gmock_mutex.
-std::map<const void*, internal::CallReaction> g_uninteresting_call_reaction;
-
-// Sets the reaction Google Mock should have when an uninteresting
-// method of the given mock object is called.
-void SetReactionOnUninterestingCalls(const void* mock_obj,
-                                     internal::CallReaction reaction)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  internal::MutexLock l(&internal::g_gmock_mutex);
-  g_uninteresting_call_reaction[mock_obj] = reaction;
-}
-
-}  // namespace
-
-// Tells Google Mock to allow uninteresting calls on the given mock
-// object.
-void Mock::AllowUninterestingCalls(const void* mock_obj)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  SetReactionOnUninterestingCalls(mock_obj, internal::kAllow);
-}
-
-// Tells Google Mock to warn the user about uninteresting calls on the
-// given mock object.
-void Mock::WarnUninterestingCalls(const void* mock_obj)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  SetReactionOnUninterestingCalls(mock_obj, internal::kWarn);
-}
-
-// Tells Google Mock to fail uninteresting calls on the given mock
-// object.
-void Mock::FailUninterestingCalls(const void* mock_obj)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  SetReactionOnUninterestingCalls(mock_obj, internal::kFail);
-}
-
-// Tells Google Mock the given mock object is being destroyed and its
-// entry in the call-reaction table should be removed.
-void Mock::UnregisterCallReaction(const void* mock_obj)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  internal::MutexLock l(&internal::g_gmock_mutex);
-  g_uninteresting_call_reaction.erase(mock_obj);
-}
-
-// Returns the reaction Google Mock will have on uninteresting calls
-// made on the given mock object.
-internal::CallReaction Mock::GetReactionOnUninterestingCalls(
-    const void* mock_obj)
-        GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  internal::MutexLock l(&internal::g_gmock_mutex);
-  return (g_uninteresting_call_reaction.count(mock_obj) == 0) ?
-      internal::kDefault : g_uninteresting_call_reaction[mock_obj];
-}
-
-// Tells Google Mock to ignore mock_obj when checking for leaked mock
-// objects.
-void Mock::AllowLeak(const void* mock_obj)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  internal::MutexLock l(&internal::g_gmock_mutex);
-  g_mock_object_registry.states()[mock_obj].leakable = true;
-}
-
-// Verifies and clears all expectations on the given mock object.  If
-// the expectations aren't satisfied, generates one or more Google
-// Test non-fatal failures and returns false.
-bool Mock::VerifyAndClearExpectations(void* mock_obj)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  internal::MutexLock l(&internal::g_gmock_mutex);
-  return VerifyAndClearExpectationsLocked(mock_obj);
-}
-
-// Verifies all expectations on the given mock object and clears its
-// default actions and expectations.  Returns true iff the
-// verification was successful.
-bool Mock::VerifyAndClear(void* mock_obj)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  internal::MutexLock l(&internal::g_gmock_mutex);
-  ClearDefaultActionsLocked(mock_obj);
-  return VerifyAndClearExpectationsLocked(mock_obj);
-}
-
-// Verifies and clears all expectations on the given mock object.  If
-// the expectations aren't satisfied, generates one or more Google
-// Test non-fatal failures and returns false.
-bool Mock::VerifyAndClearExpectationsLocked(void* mock_obj)
-    GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex) {
-  internal::g_gmock_mutex.AssertHeld();
-  if (g_mock_object_registry.states().count(mock_obj) == 0) {
-    // No EXPECT_CALL() was set on the given mock object.
-    return true;
-  }
-
-  // Verifies and clears the expectations on each mock method in the
-  // given mock object.
-  bool expectations_met = true;
-  FunctionMockers& mockers =
-      g_mock_object_registry.states()[mock_obj].function_mockers;
-  for (FunctionMockers::const_iterator it = mockers.begin();
-       it != mockers.end(); ++it) {
-    if (!(*it)->VerifyAndClearExpectationsLocked()) {
-      expectations_met = false;
-    }
-  }
-
-  // We don't clear the content of mockers, as they may still be
-  // needed by ClearDefaultActionsLocked().
-  return expectations_met;
-}
-
-// Registers a mock object and a mock method it owns.
-void Mock::Register(const void* mock_obj,
-                    internal::UntypedFunctionMockerBase* mocker)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  internal::MutexLock l(&internal::g_gmock_mutex);
-  g_mock_object_registry.states()[mock_obj].function_mockers.insert(mocker);
-}
-
-// Tells Google Mock where in the source code mock_obj is used in an
-// ON_CALL or EXPECT_CALL.  In case mock_obj is leaked, this
-// information helps the user identify which object it is.
-void Mock::RegisterUseByOnCallOrExpectCall(const void* mock_obj,
-                                           const char* file, int line)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  internal::MutexLock l(&internal::g_gmock_mutex);
-  MockObjectState& state = g_mock_object_registry.states()[mock_obj];
-  if (state.first_used_file == NULL) {
-    state.first_used_file = file;
-    state.first_used_line = line;
-    const TestInfo* const test_info =
-        UnitTest::GetInstance()->current_test_info();
-    if (test_info != NULL) {
-      // TODO(wan@google.com): record the test case name when the
-      // ON_CALL or EXPECT_CALL is invoked from SetUpTestCase() or
-      // TearDownTestCase().
-      state.first_used_test_case = test_info->test_case_name();
-      state.first_used_test = test_info->name();
-    }
-  }
-}
-
-// Unregisters a mock method; removes the owning mock object from the
-// registry when the last mock method associated with it has been
-// unregistered.  This is called only in the destructor of
-// FunctionMockerBase.
-void Mock::UnregisterLocked(internal::UntypedFunctionMockerBase* mocker)
-    GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex) {
-  internal::g_gmock_mutex.AssertHeld();
-  for (MockObjectRegistry::StateMap::iterator it =
-           g_mock_object_registry.states().begin();
-       it != g_mock_object_registry.states().end(); ++it) {
-    FunctionMockers& mockers = it->second.function_mockers;
-    if (mockers.erase(mocker) > 0) {
-      // mocker was in mockers and has been just removed.
-      if (mockers.empty()) {
-        g_mock_object_registry.states().erase(it);
-      }
-      return;
-    }
-  }
-}
-
-// Clears all ON_CALL()s set on the given mock object.
-void Mock::ClearDefaultActionsLocked(void* mock_obj)
-    GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex) {
-  internal::g_gmock_mutex.AssertHeld();
-
-  if (g_mock_object_registry.states().count(mock_obj) == 0) {
-    // No ON_CALL() was set on the given mock object.
-    return;
-  }
-
-  // Clears the default actions for each mock method in the given mock
-  // object.
-  FunctionMockers& mockers =
-      g_mock_object_registry.states()[mock_obj].function_mockers;
-  for (FunctionMockers::const_iterator it = mockers.begin();
-       it != mockers.end(); ++it) {
-    (*it)->ClearDefaultActionsLocked();
-  }
-
-  // We don't clear the content of mockers, as they may still be
-  // needed by VerifyAndClearExpectationsLocked().
-}
-
-Expectation::Expectation() {}
-
-Expectation::Expectation(
-    const internal::linked_ptr<internal::ExpectationBase>& an_expectation_base)
-    : expectation_base_(an_expectation_base) {}
-
-Expectation::~Expectation() {}
-
-// Adds an expectation to a sequence.
-void Sequence::AddExpectation(const Expectation& expectation) const {
-  if (*last_expectation_ != expectation) {
-    if (last_expectation_->expectation_base() != NULL) {
-      expectation.expectation_base()->immediate_prerequisites_
-          += *last_expectation_;
-    }
-    *last_expectation_ = expectation;
-  }
-}
-
-// Creates the implicit sequence if there isn't one.
-InSequence::InSequence() {
-  if (internal::g_gmock_implicit_sequence.get() == NULL) {
-    internal::g_gmock_implicit_sequence.set(new Sequence);
-    sequence_created_ = true;
-  } else {
-    sequence_created_ = false;
-  }
-}
-
-// Deletes the implicit sequence if it was created by the constructor
-// of this object.
-InSequence::~InSequence() {
-  if (sequence_created_) {
-    delete internal::g_gmock_implicit_sequence.get();
-    internal::g_gmock_implicit_sequence.set(NULL);
-  }
-}
-
-}  // namespace testing

extern/gmock/src/gmock.cc

@@ -1,183 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Author: wan@google.com (Zhanyong Wan)
-
-#include "gmock/gmock.h"
-#include "gmock/internal/gmock-port.h"
-
-namespace testing {
-
-// TODO(wan@google.com): support using environment variables to
-// control the flag values, like what Google Test does.
-
-GMOCK_DEFINE_bool_(catch_leaked_mocks, true,
-                   "true iff Google Mock should report leaked mock objects "
-                   "as failures.");
-
-GMOCK_DEFINE_string_(verbose, internal::kWarningVerbosity,
-                     "Controls how verbose Google Mock's output is."
-                     "  Valid values:\n"
-                     "  info    - prints all messages.\n"
-                     "  warning - prints warnings and errors.\n"
-                     "  error   - prints errors only.");
-
-namespace internal {
-
-// Parses a string as a command line flag.  The string should have the
-// format "--gmock_flag=value".  When def_optional is true, the
-// "=value" part can be omitted.
-//
-// Returns the value of the flag, or NULL if the parsing failed.
-static const char* ParseGoogleMockFlagValue(const char* str,
-                                            const char* flag,
-                                            bool def_optional) {
-  // str and flag must not be NULL.
-  if (str == NULL || flag == NULL) return NULL;
-
-  // The flag must start with "--gmock_".
-  const std::string flag_str = std::string("--gmock_") + flag;
-  const size_t flag_len = flag_str.length();
-  if (strncmp(str, flag_str.c_str(), flag_len) != 0) return NULL;
-
-  // Skips the flag name.
-  const char* flag_end = str + flag_len;
-
-  // When def_optional is true, it's OK to not have a "=value" part.
-  if (def_optional && (flag_end[0] == '\0')) {
-    return flag_end;
-  }
-
-  // If def_optional is true and there are more characters after the
-  // flag name, or if def_optional is false, there must be a '=' after
-  // the flag name.
-  if (flag_end[0] != '=') return NULL;
-
-  // Returns the string after "=".
-  return flag_end + 1;
-}
-
-// Parses a string for a Google Mock bool flag, in the form of
-// "--gmock_flag=value".
-//
-// On success, stores the value of the flag in *value, and returns
-// true.  On failure, returns false without changing *value.
-static bool ParseGoogleMockBoolFlag(const char* str, const char* flag,
-                                    bool* value) {
-  // Gets the value of the flag as a string.
-  const char* const value_str = ParseGoogleMockFlagValue(str, flag, true);
-
-  // Aborts if the parsing failed.
-  if (value_str == NULL) return false;
-
-  // Converts the string value to a bool.
-  *value = !(*value_str == '0' || *value_str == 'f' || *value_str == 'F');
-  return true;
-}
-
-// Parses a string for a Google Mock string flag, in the form of
-// "--gmock_flag=value".
-//
-// On success, stores the value of the flag in *value, and returns
-// true.  On failure, returns false without changing *value.
-template <typename String>
-static bool ParseGoogleMockStringFlag(const char* str, const char* flag,
-                                      String* value) {
-  // Gets the value of the flag as a string.
-  const char* const value_str = ParseGoogleMockFlagValue(str, flag, false);
-
-  // Aborts if the parsing failed.
-  if (value_str == NULL) return false;
-
-  // Sets *value to the value of the flag.
-  *value = value_str;
-  return true;
-}
-
-// The internal implementation of InitGoogleMock().
-//
-// The type parameter CharType can be instantiated to either char or
-// wchar_t.
-template <typename CharType>
-void InitGoogleMockImpl(int* argc, CharType** argv) {
-  // Makes sure Google Test is initialized.  InitGoogleTest() is
-  // idempotent, so it's fine if the user has already called it.
-  InitGoogleTest(argc, argv);
-  if (*argc <= 0) return;
-
-  for (int i = 1; i != *argc; i++) {
-    const std::string arg_string = StreamableToString(argv[i]);
-    const char* const arg = arg_string.c_str();
-
-    // Do we see a Google Mock flag?
-    if (ParseGoogleMockBoolFlag(arg, "catch_leaked_mocks",
-                                &GMOCK_FLAG(catch_leaked_mocks)) ||
-        ParseGoogleMockStringFlag(arg, "verbose", &GMOCK_FLAG(verbose))) {
-      // Yes.  Shift the remainder of the argv list left by one.  Note
-      // that argv has (*argc + 1) elements, the last one always being
-      // NULL.  The following loop moves the trailing NULL element as
-      // well.
-      for (int j = i; j != *argc; j++) {
-        argv[j] = argv[j + 1];
-      }
-
-      // Decrements the argument count.
-      (*argc)--;
-
-      // We also need to decrement the iterator as we just removed
-      // an element.
-      i--;
-    }
-  }
-}
-
-}  // namespace internal
-
-// Initializes Google Mock.  This must be called before running the
-// tests.  In particular, it parses a command line for the flags that
-// Google Mock recognizes.  Whenever a Google Mock flag is seen, it is
-// removed from argv, and *argc is decremented.
-//
-// No value is returned.  Instead, the Google Mock flag variables are
-// updated.
-//
-// Since Google Test is needed for Google Mock to work, this function
-// also initializes Google Test and parses its flags, if that hasn't
-// been done.
-GTEST_API_ void InitGoogleMock(int* argc, char** argv) {
-  internal::InitGoogleMockImpl(argc, argv);
-}
-
-// This overloaded version can be used in Windows programs compiled in
-// UNICODE mode.
-GTEST_API_ void InitGoogleMock(int* argc, wchar_t** argv) {
-  internal::InitGoogleMockImpl(argc, argv);
-}
-
-}  // namespace testing

extern/gmock/src/gmock_main.cc

@@ -1,54 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Author: wan@google.com (Zhanyong Wan)
-
-#include <iostream>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-// MS C++ compiler/linker has a bug on Windows (not on Windows CE), which
-// causes a link error when _tmain is defined in a static library and UNICODE
-// is enabled. For this reason instead of _tmain, main function is used on
-// Windows. See the following link to track the current status of this bug:
-// http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=394464  // NOLINT
-#if GTEST_OS_WINDOWS_MOBILE
-# include <tchar.h>  // NOLINT
-
-GTEST_API_ int _tmain(int argc, TCHAR** argv) {
-#else
-GTEST_API_ int main(int argc, char** argv) {
-#endif  // GTEST_OS_WINDOWS_MOBILE
-  std::cout << "Running main() from gmock_main.cc\n";
-  // Since Google Mock depends on Google Test, InitGoogleMock() is
-  // also responsible for initializing Google Test.  Therefore there's
-  // no need for calling testing::InitGoogleTest() separately.
-  testing::InitGoogleMock(&argc, argv);
-  return RUN_ALL_TESTS();
-}

extern/gtest/README.blender

@@ -1,7 +1,5 @@
 Project: Google C++ Testing Framework
 URL: https://github.com/google/googletest
 License: New BSD
-Upstream version: 1.7.0 (ec44c6c)
-Local modifications:
-
-None.
+Upstream version: 1.7.0
+Local modifications:None

extern/gtest/include/gtest/gtest-param-test.h

@@ -1387,17 +1387,14 @@ internal::CartesianProductHolder10<Generator1, Generator2, Generator3,
     static int AddToRegistry() { \
       ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \
           GetTestCasePatternHolder<test_case_name>(\
-              #test_case_name, \
-              ::testing::internal::CodeLocation(\
-                  __FILE__, __LINE__))->AddTestPattern(\
-                      #test_case_name, \
-                      #test_name, \
-                      new ::testing::internal::TestMetaFactory< \
-                          GTEST_TEST_CLASS_NAME_(\
-                              test_case_name, test_name)>()); \
+              #test_case_name, __FILE__, __LINE__)->AddTestPattern(\
+                  #test_case_name, \
+                  #test_name, \
+                  new ::testing::internal::TestMetaFactory< \
+                      GTEST_TEST_CLASS_NAME_(test_case_name, test_name)>()); \
       return 0; \
     } \
-    static int gtest_registering_dummy_ GTEST_ATTRIBUTE_UNUSED_; \
+    static int gtest_registering_dummy_; \
     GTEST_DISALLOW_COPY_AND_ASSIGN_(\
         GTEST_TEST_CLASS_NAME_(test_case_name, test_name)); \
   }; \
@@ -1406,36 +1403,16 @@ internal::CartesianProductHolder10<Generator1, Generator2, Generator3,
       GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::AddToRegistry(); \
   void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::TestBody()
 
-// The optional last argument to INSTANTIATE_TEST_CASE_P allows the user
-// to specify a function or functor that generates custom test name suffixes
-// based on the test parameters. The function should accept one argument of
-// type testing::TestParamInfo<class ParamType>, and return std::string.
-//
-// testing::PrintToStringParamName is a builtin test suffix generator that
-// returns the value of testing::PrintToString(GetParam()). It does not work
-// for std::string or C strings.
-//
-// Note: test names must be non-empty, unique, and may only contain ASCII
-// alphanumeric characters or underscore.
-
-# define INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator, ...) \
+# define INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator) \
   ::testing::internal::ParamGenerator<test_case_name::ParamType> \
       gtest_##prefix##test_case_name##_EvalGenerator_() { return generator; } \
-  ::std::string gtest_##prefix##test_case_name##_EvalGenerateName_( \
-      const ::testing::TestParamInfo<test_case_name::ParamType>& info) { \
-    return ::testing::internal::GetParamNameGen<test_case_name::ParamType> \
-        (__VA_ARGS__)(info); \
-  } \
-  int gtest_##prefix##test_case_name##_dummy_ GTEST_ATTRIBUTE_UNUSED_ = \
+  int gtest_##prefix##test_case_name##_dummy_ = \
       ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \
           GetTestCasePatternHolder<test_case_name>(\
-              #test_case_name, \
-              ::testing::internal::CodeLocation(\
-                  __FILE__, __LINE__))->AddTestCaseInstantiation(\
-                      #prefix, \
-                      &gtest_##prefix##test_case_name##_EvalGenerator_, \
-                      &gtest_##prefix##test_case_name##_EvalGenerateName_, \
-                      __FILE__, __LINE__)
+              #test_case_name, __FILE__, __LINE__)->AddTestCaseInstantiation(\
+                  #prefix, \
+                  &gtest_##prefix##test_case_name##_EvalGenerator_, \
+                  __FILE__, __LINE__)
 
 }  // namespace testing
 

extern/gtest/include/gtest/gtest-printers.h

@@ -103,10 +103,6 @@
 #include "gtest/internal/gtest-port.h"
 #include "gtest/internal/gtest-internal.h"
 
-#if defined(GTEST_HAS_STD_TUPLE_) && GTEST_HAS_STD_TUPLE_
-# include <tuple>
-#endif
-
 namespace testing {
 
 // Definitions in the 'internal' and 'internal2' name spaces are
@@ -254,103 +250,6 @@ void DefaultPrintNonContainerTo(const T& value, ::std::ostream* os) {
 namespace testing {
 namespace internal {
 
-// FormatForComparison<ToPrint, OtherOperand>::Format(value) formats a
-// value of type ToPrint that is an operand of a comparison assertion
-// (e.g. ASSERT_EQ).  OtherOperand is the type of the other operand in
-// the comparison, and is used to help determine the best way to
-// format the value.  In particular, when the value is a C string
-// (char pointer) and the other operand is an STL string object, we
-// want to format the C string as a string, since we know it is
-// compared by value with the string object.  If the value is a char
-// pointer but the other operand is not an STL string object, we don't
-// know whether the pointer is supposed to point to a NUL-terminated
-// string, and thus want to print it as a pointer to be safe.
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-
-// The default case.
-template <typename ToPrint, typename OtherOperand>
-class FormatForComparison {
- public:
-  static ::std::string Format(const ToPrint& value) {
-    return ::testing::PrintToString(value);
-  }
-};
-
-// Array.
-template <typename ToPrint, size_t N, typename OtherOperand>
-class FormatForComparison<ToPrint[N], OtherOperand> {
- public:
-  static ::std::string Format(const ToPrint* value) {
-    return FormatForComparison<const ToPrint*, OtherOperand>::Format(value);
-  }
-};
-
-// By default, print C string as pointers to be safe, as we don't know
-// whether they actually point to a NUL-terminated string.
-
-#define GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(CharType)                \
-  template <typename OtherOperand>                                      \
-  class FormatForComparison<CharType*, OtherOperand> {                  \
-   public:                                                              \
-    static ::std::string Format(CharType* value) {                      \
-      return ::testing::PrintToString(static_cast<const void*>(value)); \
-    }                                                                   \
-  }
-
-GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(char);
-GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const char);
-GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(wchar_t);
-GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const wchar_t);
-
-#undef GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_
-
-// If a C string is compared with an STL string object, we know it's meant
-// to point to a NUL-terminated string, and thus can print it as a string.
-
-#define GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(CharType, OtherStringType) \
-  template <>                                                           \
-  class FormatForComparison<CharType*, OtherStringType> {               \
-   public:                                                              \
-    static ::std::string Format(CharType* value) {                      \
-      return ::testing::PrintToString(value);                           \
-    }                                                                   \
-  }
-
-GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char, ::std::string);
-GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char, ::std::string);
-
-#if GTEST_HAS_GLOBAL_STRING
-GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char, ::string);
-GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char, ::string);
-#endif
-
-#if GTEST_HAS_GLOBAL_WSTRING
-GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(wchar_t, ::wstring);
-GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const wchar_t, ::wstring);
-#endif
-
-#if GTEST_HAS_STD_WSTRING
-GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(wchar_t, ::std::wstring);
-GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const wchar_t, ::std::wstring);
-#endif
-
-#undef GTEST_IMPL_FORMAT_C_STRING_AS_STRING_
-
-// Formats a comparison assertion (e.g. ASSERT_EQ, EXPECT_LT, and etc)
-// operand to be used in a failure message.  The type (but not value)
-// of the other operand may affect the format.  This allows us to
-// print a char* as a raw pointer when it is compared against another
-// char* or void*, and print it as a C string when it is compared
-// against an std::string object, for example.
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-template <typename T1, typename T2>
-std::string FormatForComparisonFailureMessage(
-    const T1& value, const T2& /* other_operand */) {
-  return FormatForComparison<T1, T2>::Format(value);
-}
-
 // UniversalPrinter<T>::Print(value, ostream_ptr) prints the given
 // value to the given ostream.  The caller must ensure that
 // 'ostream_ptr' is not NULL, or the behavior is undefined.
@@ -581,16 +480,14 @@ inline void PrintTo(const ::std::wstring& s, ::std::ostream* os) {
 }
 #endif  // GTEST_HAS_STD_WSTRING
 
-#if GTEST_HAS_TR1_TUPLE || (defined(GTEST_HAS_STD_TUPLE_) && GTEST_HAS_STD_TUPLE_)
+#if GTEST_HAS_TR1_TUPLE
+// Overload for ::std::tr1::tuple.  Needed for printing function arguments,
+// which are packed as tuples.
+
 // Helper function for printing a tuple.  T must be instantiated with
 // a tuple type.
 template <typename T>
 void PrintTupleTo(const T& t, ::std::ostream* os);
-#endif  // GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_
-
-#if GTEST_HAS_TR1_TUPLE
-// Overload for ::std::tr1::tuple.  Needed for printing function arguments,
-// which are packed as tuples.
 
 // Overloaded PrintTo() for tuples of various arities.  We support
 // tuples of up-to 10 fields.  The following implementation works
@@ -664,13 +561,6 @@ void PrintTo(
 }
 #endif  // GTEST_HAS_TR1_TUPLE
 
-#if defined(GTEST_HAS_STD_TUPLE_) && GTEST_HAS_STD_TUPLE_
-template <typename... Types>
-void PrintTo(const ::std::tuple<Types...>& t, ::std::ostream* os) {
-  PrintTupleTo(t, os);
-}
-#endif  // GTEST_HAS_STD_TUPLE_
-
 // Overload for std::pair.
 template <typename T1, typename T2>
 void PrintTo(const ::std::pair<T1, T2>& value, ::std::ostream* os) {
@@ -690,7 +580,10 @@ class UniversalPrinter {
  public:
   // MSVC warns about adding const to a function type, so we want to
   // disable the warning.
-  GTEST_DISABLE_MSC_WARNINGS_PUSH_(4180)
+#ifdef _MSC_VER
+# pragma warning(push)          // Saves the current warning state.
+# pragma warning(disable:4180)  // Temporarily disables warning 4180.
+#endif  // _MSC_VER
 
   // Note: we deliberately don't call this PrintTo(), as that name
   // conflicts with ::testing::internal::PrintTo in the body of the
@@ -707,7 +600,9 @@ class UniversalPrinter {
     PrintTo(value, os);
   }
 
-  GTEST_DISABLE_MSC_WARNINGS_POP_()
+#ifdef _MSC_VER
+# pragma warning(pop)           // Restores the warning state.
+#endif  // _MSC_VER
 };
 
 // UniversalPrintArray(begin, len, os) prints an array of 'len'
@@ -759,7 +654,10 @@ class UniversalPrinter<T&> {
  public:
   // MSVC warns about adding const to a function type, so we want to
   // disable the warning.
-  GTEST_DISABLE_MSC_WARNINGS_PUSH_(4180)
+#ifdef _MSC_VER
+# pragma warning(push)          // Saves the current warning state.
+# pragma warning(disable:4180)  // Temporarily disables warning 4180.
+#endif  // _MSC_VER
 
   static void Print(const T& value, ::std::ostream* os) {
     // Prints the address of the value.  We use reinterpret_cast here
@@ -770,7 +668,9 @@ class UniversalPrinter<T&> {
     UniversalPrint(value, os);
   }
 
-  GTEST_DISABLE_MSC_WARNINGS_POP_()
+#ifdef _MSC_VER
+# pragma warning(pop)           // Restores the warning state.
+#endif  // _MSC_VER
 };
 
 // Prints a value tersely: for a reference type, the referenced value
@@ -856,65 +756,16 @@ void UniversalPrint(const T& value, ::std::ostream* os) {
   UniversalPrinter<T1>::Print(value, os);
 }
 
+#if GTEST_HAS_TR1_TUPLE
 typedef ::std::vector<string> Strings;
 
-// TuplePolicy<TupleT> must provide:
-// - tuple_size
-//     size of tuple TupleT.
-// - get<size_t I>(const TupleT& t)
-//     static function extracting element I of tuple TupleT.
-// - tuple_element<size_t I>::type
-//     type of element I of tuple TupleT.
-template <typename TupleT>
-struct TuplePolicy;
-
-#if GTEST_HAS_TR1_TUPLE
-template <typename TupleT>
-struct TuplePolicy {
-  typedef TupleT Tuple;
-  static const size_t tuple_size = ::std::tr1::tuple_size<Tuple>::value;
-
-  template <size_t I>
-  struct tuple_element : ::std::tr1::tuple_element<I, Tuple> {};
-
-  template <size_t I>
-  static typename AddReference<
-      const typename ::std::tr1::tuple_element<I, Tuple>::type>::type get(
-      const Tuple& tuple) {
-    return ::std::tr1::get<I>(tuple);
-  }
-};
-template <typename TupleT>
-const size_t TuplePolicy<TupleT>::tuple_size;
-#endif  // GTEST_HAS_TR1_TUPLE
-
-#if defined(GTEST_HAS_STD_TUPLE_) && GTEST_HAS_STD_TUPLE_
-template <typename... Types>
-struct TuplePolicy< ::std::tuple<Types...> > {
-  typedef ::std::tuple<Types...> Tuple;
-  static const size_t tuple_size = ::std::tuple_size<Tuple>::value;
-
-  template <size_t I>
-  struct tuple_element : ::std::tuple_element<I, Tuple> {};
-
-  template <size_t I>
-  static const typename ::std::tuple_element<I, Tuple>::type& get(
-      const Tuple& tuple) {
-    return ::std::get<I>(tuple);
-  }
-};
-template <typename... Types>
-const size_t TuplePolicy< ::std::tuple<Types...> >::tuple_size;
-#endif  // GTEST_HAS_STD_TUPLE_
-
-#if GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_
 // This helper template allows PrintTo() for tuples and
 // UniversalTersePrintTupleFieldsToStrings() to be defined by
 // induction on the number of tuple fields.  The idea is that
 // TuplePrefixPrinter<N>::PrintPrefixTo(t, os) prints the first N
 // fields in tuple t, and can be defined in terms of
 // TuplePrefixPrinter<N - 1>.
-//
+
 // The inductive case.
 template <size_t N>
 struct TuplePrefixPrinter {
@@ -922,14 +773,9 @@ struct TuplePrefixPrinter {
   template <typename Tuple>
   static void PrintPrefixTo(const Tuple& t, ::std::ostream* os) {
     TuplePrefixPrinter<N - 1>::PrintPrefixTo(t, os);
-    GTEST_INTENTIONAL_CONST_COND_PUSH_()
-    if (N > 1) {
-    GTEST_INTENTIONAL_CONST_COND_POP_()
-      *os << ", ";
-    }
-    UniversalPrinter<
-        typename TuplePolicy<Tuple>::template tuple_element<N - 1>::type>
-        ::Print(TuplePolicy<Tuple>::template get<N - 1>(t), os);
+    *os << ", ";
+    UniversalPrinter<typename ::std::tr1::tuple_element<N - 1, Tuple>::type>
+        ::Print(::std::tr1::get<N - 1>(t), os);
   }
 
   // Tersely prints the first N fields of a tuple to a string vector,
@@ -938,12 +784,12 @@ struct TuplePrefixPrinter {
   static void TersePrintPrefixToStrings(const Tuple& t, Strings* strings) {
     TuplePrefixPrinter<N - 1>::TersePrintPrefixToStrings(t, strings);
     ::std::stringstream ss;
-    UniversalTersePrint(TuplePolicy<Tuple>::template get<N - 1>(t), &ss);
+    UniversalTersePrint(::std::tr1::get<N - 1>(t), &ss);
     strings->push_back(ss.str());
   }
 };
 
-// Base case.
+// Base cases.
 template <>
 struct TuplePrefixPrinter<0> {
   template <typename Tuple>
@@ -952,13 +798,34 @@ struct TuplePrefixPrinter<0> {
   template <typename Tuple>
   static void TersePrintPrefixToStrings(const Tuple&, Strings*) {}
 };
+// We have to specialize the entire TuplePrefixPrinter<> class
+// template here, even though the definition of
+// TersePrintPrefixToStrings() is the same as the generic version, as
+// Embarcadero (formerly CodeGear, formerly Borland) C++ doesn't
+// support specializing a method template of a class template.
+template <>
+struct TuplePrefixPrinter<1> {
+  template <typename Tuple>
+  static void PrintPrefixTo(const Tuple& t, ::std::ostream* os) {
+    UniversalPrinter<typename ::std::tr1::tuple_element<0, Tuple>::type>::
+        Print(::std::tr1::get<0>(t), os);
+  }
 
-// Helper function for printing a tuple.
-// Tuple must be either std::tr1::tuple or std::tuple type.
-template <typename Tuple>
-void PrintTupleTo(const Tuple& t, ::std::ostream* os) {
+  template <typename Tuple>
+  static void TersePrintPrefixToStrings(const Tuple& t, Strings* strings) {
+    ::std::stringstream ss;
+    UniversalTersePrint(::std::tr1::get<0>(t), &ss);
+    strings->push_back(ss.str());
+  }
+};
+
+// Helper function for printing a tuple.  T must be instantiated with
+// a tuple type.
+template <typename T>
+void PrintTupleTo(const T& t, ::std::ostream* os) {
   *os << "(";
-  TuplePrefixPrinter<TuplePolicy<Tuple>::tuple_size>::PrintPrefixTo(t, os);
+  TuplePrefixPrinter< ::std::tr1::tuple_size<T>::value>::
+      PrintPrefixTo(t, os);
   *os << ")";
 }
 
@@ -968,11 +835,11 @@ void PrintTupleTo(const Tuple& t, ::std::ostream* os) {
 template <typename Tuple>
 Strings UniversalTersePrintTupleFieldsToStrings(const Tuple& value) {
   Strings result;
-  TuplePrefixPrinter<TuplePolicy<Tuple>::tuple_size>::
+  TuplePrefixPrinter< ::std::tr1::tuple_size<Tuple>::value>::
       TersePrintPrefixToStrings(value, &result);
   return result;
 }
-#endif  // GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_
+#endif  // GTEST_HAS_TR1_TUPLE
 
 }  // namespace internal
 
@@ -985,9 +852,4 @@ template <typename T>
 
 }  // namespace testing
 
-// Include any custom printer added by the local installation.
-// We must include this header at the end to make sure it can use the
-// declarations from this file.
-#include "gtest/internal/custom/gtest-printers.h"
-
 #endif  // GTEST_INCLUDE_GTEST_GTEST_PRINTERS_H_

extern/gtest/include/gtest/gtest-typed-test.h

@@ -181,8 +181,7 @@ INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, MyTypes);
           ::testing::internal::TemplateSel< \
               GTEST_TEST_CLASS_NAME_(CaseName, TestName)>, \
           GTEST_TYPE_PARAMS_(CaseName)>::Register(\
-              "", ::testing::internal::CodeLocation(__FILE__, __LINE__), \
-              #CaseName, #TestName, 0); \
+              "", #CaseName, #TestName, 0); \
   template <typename gtest_TypeParam_> \
   void GTEST_TEST_CLASS_NAME_(CaseName, TestName)<gtest_TypeParam_>::TestBody()
 
@@ -253,10 +252,7 @@ INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, MyTypes);
       ::testing::internal::TypeParameterizedTestCase<CaseName, \
           GTEST_CASE_NAMESPACE_(CaseName)::gtest_AllTests_, \
           ::testing::internal::TypeList< Types >::type>::Register(\
-              #Prefix, \
-              ::testing::internal::CodeLocation(__FILE__, __LINE__), \
-              &GTEST_TYPED_TEST_CASE_P_STATE_(CaseName), \
-              #CaseName, GTEST_REGISTERED_TEST_NAMES_(CaseName))
+              #Prefix, #CaseName, GTEST_REGISTERED_TEST_NAMES_(CaseName))
 
 #endif  // GTEST_HAS_TYPED_TEST_P
 

extern/gtest/include/gtest/gtest.h

@@ -70,14 +70,14 @@
 // class ::string, which has the same interface as ::std::string, but
 // has a different implementation.
 //
-// You can define GTEST_HAS_GLOBAL_STRING to 1 to indicate that
+// The user can define GTEST_HAS_GLOBAL_STRING to 1 to indicate that
 // ::string is available AND is a distinct type to ::std::string, or
 // define it to 0 to indicate otherwise.
 //
-// If ::std::string and ::string are the same class on your platform
-// due to aliasing, you should define GTEST_HAS_GLOBAL_STRING to 0.
+// If the user's ::std::string and ::string are the same class due to
+// aliasing, he should define GTEST_HAS_GLOBAL_STRING to 0.
 //
-// If you do not define GTEST_HAS_GLOBAL_STRING, it is defined
+// If the user doesn't define GTEST_HAS_GLOBAL_STRING, it is defined
 // heuristically.
 
 namespace testing {
@@ -258,31 +258,8 @@ class GTEST_API_ AssertionResult {
   // Copy constructor.
   // Used in EXPECT_TRUE/FALSE(assertion_result).
   AssertionResult(const AssertionResult& other);
-
-  GTEST_DISABLE_MSC_WARNINGS_PUSH_(4800 /* forcing value to bool */)
-
   // Used in the EXPECT_TRUE/FALSE(bool_expression).
-  //
-  // T must be contextually convertible to bool.
-  //
-  // The second parameter prevents this overload from being considered if
-  // the argument is implicitly convertible to AssertionResult. In that case
-  // we want AssertionResult's copy constructor to be used.
-  template <typename T>
-  explicit AssertionResult(
-      const T& success,
-      typename internal::EnableIf<
-          !internal::ImplicitlyConvertible<T, AssertionResult>::value>::type*
-          /*enabler*/ = NULL)
-      : success_(success) {}
-
-  GTEST_DISABLE_MSC_WARNINGS_POP_()
-
-  // Assignment operator.
-  AssertionResult& operator=(AssertionResult other) {
-    swap(other);
-    return *this;
-  }
+  explicit AssertionResult(bool success) : success_(success) {}
 
   // Returns true iff the assertion succeeded.
   operator bool() const { return success_; }  // NOLINT
@@ -323,9 +300,6 @@ class GTEST_API_ AssertionResult {
     message_->append(a_message.GetString().c_str());
   }
 
-  // Swap the contents of this AssertionResult with other.
-  void swap(AssertionResult& other);
-
   // Stores result of the assertion predicate.
   bool success_;
   // Stores the message describing the condition in case the expectation
@@ -333,6 +307,8 @@ class GTEST_API_ AssertionResult {
   // Referenced via a pointer to avoid taking too much stack frame space
   // with test assertions.
   internal::scoped_ptr< ::std::string> message_;
+
+  GTEST_DISALLOW_ASSIGN_(AssertionResult);
 };
 
 // Makes a successful assertion result.
@@ -359,8 +335,8 @@ GTEST_API_ AssertionResult AssertionFailure(const Message& msg);
 //
 //   class FooTest : public testing::Test {
 //    protected:
-//     void SetUp() override { ... }
-//     void TearDown() override { ... }
+//     virtual void SetUp() { ... }
+//     virtual void TearDown() { ... }
 //     ...
 //   };
 //
@@ -452,19 +428,20 @@ class GTEST_API_ Test {
   // internal method to avoid clashing with names used in user TESTs.
   void DeleteSelf_() { delete this; }
 
-  const internal::scoped_ptr< GTEST_FLAG_SAVER_ > gtest_flag_saver_;
+  // Uses a GTestFlagSaver to save and restore all Google Test flags.
+  const internal::GTestFlagSaver* const gtest_flag_saver_;
 
-  // Often a user misspells SetUp() as Setup() and spends a long time
+  // Often a user mis-spells SetUp() as Setup() and spends a long time
   // wondering why it is never called by Google Test.  The declaration of
   // the following method is solely for catching such an error at
   // compile time:
   //
   //   - The return type is deliberately chosen to be not void, so it
-  //   will be a conflict if void Setup() is declared in the user's
-  //   test fixture.
+  //   will be a conflict if a user declares void Setup() in his test
+  //   fixture.
   //
   //   - This method is private, so it will be another compiler error
-  //   if the method is called from the user's test fixture.
+  //   if a user calls it from his test fixture.
   //
   // DO NOT OVERRIDE THIS FUNCTION.
   //
@@ -669,12 +646,6 @@ class GTEST_API_ TestInfo {
     return NULL;
   }
 
-  // Returns the file name where this test is defined.
-  const char* file() const { return location_.file.c_str(); }
-
-  // Returns the line where this test is defined.
-  int line() const { return location_.line; }
-
   // Returns true if this test should run, that is if the test is not
   // disabled (or it is disabled but the also_run_disabled_tests flag has
   // been specified) and its full name matches the user-specified filter.
@@ -717,7 +688,6 @@ class GTEST_API_ TestInfo {
       const char* name,
       const char* type_param,
       const char* value_param,
-      internal::CodeLocation code_location,
       internal::TypeId fixture_class_id,
       Test::SetUpTestCaseFunc set_up_tc,
       Test::TearDownTestCaseFunc tear_down_tc,
@@ -729,7 +699,6 @@ class GTEST_API_ TestInfo {
            const std::string& name,
            const char* a_type_param,   // NULL if not a type-parameterized test
            const char* a_value_param,  // NULL if not a value-parameterized test
-           internal::CodeLocation a_code_location,
            internal::TypeId fixture_class_id,
            internal::TestFactoryBase* factory);
 
@@ -756,7 +725,6 @@ class GTEST_API_ TestInfo {
   // Text representation of the value parameter, or NULL if this is not a
   // value-parameterized test.
   const internal::scoped_ptr<const ::std::string> value_param_;
-  internal::CodeLocation location_;
   const internal::TypeId fixture_class_id_;   // ID of the test fixture class
   bool should_run_;                 // True iff this test should run
   bool is_disabled_;                // True iff this test is disabled
@@ -956,7 +924,7 @@ class GTEST_API_ TestCase {
 };
 
 // An Environment object is capable of setting up and tearing down an
-// environment.  You should subclass this to define your own
+// environment.  The user should subclass this to define his own
 // environment(s).
 //
 // An Environment object does the set-up and tear-down in virtual
@@ -1368,42 +1336,137 @@ GTEST_API_ void InitGoogleTest(int* argc, wchar_t** argv);
 
 namespace internal {
 
-// Separate the error generating code from the code path to reduce the stack
-// frame size of CmpHelperEQ. This helps reduce the overhead of some sanitizers
-// when calling EXPECT_* in a tight loop.
+// FormatForComparison<ToPrint, OtherOperand>::Format(value) formats a
+// value of type ToPrint that is an operand of a comparison assertion
+// (e.g. ASSERT_EQ).  OtherOperand is the type of the other operand in
+// the comparison, and is used to help determine the best way to
+// format the value.  In particular, when the value is a C string
+// (char pointer) and the other operand is an STL string object, we
+// want to format the C string as a string, since we know it is
+// compared by value with the string object.  If the value is a char
+// pointer but the other operand is not an STL string object, we don't
+// know whether the pointer is supposed to point to a NUL-terminated
+// string, and thus want to print it as a pointer to be safe.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+
+// The default case.
+template <typename ToPrint, typename OtherOperand>
+class FormatForComparison {
+ public:
+  static ::std::string Format(const ToPrint& value) {
+    return ::testing::PrintToString(value);
+  }
+};
+
+// Array.
+template <typename ToPrint, size_t N, typename OtherOperand>
+class FormatForComparison<ToPrint[N], OtherOperand> {
+ public:
+  static ::std::string Format(const ToPrint* value) {
+    return FormatForComparison<const ToPrint*, OtherOperand>::Format(value);
+  }
+};
+
+// By default, print C string as pointers to be safe, as we don't know
+// whether they actually point to a NUL-terminated string.
+
+#define GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(CharType)                \
+  template <typename OtherOperand>                                      \
+  class FormatForComparison<CharType*, OtherOperand> {                  \
+   public:                                                              \
+    static ::std::string Format(CharType* value) {                      \
+      return ::testing::PrintToString(static_cast<const void*>(value)); \
+    }                                                                   \
+  }
+
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(char);
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const char);
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(wchar_t);
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const wchar_t);
+
+#undef GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_
+
+// If a C string is compared with an STL string object, we know it's meant
+// to point to a NUL-terminated string, and thus can print it as a string.
+
+#define GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(CharType, OtherStringType) \
+  template <>                                                           \
+  class FormatForComparison<CharType*, OtherStringType> {               \
+   public:                                                              \
+    static ::std::string Format(CharType* value) {                      \
+      return ::testing::PrintToString(value);                           \
+    }                                                                   \
+  }
+
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char, ::std::string);
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char, ::std::string);
+
+#if GTEST_HAS_GLOBAL_STRING
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char, ::string);
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char, ::string);
+#endif
+
+#if GTEST_HAS_GLOBAL_WSTRING
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(wchar_t, ::wstring);
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const wchar_t, ::wstring);
+#endif
+
+#if GTEST_HAS_STD_WSTRING
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(wchar_t, ::std::wstring);
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const wchar_t, ::std::wstring);
+#endif
+
+#undef GTEST_IMPL_FORMAT_C_STRING_AS_STRING_
+
+// Formats a comparison assertion (e.g. ASSERT_EQ, EXPECT_LT, and etc)
+// operand to be used in a failure message.  The type (but not value)
+// of the other operand may affect the format.  This allows us to
+// print a char* as a raw pointer when it is compared against another
+// char* or void*, and print it as a C string when it is compared
+// against an std::string object, for example.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
 template <typename T1, typename T2>
-AssertionResult CmpHelperEQFailure(const char* lhs_expression,
-                                   const char* rhs_expression,
-                                   const T1& lhs, const T2& rhs) {
-  return EqFailure(lhs_expression,
-                   rhs_expression,
-                   FormatForComparisonFailureMessage(lhs, rhs),
-                   FormatForComparisonFailureMessage(rhs, lhs),
-                   false);
+std::string FormatForComparisonFailureMessage(
+    const T1& value, const T2& /* other_operand */) {
+  return FormatForComparison<T1, T2>::Format(value);
 }
 
 // The helper function for {ASSERT|EXPECT}_EQ.
 template <typename T1, typename T2>
-AssertionResult CmpHelperEQ(const char* lhs_expression,
-                            const char* rhs_expression,
-                            const T1& lhs,
-                            const T2& rhs) {
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4389 /* signed/unsigned mismatch */)
-  if (lhs == rhs) {
+AssertionResult CmpHelperEQ(const char* expected_expression,
+                            const char* actual_expression,
+                            const T1& expected,
+                            const T2& actual) {
+#ifdef _MSC_VER
+# pragma warning(push)          // Saves the current warning state.
+# pragma warning(disable:4389)  // Temporarily disables warning on
+                                // signed/unsigned mismatch.
+#endif
+
+  if (expected == actual) {
     return AssertionSuccess();
   }
-GTEST_DISABLE_MSC_WARNINGS_POP_()
 
-  return CmpHelperEQFailure(lhs_expression, rhs_expression, lhs, rhs);
+#ifdef _MSC_VER
+# pragma warning(pop)          // Restores the warning state.
+#endif
+
+  return EqFailure(expected_expression,
+                   actual_expression,
+                   FormatForComparisonFailureMessage(expected, actual),
+                   FormatForComparisonFailureMessage(actual, expected),
+                   false);
 }
 
 // With this overloaded version, we allow anonymous enums to be used
 // in {ASSERT|EXPECT}_EQ when compiled with gcc 4, as anonymous enums
 // can be implicitly cast to BiggestInt.
-GTEST_API_ AssertionResult CmpHelperEQ(const char* lhs_expression,
-                                       const char* rhs_expression,
-                                       BiggestInt lhs,
-                                       BiggestInt rhs);
+GTEST_API_ AssertionResult CmpHelperEQ(const char* expected_expression,
+                                       const char* actual_expression,
+                                       BiggestInt expected,
+                                       BiggestInt actual);
 
 // The helper class for {ASSERT|EXPECT}_EQ.  The template argument
 // lhs_is_null_literal is true iff the first argument to ASSERT_EQ()
@@ -1414,11 +1477,12 @@ class EqHelper {
  public:
   // This templatized version is for the general case.
   template <typename T1, typename T2>
-  static AssertionResult Compare(const char* lhs_expression,
-                                 const char* rhs_expression,
-                                 const T1& lhs,
-                                 const T2& rhs) {
-    return CmpHelperEQ(lhs_expression, rhs_expression, lhs, rhs);
+  static AssertionResult Compare(const char* expected_expression,
+                                 const char* actual_expression,
+                                 const T1& expected,
+                                 const T2& actual) {
+    return CmpHelperEQ(expected_expression, actual_expression, expected,
+                       actual);
   }
 
   // With this overloaded version, we allow anonymous enums to be used
@@ -1427,11 +1491,12 @@ class EqHelper {
   //
   // Even though its body looks the same as the above version, we
   // cannot merge the two, as it will make anonymous enums unhappy.
-  static AssertionResult Compare(const char* lhs_expression,
-                                 const char* rhs_expression,
-                                 BiggestInt lhs,
-                                 BiggestInt rhs) {
-    return CmpHelperEQ(lhs_expression, rhs_expression, lhs, rhs);
+  static AssertionResult Compare(const char* expected_expression,
+                                 const char* actual_expression,
+                                 BiggestInt expected,
+                                 BiggestInt actual) {
+    return CmpHelperEQ(expected_expression, actual_expression, expected,
+                       actual);
   }
 };
 
@@ -1446,52 +1511,40 @@ class EqHelper<true> {
   // EXPECT_EQ(false, a_bool).
   template <typename T1, typename T2>
   static AssertionResult Compare(
-      const char* lhs_expression,
-      const char* rhs_expression,
-      const T1& lhs,
-      const T2& rhs,
+      const char* expected_expression,
+      const char* actual_expression,
+      const T1& expected,
+      const T2& actual,
       // The following line prevents this overload from being considered if T2
       // is not a pointer type.  We need this because ASSERT_EQ(NULL, my_ptr)
       // expands to Compare("", "", NULL, my_ptr), which requires a conversion
       // to match the Secret* in the other overload, which would otherwise make
       // this template match better.
       typename EnableIf<!is_pointer<T2>::value>::type* = 0) {
-    return CmpHelperEQ(lhs_expression, rhs_expression, lhs, rhs);
+    return CmpHelperEQ(expected_expression, actual_expression, expected,
+                       actual);
   }
 
   // This version will be picked when the second argument to ASSERT_EQ() is a
   // pointer, e.g. ASSERT_EQ(NULL, a_pointer).
   template <typename T>
   static AssertionResult Compare(
-      const char* lhs_expression,
-      const char* rhs_expression,
+      const char* expected_expression,
+      const char* actual_expression,
       // We used to have a second template parameter instead of Secret*.  That
       // template parameter would deduce to 'long', making this a better match
       // than the first overload even without the first overload's EnableIf.
       // Unfortunately, gcc with -Wconversion-null warns when "passing NULL to
       // non-pointer argument" (even a deduced integral argument), so the old
       // implementation caused warnings in user code.
-      Secret* /* lhs (NULL) */,
-      T* rhs) {
-    // We already know that 'lhs' is a null pointer.
-    return CmpHelperEQ(lhs_expression, rhs_expression,
-                       static_cast<T*>(NULL), rhs);
+      Secret* /* expected (NULL) */,
+      T* actual) {
+    // We already know that 'expected' is a null pointer.
+    return CmpHelperEQ(expected_expression, actual_expression,
+                       static_cast<T*>(NULL), actual);
   }
 };
 
-// Separate the error generating code from the code path to reduce the stack
-// frame size of CmpHelperOP. This helps reduce the overhead of some sanitizers
-// when calling EXPECT_OP in a tight loop.
-template <typename T1, typename T2>
-AssertionResult CmpHelperOpFailure(const char* expr1, const char* expr2,
-                                   const T1& val1, const T2& val2,
-                                   const char* op) {
-  return AssertionFailure()
-         << "Expected: (" << expr1 << ") " << op << " (" << expr2
-         << "), actual: " << FormatForComparisonFailureMessage(val1, val2)
-         << " vs " << FormatForComparisonFailureMessage(val2, val1);
-}
-
 // A macro for implementing the helper functions needed to implement
 // ASSERT_?? and EXPECT_??.  It is here just to avoid copy-and-paste
 // of similar code.
@@ -1502,7 +1555,6 @@ AssertionResult CmpHelperOpFailure(const char* expr1, const char* expr2,
 // with gcc 4.
 //
 // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-
 #define GTEST_IMPL_CMP_HELPER_(op_name, op)\
 template <typename T1, typename T2>\
 AssertionResult CmpHelper##op_name(const char* expr1, const char* expr2, \
@@ -1510,7 +1562,10 @@ AssertionResult CmpHelper##op_name(const char* expr1, const char* expr2, \
   if (val1 op val2) {\
     return AssertionSuccess();\
   } else {\
-    return CmpHelperOpFailure(expr1, expr2, val1, val2, #op);\
+    return AssertionFailure() \
+        << "Expected: (" << expr1 << ") " #op " (" << expr2\
+        << "), actual: " << FormatForComparisonFailureMessage(val1, val2)\
+        << " vs " << FormatForComparisonFailureMessage(val2, val1);\
   }\
 }\
 GTEST_API_ AssertionResult CmpHelper##op_name(\
@@ -1534,18 +1589,18 @@ GTEST_IMPL_CMP_HELPER_(GT, >);
 // The helper function for {ASSERT|EXPECT}_STREQ.
 //
 // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-GTEST_API_ AssertionResult CmpHelperSTREQ(const char* s1_expression,
-                                          const char* s2_expression,
-                                          const char* s1,
-                                          const char* s2);
+GTEST_API_ AssertionResult CmpHelperSTREQ(const char* expected_expression,
+                                          const char* actual_expression,
+                                          const char* expected,
+                                          const char* actual);
 
 // The helper function for {ASSERT|EXPECT}_STRCASEEQ.
 //
 // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-GTEST_API_ AssertionResult CmpHelperSTRCASEEQ(const char* s1_expression,
-                                              const char* s2_expression,
-                                              const char* s1,
-                                              const char* s2);
+GTEST_API_ AssertionResult CmpHelperSTRCASEEQ(const char* expected_expression,
+                                              const char* actual_expression,
+                                              const char* expected,
+                                              const char* actual);
 
 // The helper function for {ASSERT|EXPECT}_STRNE.
 //
@@ -1567,10 +1622,10 @@ GTEST_API_ AssertionResult CmpHelperSTRCASENE(const char* s1_expression,
 // Helper function for *_STREQ on wide strings.
 //
 // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-GTEST_API_ AssertionResult CmpHelperSTREQ(const char* s1_expression,
-                                          const char* s2_expression,
-                                          const wchar_t* s1,
-                                          const wchar_t* s2);
+GTEST_API_ AssertionResult CmpHelperSTREQ(const char* expected_expression,
+                                          const char* actual_expression,
+                                          const wchar_t* expected,
+                                          const wchar_t* actual);
 
 // Helper function for *_STRNE on wide strings.
 //
@@ -1628,28 +1683,28 @@ namespace internal {
 //
 // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
 template <typename RawType>
-AssertionResult CmpHelperFloatingPointEQ(const char* lhs_expression,
-                                         const char* rhs_expression,
-                                         RawType lhs_value,
-                                         RawType rhs_value) {
-  const FloatingPoint<RawType> lhs(lhs_value), rhs(rhs_value);
+AssertionResult CmpHelperFloatingPointEQ(const char* expected_expression,
+                                         const char* actual_expression,
+                                         RawType expected,
+                                         RawType actual) {
+  const FloatingPoint<RawType> lhs(expected), rhs(actual);
 
   if (lhs.AlmostEquals(rhs)) {
     return AssertionSuccess();
   }
 
-  ::std::stringstream lhs_ss;
-  lhs_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
-         << lhs_value;
+  ::std::stringstream expected_ss;
+  expected_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
+              << expected;
 
-  ::std::stringstream rhs_ss;
-  rhs_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
-         << rhs_value;
+  ::std::stringstream actual_ss;
+  actual_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
+            << actual;
 
-  return EqFailure(lhs_expression,
-                   rhs_expression,
-                   StringStreamToString(&lhs_ss),
-                   StringStreamToString(&rhs_ss),
+  return EqFailure(expected_expression,
+                   actual_expression,
+                   StringStreamToString(&expected_ss),
+                   StringStreamToString(&actual_ss),
                    false);
 }
 
@@ -1857,13 +1912,13 @@ class TestWithParam : public Test, public WithParamInterface<T> {
 // AssertionResult. For more information on how to use AssertionResult with
 // these macros see comments on that class.
 #define EXPECT_TRUE(condition) \
-  GTEST_TEST_BOOLEAN_((condition), #condition, false, true, \
+  GTEST_TEST_BOOLEAN_(condition, #condition, false, true, \
                       GTEST_NONFATAL_FAILURE_)
 #define EXPECT_FALSE(condition) \
   GTEST_TEST_BOOLEAN_(!(condition), #condition, true, false, \
                       GTEST_NONFATAL_FAILURE_)
 #define ASSERT_TRUE(condition) \
-  GTEST_TEST_BOOLEAN_((condition), #condition, false, true, \
+  GTEST_TEST_BOOLEAN_(condition, #condition, false, true, \
                       GTEST_FATAL_FAILURE_)
 #define ASSERT_FALSE(condition) \
   GTEST_TEST_BOOLEAN_(!(condition), #condition, true, false, \
@@ -1875,12 +1930,12 @@ class TestWithParam : public Test, public WithParamInterface<T> {
 
 // Macros for testing equalities and inequalities.
 //
-//    * {ASSERT|EXPECT}_EQ(v1, v2): Tests that v1 == v2
-//    * {ASSERT|EXPECT}_NE(v1, v2): Tests that v1 != v2
-//    * {ASSERT|EXPECT}_LT(v1, v2): Tests that v1 < v2
-//    * {ASSERT|EXPECT}_LE(v1, v2): Tests that v1 <= v2
-//    * {ASSERT|EXPECT}_GT(v1, v2): Tests that v1 > v2
-//    * {ASSERT|EXPECT}_GE(v1, v2): Tests that v1 >= v2
+//    * {ASSERT|EXPECT}_EQ(expected, actual): Tests that expected == actual
+//    * {ASSERT|EXPECT}_NE(v1, v2):           Tests that v1 != v2
+//    * {ASSERT|EXPECT}_LT(v1, v2):           Tests that v1 < v2
+//    * {ASSERT|EXPECT}_LE(v1, v2):           Tests that v1 <= v2
+//    * {ASSERT|EXPECT}_GT(v1, v2):           Tests that v1 > v2
+//    * {ASSERT|EXPECT}_GE(v1, v2):           Tests that v1 >= v2
 //
 // When they are not, Google Test prints both the tested expressions and
 // their actual values.  The values must be compatible built-in types,
@@ -1902,8 +1957,8 @@ class TestWithParam : public Test, public WithParamInterface<T> {
 //   are related, not how their content is related.  To compare two C
 //   strings by content, use {ASSERT|EXPECT}_STR*().
 //
-//   3. {ASSERT|EXPECT}_EQ(v1, v2) is preferred to
-//   {ASSERT|EXPECT}_TRUE(v1 == v2), as the former tells you
+//   3. {ASSERT|EXPECT}_EQ(expected, actual) is preferred to
+//   {ASSERT|EXPECT}_TRUE(expected == actual), as the former tells you
 //   what the actual value is when it fails, and similarly for the
 //   other comparisons.
 //
@@ -1919,12 +1974,12 @@ class TestWithParam : public Test, public WithParamInterface<T> {
 //   ASSERT_LT(i, array_size);
 //   ASSERT_GT(records.size(), 0) << "There is no record left.";
 
-#define EXPECT_EQ(val1, val2) \
+#define EXPECT_EQ(expected, actual) \
   EXPECT_PRED_FORMAT2(::testing::internal:: \
-                      EqHelper<GTEST_IS_NULL_LITERAL_(val1)>::Compare, \
-                      val1, val2)
-#define EXPECT_NE(val1, val2) \
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperNE, val1, val2)
+                      EqHelper<GTEST_IS_NULL_LITERAL_(expected)>::Compare, \
+                      expected, actual)
+#define EXPECT_NE(expected, actual) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperNE, expected, actual)
 #define EXPECT_LE(val1, val2) \
   EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperLE, val1, val2)
 #define EXPECT_LT(val1, val2) \
@@ -1934,10 +1989,10 @@ class TestWithParam : public Test, public WithParamInterface<T> {
 #define EXPECT_GT(val1, val2) \
   EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperGT, val1, val2)
 
-#define GTEST_ASSERT_EQ(val1, val2) \
+#define GTEST_ASSERT_EQ(expected, actual) \
   ASSERT_PRED_FORMAT2(::testing::internal:: \
-                      EqHelper<GTEST_IS_NULL_LITERAL_(val1)>::Compare, \
-                      val1, val2)
+                      EqHelper<GTEST_IS_NULL_LITERAL_(expected)>::Compare, \
+                      expected, actual)
 #define GTEST_ASSERT_NE(val1, val2) \
   ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperNE, val1, val2)
 #define GTEST_ASSERT_LE(val1, val2) \
@@ -1992,29 +2047,29 @@ class TestWithParam : public Test, public WithParamInterface<T> {
 //
 // These macros evaluate their arguments exactly once.
 
-#define EXPECT_STREQ(s1, s2) \
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTREQ, s1, s2)
+#define EXPECT_STREQ(expected, actual) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTREQ, expected, actual)
 #define EXPECT_STRNE(s1, s2) \
   EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRNE, s1, s2)
-#define EXPECT_STRCASEEQ(s1, s2) \
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASEEQ, s1, s2)
+#define EXPECT_STRCASEEQ(expected, actual) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASEEQ, expected, actual)
 #define EXPECT_STRCASENE(s1, s2)\
   EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASENE, s1, s2)
 
-#define ASSERT_STREQ(s1, s2) \
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTREQ, s1, s2)
+#define ASSERT_STREQ(expected, actual) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTREQ, expected, actual)
 #define ASSERT_STRNE(s1, s2) \
   ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRNE, s1, s2)
-#define ASSERT_STRCASEEQ(s1, s2) \
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASEEQ, s1, s2)
+#define ASSERT_STRCASEEQ(expected, actual) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASEEQ, expected, actual)
 #define ASSERT_STRCASENE(s1, s2)\
   ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASENE, s1, s2)
 
 // Macros for comparing floating-point numbers.
 //
-//    * {ASSERT|EXPECT}_FLOAT_EQ(val1, val2):
+//    * {ASSERT|EXPECT}_FLOAT_EQ(expected, actual):
 //         Tests that two float values are almost equal.
-//    * {ASSERT|EXPECT}_DOUBLE_EQ(val1, val2):
+//    * {ASSERT|EXPECT}_DOUBLE_EQ(expected, actual):
 //         Tests that two double values are almost equal.
 //    * {ASSERT|EXPECT}_NEAR(v1, v2, abs_error):
 //         Tests that v1 and v2 are within the given distance to each other.
@@ -2024,21 +2079,21 @@ class TestWithParam : public Test, public WithParamInterface<T> {
 // FloatingPoint template class in gtest-internal.h if you are
 // interested in the implementation details.
 
-#define EXPECT_FLOAT_EQ(val1, val2)\
+#define EXPECT_FLOAT_EQ(expected, actual)\
   EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<float>, \
-                      val1, val2)
+                      expected, actual)
 
-#define EXPECT_DOUBLE_EQ(val1, val2)\
+#define EXPECT_DOUBLE_EQ(expected, actual)\
   EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<double>, \
-                      val1, val2)
+                      expected, actual)
 
-#define ASSERT_FLOAT_EQ(val1, val2)\
+#define ASSERT_FLOAT_EQ(expected, actual)\
   ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<float>, \
-                      val1, val2)
+                      expected, actual)
 
-#define ASSERT_DOUBLE_EQ(val1, val2)\
+#define ASSERT_DOUBLE_EQ(expected, actual)\
   ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<double>, \
-                      val1, val2)
+                      expected, actual)
 
 #define EXPECT_NEAR(val1, val2, abs_error)\
   EXPECT_PRED_FORMAT3(::testing::internal::DoubleNearPredFormat, \
@@ -2160,8 +2215,8 @@ bool StaticAssertTypeEq() {
 // The convention is to end the test case name with "Test".  For
 // example, a test case for the Foo class can be named FooTest.
 //
-// Test code should appear between braces after an invocation of
-// this macro.  Example:
+// The user should put his test code between braces after using this
+// macro.  Example:
 //
 //   TEST(FooTest, InitializesCorrectly) {
 //     Foo foo;