Skip to content

Commit 708af8b

Browse files
rohitjain85acoates-ms
rohitjain85
authored and
acoates-ms
committed
Version bump for glog and folly to match that of RN 0.58.6 (facebook#50)
1 parent eb5ca7d commit 708af8b

File tree

1,560 files changed

+194785
-50661
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,560 files changed

+194785
-50661
lines changed

‎Folly/.gitignore‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,21 @@ aclocal.m4
1313
autom4te.cache
1414
build-aux
1515
libtool
16-
folly/test/gtest-1.*
16+
folly/test/gtest
1717
folly/folly-config.h
18-
folly/test/*_benchmark
19-
folly/test/*_test
20-
folly/test/*_test_using_jemalloc
18+
folly/**/test/*_benchmark
19+
folly/**/test/*.log
20+
folly/**/test/*_test
21+
folly/**/test/*_test_using_jemalloc
22+
folly/**/test/*.trs
2123
folly/config.*
2224
folly/configure
25+
folly/logging/example/logging_example
26+
folly/libfolly.pc
2327
folly/m4/libtool.m4
2428
folly/m4/ltoptions.m4
2529
folly/m4/ltsugar.m4
2630
folly/m4/ltversion.m4
2731
folly/m4/lt~obsolete.m4
2832
folly/generate_fingerprint_tables
29-
folly/FormatTables.cpp
30-
folly/EscapeTables.cpp
31-
folly/GroupVarintTables.cpp
3233
folly/FingerprintTables.cpp

‎Folly/.travis.yml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# Facebook projects that use `fbcode_builder` for continuous integration
2+
# share this Travis configuration to run builds via Docker.
3+
4+
sudo: required
5+
6+
# Docker disables IPv6 in containers by default. Enable it for unit tests that need [::1].
7+
before_script:
8+
# `daemon.json` is normally missing, but let's log it in case that changes.
9+
- sudo touch /etc/docker/daemon.json
10+
- sudo cat /etc/docker/daemon.json
11+
- sudo service docker stop
12+
# This needs YAML quoting because of the curly braces.
13+
- 'echo ''{"ipv6": true, "fixed-cidr-v6": "2001:db8:1::/64"}'' | sudo tee /etc/docker/daemon.json'
14+
- sudo service docker start
15+
# Fail early if docker failed on start -- add `- sudo dockerd` to debug.
16+
- sudo docker info
17+
# Paranoia log: what if our config got overwritten?
18+
- sudo cat /etc/docker/daemon.json
19+
20+
env:
21+
global:
22+
- travis_cache_dir=$HOME/travis_ccache
23+
# Travis times out after 50 minutes. Very generously leave 10 minutes
24+
# for setup (e.g. cache download, compression, and upload), so we never
25+
# fail to cache the progress we made.
26+
- docker_build_timeout=40m
27+
28+
cache:
29+
# Our build caches can be 200-300MB, so increase the timeout to 7 minutes
30+
# to make sure we never fail to cache the progress we made.
31+
timeout: 420
32+
directories:
33+
- $HOME/travis_ccache # see docker_build_with_ccache.sh
34+
35+
# Ugh, `services:` must be in the matrix, or we get `docker: command not found`
36+
# https://github.com/travis-ci/travis-ci/issues/5142
37+
matrix:
38+
include:
39+
- env: ['os_image=ubuntu:16.04', gcc_version=5]
40+
services: [docker]
41+
42+
script:
43+
# Travis seems to get confused when `matrix:` is used with `language:`
44+
- sudo apt-get install python2.7
45+
# We don't want to write the script inline because of Travis kludginess --
46+
# it looks like it escapes " and \ in scripts when using `matrix:`.
47+
- ./build/fbcode_builder/travis_docker_build.sh
48+
49+
notifications:
50+
webhooks: https://code.facebook.com/travis/webhook/

‎Folly/CMake/FindDoubleConversion.cmake‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Finds libdouble-conversion.
2+
#
3+
# This module defines:
4+
# DOUBLE_CONVERSION_INCLUDE_DIR
5+
# DOUBLE_CONVERSION_LIBRARY
6+
#
7+
8+
find_path(DOUBLE_CONVERSION_INCLUDE_DIR double-conversion/double-conversion.h)
9+
find_library(DOUBLE_CONVERSION_LIBRARY NAMES double-conversion)
10+
11+
include(FindPackageHandleStandardArgs)
12+
FIND_PACKAGE_HANDLE_STANDARD_ARGS(
13+
DOUBLE_CONVERSION DEFAULT_MSG
14+
DOUBLE_CONVERSION_LIBRARY DOUBLE_CONVERSION_INCLUDE_DIR)
15+
16+
if (NOT DOUBLE_CONVERSION_FOUND)
17+
message(STATUS "Using third-party bundled double-conversion")
18+
else()
19+
message(STATUS "Found double-conversion: ${DOUBLE_CONVERSION_LIBRARY}")
20+
endif (NOT DOUBLE_CONVERSION_FOUND)
21+
22+
mark_as_advanced(DOUBLE_CONVERSION_INCLUDE_DIR DOUBLE_CONVERSION_LIBRARY)

‎Folly/CMake/FindGFlags.cmake‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#
2+
# Find libgflags
3+
#
4+
# LIBGFLAGS_INCLUDE_DIR - where to find gflags/gflags.h, etc.
5+
# LIBGFLAGS_LIBRARY - List of libraries when using libgflags.
6+
# LIBGFLAGS_FOUND - True if libgflags found.
7+
8+
9+
IF (LIBGFLAGS_INCLUDE_DIR)
10+
# Already in cache, be silent
11+
SET(LIBGFLAGS_FIND_QUIETLY TRUE)
12+
ENDIF ()
13+
14+
FIND_PATH(LIBGFLAGS_INCLUDE_DIR gflags/gflags.h)
15+
16+
FIND_LIBRARY(LIBGFLAGS_LIBRARY_DEBUG NAMES gflagsd gflags_staticd)
17+
FIND_LIBRARY(LIBGFLAGS_LIBRARY_RELEASE NAMES gflags gflags_static)
18+
19+
INCLUDE(SelectLibraryConfigurations)
20+
SELECT_LIBRARY_CONFIGURATIONS(LIBGFLAGS)
21+
22+
# handle the QUIETLY and REQUIRED arguments and set LIBGFLAGS_FOUND to TRUE if
23+
# all listed variables are TRUE
24+
INCLUDE(FindPackageHandleStandardArgs)
25+
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBGFLAGS DEFAULT_MSG LIBGFLAGS_LIBRARY LIBGFLAGS_INCLUDE_DIR)
26+
27+
MARK_AS_ADVANCED(LIBGFLAGS_LIBRARY LIBGFLAGS_INCLUDE_DIR)

‎Folly/CMake/FindGLog.cmake‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#
2+
# Find libglog
3+
#
4+
# LIBGLOG_INCLUDE_DIR - where to find glog/logging.h, etc.
5+
# LIBGLOG_LIBRARY - List of libraries when using libglog.
6+
# LIBGLOG_FOUND - True if libglog found.
7+
8+
9+
IF (LIBGLOG_INCLUDE_DIR)
10+
# Already in cache, be silent
11+
SET(LIBGLOG_FIND_QUIETLY TRUE)
12+
ENDIF ()
13+
14+
FIND_PATH(LIBGLOG_INCLUDE_DIR glog/logging.h)
15+
16+
FIND_LIBRARY(LIBGLOG_LIBRARY glog)
17+
18+
# handle the QUIETLY and REQUIRED arguments and set LIBGLOG_FOUND to TRUE if
19+
# all listed variables are TRUE
20+
INCLUDE(FindPackageHandleStandardArgs)
21+
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBGLOG DEFAULT_MSG LIBGLOG_LIBRARY LIBGLOG_INCLUDE_DIR)
22+
23+
MARK_AS_ADVANCED(LIBGLOG_LIBRARY LIBGLOG_INCLUDE_DIR)

‎Folly/CMake/FindGMock.cmake‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
#
2+
# Find libgmock
3+
#
4+
# LIBGMOCK_DEFINES - List of defines when using libgmock.
5+
# LIBGMOCK_INCLUDE_DIR - where to find gmock/gmock.h, etc.
6+
# LIBGMOCK_LIBRARIES - List of libraries when using libgmock.
7+
# LIBGMOCK_FOUND - True if libgmock found.
8+
9+
IF (LIBGMOCK_INCLUDE_DIR)
10+
# Already in cache, be silent
11+
SET(LIBGMOCK_FIND_QUIETLY TRUE)
12+
ENDIF ()
13+
14+
FIND_PATH(LIBGMOCK_INCLUDE_DIR gmock/gmock.h)
15+
16+
FIND_LIBRARY(LIBGMOCK_MAIN_LIBRARY_DEBUG NAMES gmock_maind)
17+
FIND_LIBRARY(LIBGMOCK_MAIN_LIBRARY_RELEASE NAMES gmock_main)
18+
FIND_LIBRARY(LIBGMOCK_LIBRARY_DEBUG NAMES gmockd)
19+
FIND_LIBRARY(LIBGMOCK_LIBRARY_RELEASE NAMES gmock)
20+
FIND_LIBRARY(LIBGTEST_LIBRARY_DEBUG NAMES gtestd)
21+
FIND_LIBRARY(LIBGTEST_LIBRARY_RELEASE NAMES gtest)
22+
23+
find_package(Threads REQUIRED)
24+
INCLUDE(SelectLibraryConfigurations)
25+
SELECT_LIBRARY_CONFIGURATIONS(LIBGMOCK_MAIN)
26+
SELECT_LIBRARY_CONFIGURATIONS(LIBGMOCK)
27+
SELECT_LIBRARY_CONFIGURATIONS(LIBGTEST)
28+
29+
set(LIBGMOCK_LIBRARIES
30+
${LIBGMOCK_MAIN_LIBRARY}
31+
${LIBGMOCK_LIBRARY}
32+
${LIBGTEST_LIBRARY}
33+
Threads::Threads
34+
)
35+
36+
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
37+
# The GTEST_LINKED_AS_SHARED_LIBRARY macro must be set properly on Windows.
38+
#
39+
# There isn't currently an easy way to determine if a library was compiled as
40+
# a shared library on Windows, so just assume we've been built against a
41+
# shared build of gmock for now.
42+
SET(LIBGMOCK_DEFINES "GTEST_LINKED_AS_SHARED_LIBRARY=1" CACHE STRING "")
43+
endif()
44+
45+
# handle the QUIETLY and REQUIRED arguments and set LIBGMOCK_FOUND to TRUE if
46+
# all listed variables are TRUE
47+
INCLUDE(FindPackageHandleStandardArgs)
48+
FIND_PACKAGE_HANDLE_STANDARD_ARGS(
49+
GMock
50+
DEFAULT_MSG
51+
LIBGMOCK_MAIN_LIBRARY
52+
LIBGMOCK_LIBRARY
53+
LIBGTEST_LIBRARY
54+
LIBGMOCK_LIBRARIES
55+
LIBGMOCK_INCLUDE_DIR
56+
)
57+
58+
MARK_AS_ADVANCED(
59+
LIBGMOCK_DEFINES
60+
LIBGMOCK_MAIN_LIBRARY
61+
LIBGMOCK_LIBRARY
62+
LIBGTEST_LIBRARY
63+
LIBGMOCK_LIBRARIES
64+
LIBGMOCK_INCLUDE_DIR
65+
)

‎Folly/CMake/FindLZ4.cmake‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Finds liblz4.
2+
#
3+
# This module defines:
4+
# LZ4_FOUND
5+
# LZ4_INCLUDE_DIR
6+
# LZ4_LIBRARY
7+
#
8+
9+
find_path(LZ4_INCLUDE_DIR NAMES lz4.h)
10+
11+
find_library(LZ4_LIBRARY_DEBUG NAMES lz4d)
12+
find_library(LZ4_LIBRARY_RELEASE NAMES lz4)
13+
14+
include(SelectLibraryConfigurations)
15+
SELECT_LIBRARY_CONFIGURATIONS(LZ4)
16+
17+
include(FindPackageHandleStandardArgs)
18+
FIND_PACKAGE_HANDLE_STANDARD_ARGS(
19+
LZ4 DEFAULT_MSG
20+
LZ4_LIBRARY LZ4_INCLUDE_DIR
21+
)
22+
23+
if (LZ4_FOUND)
24+
message(STATUS "Found LZ4: ${LZ4_LIBRARY}")
25+
endif()
26+
27+
mark_as_advanced(LZ4_INCLUDE_DIR LZ4_LIBRARY)

‎Folly/CMake/FindLibAIO.cmake‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
find_path(LIBAIO_INCLUDE_DIR NAMES libaio.h)
2+
mark_as_advanced(LIBAIO_INCLUDE_DIR)
3+
4+
find_library(LIBAIO_LIBRARY NAMES aio)
5+
mark_as_advanced(LIBAIO_LIBRARY)
6+
7+
include(FindPackageHandleStandardArgs)
8+
FIND_PACKAGE_HANDLE_STANDARD_ARGS(
9+
LIBAIO
10+
REQUIRED_VARS LIBAIO_LIBRARY LIBAIO_INCLUDE_DIR)
11+
12+
if(LIBAIO_FOUND)
13+
set(LIBAIO_LIBRARIES ${LIBAIO_LIBRARY})
14+
set(LIBAIO_INCLUDE_DIRS ${LIBAIO_INCLUDE_DIR})
15+
endif()

‎Folly/CMake/FindLibDwarf.cmake‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# dwarf.h is typically installed in a libdwarf/ subdirectory on Debian-style
2+
# Linux distributions. It is not installed in a libdwarf/ subdirectory on Mac
3+
# systems when installed with Homebrew. Search for it in both locations.
4+
find_path(LIBDWARF_INCLUDE_DIR NAMES dwarf.h PATH_SUFFIXES libdwarf)
5+
mark_as_advanced(LIBDWARF_INCLUDE_DIR)
6+
7+
find_library(LIBDWARF_LIBRARY NAMES dwarf)
8+
mark_as_advanced(LIBDWARF_LIBRARY)
9+
10+
include(FindPackageHandleStandardArgs)
11+
FIND_PACKAGE_HANDLE_STANDARD_ARGS(
12+
LIBDWARF
13+
REQUIRED_VARS LIBDWARF_LIBRARY LIBDWARF_INCLUDE_DIR)
14+
15+
if(LIBDWARF_FOUND)
16+
set(LIBDWARF_LIBRARIES ${LIBDWARF_LIBRARY})
17+
set(LIBDWARF_INCLUDE_DIRS ${LIBDWARF_INCLUDE_DIR})
18+
endif()

‎Folly/CMake/FindLibEvent.cmake‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# - Find LibEvent (a cross event library)
2+
# This module defines
3+
# LIBEVENT_INCLUDE_DIR, where to find LibEvent headers
4+
# LIBEVENT_LIB, LibEvent libraries
5+
# LibEvent_FOUND, If false, do not try to use libevent
6+
7+
set(LibEvent_EXTRA_PREFIXES /usr/local /opt/local "$ENV{HOME}")
8+
foreach(prefix ${LibEvent_EXTRA_PREFIXES})
9+
list(APPEND LibEvent_INCLUDE_PATHS "${prefix}/include")
10+
list(APPEND LibEvent_LIB_PATHS "${prefix}/lib")
11+
endforeach()
12+
13+
find_path(LIBEVENT_INCLUDE_DIR event.h PATHS ${LibEvent_INCLUDE_PATHS})
14+
find_library(LIBEVENT_LIB NAMES event PATHS ${LibEvent_LIB_PATHS})
15+
16+
if (LIBEVENT_LIB AND LIBEVENT_INCLUDE_DIR)
17+
set(LibEvent_FOUND TRUE)
18+
set(LIBEVENT_LIB ${LIBEVENT_LIB})
19+
else ()
20+
set(LibEvent_FOUND FALSE)
21+
endif ()
22+
23+
if (LibEvent_FOUND)
24+
if (NOT LibEvent_FIND_QUIETLY)
25+
message(STATUS "Found libevent: ${LIBEVENT_LIB}")
26+
endif ()
27+
else ()
28+
if (LibEvent_FIND_REQUIRED)
29+
message(FATAL_ERROR "Could NOT find libevent.")
30+
endif ()
31+
message(STATUS "libevent NOT found.")
32+
endif ()
33+
34+
mark_as_advanced(
35+
LIBEVENT_LIB
36+
LIBEVENT_INCLUDE_DIR
37+
)

0 commit comments

Comments
 (0)