Commit Graph

234 Commits

Author SHA1 Message Date
A.J. Beamon 083e3f38f3
Merge pull request #2688 from schedutron/py3doc-cmake
Have CMake build docs with Python3
2020-02-24 11:53:41 -08:00
Evan Tschannen 96258b9809 Merge branch 'release-6.2'
# Conflicts:
#	documentation/sphinx/source/release-notes.rst
#	fdbcli/fdbcli.actor.cpp
#	fdbclient/ManagementAPI.actor.cpp
#	fdbrpc/FlowTransport.actor.cpp
#	fdbserver/ClusterController.actor.cpp
#	fdbserver/DataDistribution.actor.cpp
#	fdbserver/DataDistribution.actor.h
#	fdbserver/DataDistributionQueue.actor.cpp
#	fdbserver/KeyValueStoreMemory.actor.cpp
#	fdbserver/MasterProxyServer.actor.cpp
#	fdbserver/QuietDatabase.actor.cpp
#	fdbserver/SkipList.cpp
#	fdbserver/StorageMetrics.actor.h
#	fdbserver/TLogServer.actor.cpp
#	fdbserver/fdbserver.actor.cpp
#	fdbserver/storageserver.actor.cpp
#	fdbserver/workloads/KVStoreTest.actor.cpp
#	flow/CMakeLists.txt
#	flow/Knobs.cpp
#	flow/Knobs.h
#	flow/genericactors.actor.cpp
#	flow/serialize.h
2020-02-21 19:09:16 -08:00
Alvin Moore 3354e6b278 Enabled TLS for CMake Mac builds
Disabled TLS for CMake Windows builds
2020-02-21 11:23:51 -08:00
Saurabh Chaturvedi 2707c91073
Find Interpreter Component for Python3
Co-Authored-By: Markus Pilman <markus@pilman.ch>
2020-02-21 12:18:35 +05:30
Saurabh Chaturvedi b5f63f3c88
Check for Python3_Interpreter_FOUND instead of Python3_FOUND
Co-Authored-By: Markus Pilman <markus@pilman.ch>
2020-02-21 12:17:16 +05:30
Evan Tschannen f04e311a1e Merge commit 'b46d6e25e24993ab5a5f04091fd3235050b7cd09' into feature-boost-ssl
# Conflicts:
#	fdbserver/SimulatedCluster.actor.cpp
#	flow/Net2.actor.cpp
2020-02-20 17:36:38 -08:00
Alex Miller 41afeb245e Temporarily disable TLS on OSX 2020-02-20 17:03:16 -08:00
Alex Miller 3bcecea30b Fix the cmake build when neither SSL library is found. 2020-02-19 17:03:57 -08:00
Saurabh Chaturvedi ed1458c834 Have CMake build docs with Python3 2020-02-17 19:30:03 +05:30
Alex Miller d716c50000 Find OpenSSL or LibreSSL in CMake 2020-02-13 21:31:36 -08:00
Alex Miller 188b564dfb
Merge pull request #2147 from atn34/werror
Don't use -Werror by default
2020-02-13 18:35:57 -08:00
mpilman 5a9d420cb7 Merge remote-tracking branch 'upstream/release-6.2' into release-merges/20200210 2020-02-10 10:02:05 -08:00
mpilman 5c294e2646 Several build improvements - enables parallel builds on Windows (again) 2020-02-09 08:34:14 -08:00
mpilman d09e07f1f5 Merge remote-tracking branch 'upstream/master' into features/icc 2020-02-04 10:26:18 -08:00
Andrew Noyes a6b3a3ee47 Set USE_WERROR on build/docker-compose.yaml 2020-02-03 09:09:43 -08:00
Andrew Noyes 33132fe0ca Set USE_WERROR to ON for gcc 8.3.1 2020-02-03 09:06:29 -08:00
Andrew Noyes ffe617376c Don't use -Werror by default
We'll still enforce that PR's are warning-free before they're merged.
2020-02-03 09:06:29 -08:00
Daniel Smith 9f1fda554c
Formatting 2020-01-28 21:32:56 -05:00
Daniel Smith 4ecf58adff
Apply suggestions from code review
Co-Authored-By: Markus Pilman <markus@pilman.ch>
2020-01-28 21:32:13 -05:00
Daniel Smith b9de844ee7 Add link option specific to Clang 2020-01-28 12:51:05 -05:00
A.J. Beamon 62fc3bf084
Merge pull request #2558 from apple/release-6.2
Merge Release Into Master
2020-01-17 10:39:03 -08:00
Evan Tschannen 3f9d9d8b84 Merge branch 'release-6.2'
# Conflicts:
#	CMakeLists.txt
#	cmake/FlowCommands.cmake
#	documentation/sphinx/source/release-notes.rst
#	fdbclient/StorageServerInterface.h
#	fdbserver/DataDistributionTracker.actor.cpp
#	fdbserver/MasterProxyServer.actor.cpp
#	fdbserver/fdbserver.actor.cpp
#	flow/Knobs.h
#	flow/Platform.cpp
#	versions.target
2020-01-16 18:37:47 -08:00
mpilman 9095a8b151 make dependencies explicit 2020-01-16 14:40:29 -08:00
Alvin Moore 0ed6875f0e Removed debug file 2020-01-15 06:43:48 -08:00
Alvin Moore ae7e8cbcba Fixed syntax 2020-01-15 02:51:16 -08:00
Alvin Moore 76c8a93cac Add check for file existence before stripping
Added storing of debug infomratio
2020-01-15 02:29:34 -08:00
Alvin Moore 06e7bc061d
Merge pull request #2500 from apple/release-6.2
Merge Release 6.2 Into Master
2019-12-23 15:00:34 -08:00
Alvin Moore 6acf04bb72 Ensured that the cmake variable is always initialized/set to some value when compared and thereby has an expected value 2019-12-23 11:50:01 -08:00
Alvin Moore 93c1810ad8
Merge pull request #2496 from apple/release-6.2
Merge Release 6.2 Into Master
2019-12-23 10:17:23 -08:00
Alvin Moore 325d553973 Set the package release version based on if the build is a release package or not like the make builds 2019-12-23 02:42:02 -08:00
Alvin Moore 3ce3e1e06e Changed the name of the rpm packages to conform to the existing names when building release project 2019-12-22 20:11:40 -08:00
Alvin Moore c0614bc037
Merge pull request #2492 from apple/release-6.2
Release 6.2 Merge Into Master
2019-12-20 15:21:33 -08:00
Alvin Moore 370786c95d Fixed package name (again) 2019-12-20 10:18:34 -08:00
Alvin Moore cb6ab87621 Fixed the name of the rpm and deb packages 2019-12-20 09:37:24 -08:00
Alvin Moore 21390c493a Merge branch 'release-6.2' of github.com:apple/foundationdb into release_6.2_merge
Resolved merge by keeping new test file from master branch: SampleNoSimAttrition.txt adding new constraint from Release branch about existing test file: SimpleExternalTest.txt

