Version bump for glog and folly to match that of RN 0.58.6 (facebook#50)

Folly/.gitignore

@@ -13,20 +13,21 @@ aclocal.m4
 autom4te.cache
 build-aux
 libtool
-folly/test/gtest-1.*
+folly/test/gtest
 folly/folly-config.h
-folly/test/*_benchmark
-folly/test/*_test
-folly/test/*_test_using_jemalloc
+folly/**/test/*_benchmark
+folly/**/test/*.log
+folly/**/test/*_test
+folly/**/test/*_test_using_jemalloc
+folly/**/test/*.trs
 folly/config.*
 folly/configure
+folly/logging/example/logging_example
+folly/libfolly.pc
 folly/m4/libtool.m4
 folly/m4/ltoptions.m4
 folly/m4/ltsugar.m4
 folly/m4/ltversion.m4
 folly/m4/lt~obsolete.m4
 folly/generate_fingerprint_tables
-folly/FormatTables.cpp
-folly/EscapeTables.cpp
-folly/GroupVarintTables.cpp
 folly/FingerprintTables.cpp

Folly/.travis.yml

@@ -0,0 +1,50 @@
+# Facebook projects that use `fbcode_builder` for continuous integration
+# share this Travis configuration to run builds via Docker.
+
+sudo: required
+
+# Docker disables IPv6 in containers by default. Enable it for unit tests that need [::1].
+before_script:
+  # `daemon.json` is normally missing, but let's log it in case that changes.
+  - sudo touch /etc/docker/daemon.json
+  - sudo cat /etc/docker/daemon.json
+  - sudo service docker stop
+  # This needs YAML quoting because of the curly braces.
+  - 'echo ''{"ipv6": true, "fixed-cidr-v6": "2001:db8:1::/64"}'' | sudo tee /etc/docker/daemon.json'
+  - sudo service docker start
+  # Fail early if docker failed on start -- add `- sudo dockerd` to debug.
+  - sudo docker info
+  # Paranoia log: what if our config got overwritten?
+  - sudo cat /etc/docker/daemon.json
+
+env:
+  global:
+    - travis_cache_dir=$HOME/travis_ccache
+    # Travis times out after 50 minutes. Very generously leave 10 minutes
+    # for setup (e.g.  cache download, compression, and upload), so we never
+    # fail to cache the progress we made.
+    - docker_build_timeout=40m
+
+cache:
+  # Our build caches can be 200-300MB, so increase the timeout to 7 minutes
+  # to make sure we never fail to cache the progress we made.
+  timeout: 420
+  directories:
+  - $HOME/travis_ccache  # see docker_build_with_ccache.sh
+
+# Ugh, `services:` must be in the matrix, or we get `docker: command not found`
+#   https://github.com/travis-ci/travis-ci/issues/5142
+matrix:
+  include:
+    - env: ['os_image=ubuntu:16.04', gcc_version=5]
+      services: [docker]
+
+script:
+  # Travis seems to get confused when `matrix:` is used with `language:`
+  - sudo apt-get install python2.7
+  # We don't want to write the script inline because of Travis kludginess --
+  # it looks like it escapes " and \ in scripts when using `matrix:`.
+  - ./build/fbcode_builder/travis_docker_build.sh
+
+notifications:
+  webhooks: https://code.facebook.com/travis/webhook/

Folly/CMake/FindDoubleConversion.cmake

@@ -0,0 +1,22 @@
+# Finds libdouble-conversion.
+#
+# This module defines:
+# DOUBLE_CONVERSION_INCLUDE_DIR
+# DOUBLE_CONVERSION_LIBRARY
+#
+
+find_path(DOUBLE_CONVERSION_INCLUDE_DIR double-conversion/double-conversion.h)
+find_library(DOUBLE_CONVERSION_LIBRARY NAMES double-conversion)
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(
+    DOUBLE_CONVERSION DEFAULT_MSG
+    DOUBLE_CONVERSION_LIBRARY DOUBLE_CONVERSION_INCLUDE_DIR)
+
+if (NOT DOUBLE_CONVERSION_FOUND)
+  message(STATUS "Using third-party bundled double-conversion")
+else()
+  message(STATUS "Found double-conversion: ${DOUBLE_CONVERSION_LIBRARY}")
+endif (NOT DOUBLE_CONVERSION_FOUND)
+
+mark_as_advanced(DOUBLE_CONVERSION_INCLUDE_DIR DOUBLE_CONVERSION_LIBRARY)

Folly/CMake/FindGFlags.cmake

@@ -0,0 +1,27 @@
+#
+# Find libgflags
+#
+#  LIBGFLAGS_INCLUDE_DIR - where to find gflags/gflags.h, etc.
+#  LIBGFLAGS_LIBRARY     - List of libraries when using libgflags.
+#  LIBGFLAGS_FOUND       - True if libgflags found.
+
+
+IF (LIBGFLAGS_INCLUDE_DIR)
+  # Already in cache, be silent
+  SET(LIBGFLAGS_FIND_QUIETLY TRUE)
+ENDIF ()
+
+FIND_PATH(LIBGFLAGS_INCLUDE_DIR gflags/gflags.h)
+
+FIND_LIBRARY(LIBGFLAGS_LIBRARY_DEBUG NAMES gflagsd gflags_staticd)
+FIND_LIBRARY(LIBGFLAGS_LIBRARY_RELEASE NAMES gflags gflags_static)
+
+INCLUDE(SelectLibraryConfigurations)
+SELECT_LIBRARY_CONFIGURATIONS(LIBGFLAGS)
+
+# handle the QUIETLY and REQUIRED arguments and set LIBGFLAGS_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBGFLAGS DEFAULT_MSG LIBGFLAGS_LIBRARY LIBGFLAGS_INCLUDE_DIR)
+
+MARK_AS_ADVANCED(LIBGFLAGS_LIBRARY LIBGFLAGS_INCLUDE_DIR)

Folly/CMake/FindGLog.cmake

@@ -0,0 +1,23 @@
+#
+# Find libglog
+#
+#  LIBGLOG_INCLUDE_DIR - where to find glog/logging.h, etc.
+#  LIBGLOG_LIBRARY     - List of libraries when using libglog.
+#  LIBGLOG_FOUND       - True if libglog found.
+
+
+IF (LIBGLOG_INCLUDE_DIR)
+  # Already in cache, be silent
+  SET(LIBGLOG_FIND_QUIETLY TRUE)
+ENDIF ()
+
+FIND_PATH(LIBGLOG_INCLUDE_DIR glog/logging.h)
+
+FIND_LIBRARY(LIBGLOG_LIBRARY glog)
+
+# handle the QUIETLY and REQUIRED arguments and set LIBGLOG_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBGLOG DEFAULT_MSG LIBGLOG_LIBRARY LIBGLOG_INCLUDE_DIR)
+
+MARK_AS_ADVANCED(LIBGLOG_LIBRARY LIBGLOG_INCLUDE_DIR)

Folly/CMake/FindGMock.cmake

@@ -0,0 +1,65 @@
+#
+# Find libgmock
+#
+#  LIBGMOCK_DEFINES     - List of defines when using libgmock.
+#  LIBGMOCK_INCLUDE_DIR - where to find gmock/gmock.h, etc.
+#  LIBGMOCK_LIBRARIES   - List of libraries when using libgmock.
+#  LIBGMOCK_FOUND       - True if libgmock found.
+
+IF (LIBGMOCK_INCLUDE_DIR)
+  # Already in cache, be silent
+  SET(LIBGMOCK_FIND_QUIETLY TRUE)
+ENDIF ()
+
+FIND_PATH(LIBGMOCK_INCLUDE_DIR gmock/gmock.h)
+
+FIND_LIBRARY(LIBGMOCK_MAIN_LIBRARY_DEBUG NAMES gmock_maind)
+FIND_LIBRARY(LIBGMOCK_MAIN_LIBRARY_RELEASE NAMES gmock_main)
+FIND_LIBRARY(LIBGMOCK_LIBRARY_DEBUG NAMES gmockd)
+FIND_LIBRARY(LIBGMOCK_LIBRARY_RELEASE NAMES gmock)
+FIND_LIBRARY(LIBGTEST_LIBRARY_DEBUG NAMES gtestd)
+FIND_LIBRARY(LIBGTEST_LIBRARY_RELEASE NAMES gtest)
+
+find_package(Threads REQUIRED)
+INCLUDE(SelectLibraryConfigurations)
+SELECT_LIBRARY_CONFIGURATIONS(LIBGMOCK_MAIN)
+SELECT_LIBRARY_CONFIGURATIONS(LIBGMOCK)
+SELECT_LIBRARY_CONFIGURATIONS(LIBGTEST)
+
+set(LIBGMOCK_LIBRARIES
+  ${LIBGMOCK_MAIN_LIBRARY}
+  ${LIBGMOCK_LIBRARY}
+  ${LIBGTEST_LIBRARY}
+  Threads::Threads
+)
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  # The GTEST_LINKED_AS_SHARED_LIBRARY macro must be set properly on Windows.
+  #
+  # There isn't currently an easy way to determine if a library was compiled as
+  # a shared library on Windows, so just assume we've been built against a
+  # shared build of gmock for now.
+  SET(LIBGMOCK_DEFINES "GTEST_LINKED_AS_SHARED_LIBRARY=1" CACHE STRING "")
+endif()
+
+# handle the QUIETLY and REQUIRED arguments and set LIBGMOCK_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(
+  GMock
+  DEFAULT_MSG
+  LIBGMOCK_MAIN_LIBRARY
+  LIBGMOCK_LIBRARY
+  LIBGTEST_LIBRARY
+  LIBGMOCK_LIBRARIES
+  LIBGMOCK_INCLUDE_DIR
+)
+
+MARK_AS_ADVANCED(
+  LIBGMOCK_DEFINES
+  LIBGMOCK_MAIN_LIBRARY
+  LIBGMOCK_LIBRARY
+  LIBGTEST_LIBRARY
+  LIBGMOCK_LIBRARIES
+  LIBGMOCK_INCLUDE_DIR
+)

Folly/CMake/FindLZ4.cmake

@@ -0,0 +1,27 @@
+# Finds liblz4.
+#
+# This module defines:
+# LZ4_FOUND
+# LZ4_INCLUDE_DIR
+# LZ4_LIBRARY
+#
+
+find_path(LZ4_INCLUDE_DIR NAMES lz4.h)
+
+find_library(LZ4_LIBRARY_DEBUG NAMES lz4d)
+find_library(LZ4_LIBRARY_RELEASE NAMES lz4)
+
+include(SelectLibraryConfigurations)
+SELECT_LIBRARY_CONFIGURATIONS(LZ4)
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(
+    LZ4 DEFAULT_MSG
+    LZ4_LIBRARY LZ4_INCLUDE_DIR
+)
+
+if (LZ4_FOUND)
+    message(STATUS "Found LZ4: ${LZ4_LIBRARY}")
+endif()
+
+mark_as_advanced(LZ4_INCLUDE_DIR LZ4_LIBRARY)

Folly/CMake/FindLibAIO.cmake

@@ -0,0 +1,15 @@
+find_path(LIBAIO_INCLUDE_DIR NAMES libaio.h)
+mark_as_advanced(LIBAIO_INCLUDE_DIR)
+
+find_library(LIBAIO_LIBRARY NAMES aio)
+mark_as_advanced(LIBAIO_LIBRARY)
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(
+  LIBAIO
+  REQUIRED_VARS LIBAIO_LIBRARY LIBAIO_INCLUDE_DIR)
+
+if(LIBAIO_FOUND)
+  set(LIBAIO_LIBRARIES ${LIBAIO_LIBRARY})
+  set(LIBAIO_INCLUDE_DIRS ${LIBAIO_INCLUDE_DIR})
+endif()

Folly/CMake/FindLibDwarf.cmake

@@ -0,0 +1,18 @@
+# dwarf.h is typically installed in a libdwarf/ subdirectory on Debian-style
+# Linux distributions.  It is not installed in a libdwarf/ subdirectory on Mac
+# systems when installed with Homebrew.  Search for it in both locations.
+find_path(LIBDWARF_INCLUDE_DIR NAMES dwarf.h PATH_SUFFIXES libdwarf)
+mark_as_advanced(LIBDWARF_INCLUDE_DIR)
+
+find_library(LIBDWARF_LIBRARY NAMES dwarf)
+mark_as_advanced(LIBDWARF_LIBRARY)
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(
+  LIBDWARF
+  REQUIRED_VARS LIBDWARF_LIBRARY LIBDWARF_INCLUDE_DIR)
+
+if(LIBDWARF_FOUND)
+  set(LIBDWARF_LIBRARIES ${LIBDWARF_LIBRARY})
+  set(LIBDWARF_INCLUDE_DIRS ${LIBDWARF_INCLUDE_DIR})
+endif()

Folly/CMake/FindLibEvent.cmake

@@ -0,0 +1,37 @@
+# - Find LibEvent (a cross event library)
+# This module defines
+# LIBEVENT_INCLUDE_DIR, where to find LibEvent headers
+# LIBEVENT_LIB, LibEvent libraries
+# LibEvent_FOUND, If false, do not try to use libevent
+
+set(LibEvent_EXTRA_PREFIXES /usr/local /opt/local "$ENV{HOME}")
+foreach(prefix ${LibEvent_EXTRA_PREFIXES})
+  list(APPEND LibEvent_INCLUDE_PATHS "${prefix}/include")
+  list(APPEND LibEvent_LIB_PATHS "${prefix}/lib")
+endforeach()
+
+find_path(LIBEVENT_INCLUDE_DIR event.h PATHS ${LibEvent_INCLUDE_PATHS})
+find_library(LIBEVENT_LIB NAMES event PATHS ${LibEvent_LIB_PATHS})
+
+if (LIBEVENT_LIB AND LIBEVENT_INCLUDE_DIR)
+  set(LibEvent_FOUND TRUE)
+  set(LIBEVENT_LIB ${LIBEVENT_LIB})
+else ()
+  set(LibEvent_FOUND FALSE)
+endif ()
+
+if (LibEvent_FOUND)
+  if (NOT LibEvent_FIND_QUIETLY)
+    message(STATUS "Found libevent: ${LIBEVENT_LIB}")
+  endif ()
+else ()
+  if (LibEvent_FIND_REQUIRED)
+    message(FATAL_ERROR "Could NOT find libevent.")
+  endif ()
+  message(STATUS "libevent NOT found.")
+endif ()
+
+mark_as_advanced(
+    LIBEVENT_LIB
+    LIBEVENT_INCLUDE_DIR
+  )

Folly/CMake/FindLibiberty.cmake

@@ -0,0 +1,15 @@
+find_path(LIBIBERTY_INCLUDE_DIR NAMES libiberty.h PATH_SUFFIXES libiberty)
+mark_as_advanced(LIBIBERTY_INCLUDE_DIR)
+
+find_library(LIBIBERTY_LIBRARY NAMES iberty)
+mark_as_advanced(LIBIBERTY_LIBRARY)
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(
+  LIBIBERTY
+  REQUIRED_VARS LIBIBERTY_LIBRARY LIBIBERTY_INCLUDE_DIR)
+
+if(LIBIBERTY_FOUND)
+  set(LIBIBERTY_LIBRARIES ${LIBIBERTY_LIBRARY})
+  set(LIBIBERTY_INCLUDE_DIRS ${LIBIBERTY_INCLUDE_DIR})
+endif()

Folly/CMake/FindSnappy.cmake

@@ -0,0 +1,22 @@
+# Find the Snappy libraries
+#
+# This module defines:
+# SNAPPY_FOUND
+# SNAPPY_INCLUDE_DIR
+# SNAPPY_LIBRARY
+
+find_path(SNAPPY_INCLUDE_DIR NAMES snappy.h)
+
+find_library(SNAPPY_LIBRARY_DEBUG NAMES snappyd)
+find_library(SNAPPY_LIBRARY_RELEASE NAMES snappy)
+
+include(SelectLibraryConfigurations)
+SELECT_LIBRARY_CONFIGURATIONS(SNAPPY)
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(
+    SNAPPY DEFAULT_MSG
+    SNAPPY_LIBRARY SNAPPY_INCLUDE_DIR
+)
+
+mark_as_advanced(SNAPPY_INCLUDE_DIR SNAPPY_LIBRARY)

Folly/CMake/FindZstd.cmake

@@ -0,0 +1,27 @@
+#
+# - Try to find Facebook zstd library
+# This will define
+# ZSTD_FOUND
+# ZSTD_INCLUDE_DIR
+# ZSTD_LIBRARY
+#
+
+find_path(ZSTD_INCLUDE_DIR NAMES zstd.h)
+
+find_library(ZSTD_LIBRARY_DEBUG NAMES zstdd)
+find_library(ZSTD_LIBRARY_RELEASE NAMES zstd)
+
+include(SelectLibraryConfigurations)
+SELECT_LIBRARY_CONFIGURATIONS(ZSTD)
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(
+    ZSTD DEFAULT_MSG
+    ZSTD_LIBRARY ZSTD_INCLUDE_DIR
+)
+
+if (ZSTD_FOUND)
+    message(STATUS "Found Zstd: ${ZSTD_LIBRARY}")
+endif()
+
+mark_as_advanced(ZSTD_INCLUDE_DIR ZSTD_LIBRARY)