# Conflicts:
#	tests/CMakeLists.txt
2019-12-18 09:05:08 -08:00
Alvin Moore 28d626800d Allow Valgrind to be enabled via environmental variable 2019-12-17 07:12:26 -08:00
Alvin Moore 4d575b2cda Removed cache variable
Added status message to indicate what is buildinng
2019-12-17 00:10:06 -08:00
Alvin Moore d0f68ace4a Switched back to allowing only one RPM platform to be built at a time.
Allow the selection of el6 RPM creation to be made via environmental variable
2019-12-16 14:41:44 -08:00
Alvin Moore 3bbfa8a1ad Only include the git version within the rpm and deb name if defined
Removed platform el6 and el7 from package name
2019-12-16 14:40:40 -08:00
Alvin Moore 3da9d182b1 Switched to using environmental variable for enablement since TOUPPER did not produce expected results sometimes 2019-12-16 14:37:51 -08:00
Alvin Moore bc339414f5 Add support for building el6 and el7 RPM packages by default using single cpack command 2019-12-16 00:13:17 -08:00
Alvin Moore 413cafe368 Modified compilation and package names to conform to existing compilation options and packaging names
Modifications to existing standards (even when wrong should be made outside of port to cmake)
2019-12-15 07:13:46 -08:00
Alvin Moore 3bf971ba8b Merge branch 'release-6.2' of github.com:apple/foundationdb into release_6.2_merge
# Conflicts:
#	documentation/sphinx/source/release-notes.rst
#	fdbserver/storageserver.actor.cpp
2019-12-12 07:13:12 -08:00
Alvin Moore bdc16def8e
Merge pull request #2437 from AlvinMooreSr/publish_cmake
CMake Publishing Changes
2019-12-12 06:50:04 -08:00
Alvin Moore 2c673d205f Changed the cmake naming convention of rpms and deb packages to match the existing format which is sadly different between the formats. 2019-12-11 22:18:05 -08:00
Alvin Moore 40646a6fc5 Fixed the naming convention of the DEB packages to be the same as before 2019-12-11 18:43:52 -08:00
Alvin Moore cb7af96017 Ensure that the naming convention for the OSX package is the same as it was 2019-12-11 18:43:15 -08:00
Alvin Moore 363feafacd Changed the name of a cmake functions
Added working directory for cmake command
2019-12-11 13:59:03 -08:00
Andrew Noyes 6a5f2a7eec Disable alignment-requiring instructions until #1434 is resolved 2019-12-11 11:05:02 -08:00
Alvin Moore aece864143 Added support for creating symlinks to fdbbackup within bin and packages/bin directory 2019-12-10 11:44:45 -08:00