74c11b4c9a
Merge pull request #3262 from apple/release-6.2
...
Merge release-6.2 into release-6.3
2020-05-28 13:43:46 -07:00
382666d21e
Permissions were wrong on installed files. A missing DESTINATION for fdbserver caused the binary to be missing.
2020-05-28 10:33:09 -07:00
b3c269351a
Merge pull request #3252 from apple/release-6.2
...
Merge release-6.2 into release-6.3
2020-05-27 19:13:24 -07:00
96f396ec7f
Make sure to build the binary stripping targets when packaging stripped binaries
2020-05-27 16:40:07 -07:00
d6be580319
Merge branch 'release-6.2' into merge-release-6.2-into-release-6.3
...
# Conflicts:
# documentation/sphinx/source/command-line-interface.rst
# documentation/sphinx/source/release-notes.rst
# fdbcli/fdbcli.actor.cpp
2020-05-27 11:42:27 -07:00
2f9cd383ea
Use stripped executables in packages when not building with debug symbols.
2020-05-21 13:39:55 -07:00
b589c3c940
Remove IncludeVersions.h, which is no longer needed for cmake-only builds
2020-05-20 13:23:02 -07:00
78d644f673
Merge branch 'master' into bugfixes/cmake-includes
2020-05-04 02:11:46 -07:00
28e58c672a
fdbmonitor: ifdef config path location
2020-04-30 20:11:43 +00:00
b2eb93f5f4
fdbmonitor: define O_EVTONLY for FreeBSD
2020-04-30 20:11:43 +00:00
5064cc776b
fdbmonitor: update headers & libraries
2020-04-30 20:11:43 +00:00
d4542dbb5a
Delete old build system
2020-04-07 11:03:45 -07:00
e4611e8ae4
fix versions.h stupidity
2020-04-06 10:28:55 -07:00
8b5780c36c
don't include source and binary dir
...
This forces users to use include paths from the sources root.
So `#include "Arena.h"` won't work anymore, only
`#include "flow/Arena.h"` will.
2020-04-06 10:13:49 -07:00
98aaa01134
Use PRIVATE instead of PUBLIC
2019-09-16 19:51:41 -07:00
44f1cd6219
Fix some CMake build issues
...
1. `-isystem ../flow/-lpthreads` was appearing as an include flag
Due to an apparent mistake of specifying CMAKE_THREAD_LIBS_INIT
as a system include. The correct way to do this is to link
against Threads::Threads, which was already done below.
2. fdbmonitor wouldn't link due to missing pthread_once
So it also needs to link against Threads::Threads
2019-09-16 18:43:38 -07:00
56a67148a1
Backported fix for linking pthread into fdbmonitor from master
2019-09-16 12:31:42 -07:00
6872ca1228
Added pthread library since used within fdbmonitor
2019-09-16 12:31:42 -07:00
6e9f2aa859
Changed link libbrary from lpthread to pthread
2019-08-02 10:04:36 -07:00
a9e48502f0
Added pthread library since used within fdbmonitor
2019-07-31 18:11:40 -07:00
3acaa7343e
Enabled C++17 for all Windows projects
...
Set Visual Studio version to 2017 (first version to support C++17)
2019-05-16 17:44:13 -07:00
94aed513c7
Switched Windows tools within projects to 2017
2019-05-16 15:05:11 -07:00
0713e06efc
Started to work on Windows
2019-05-13 14:15:23 -07:00
0b263fd856
fdbmonitor: fix some print/scan format warnings
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-05-06 13:35:29 -07:00
6207d724f8
Fix all -Wunused-variable warnings
2019-04-15 18:13:00 -07:00
52f1ef22e7
Added support for stripping symbols from fdbmonitor
2019-04-05 01:38:07 -07:00
09f37cf3d2
Merge pull request #533 from ajbeamon/fix-parent-directory
...
Fixes to parentDirectory() and abspath()
2019-03-22 23:53:46 -07:00
382a7bdc5f
Changed behavior regarding ~ and ~user paths to treat them as unresolvable symbolic links.
2019-03-22 16:21:12 -07:00
524a666290
Added back previous handling of ~ in paths, with the improvement that it only treats ~ as special if it is the first character.
2019-03-22 11:44:46 -07:00
6c42e42334
Fix compiler complaint about ignored return codes being ignored. Added commented call to testPathOps() for convenience.
2019-03-21 18:05:30 -07:00
a6b598f236
Missing include.
2019-03-21 17:51:00 -07:00
c6d96498ca
parentDirectory() is now based on popPath(). Bug fix, abspath() would prepend current working directory even when not resolving symlinks. Added more unit tests. Ported path operation unit tests to fdbmonitor() since the path manipulation function implementations are significantly different. Clarified some comments. The flow project version of abspath() does not allow resolveLinks to be false, for now, because behavior of this on Windows is not well thought out or tested.
2019-03-21 16:56:36 -07:00
644a88e8b4
Updated fdbmonitor to use modified/minimal implementations of new abspath() and parentDirectory() implementations from flow.
2019-03-20 23:18:30 -07:00
5e63efd385
Fix typo in comment
...
Co-Authored-By: mpilman <markus@pilman.ch>
2019-03-20 12:18:31 -07:00
a0fe00fa8d
Add cmake targets to execute local dev instance
2019-03-20 12:18:31 -07:00
2efb6f4c0d
Added cleanPath() which puts a path in a canonical form without .., ., or duplicate separators without using the filesystem or resolving symbolic links. absPath() redefined to use cleanPath() so it will return the same result for a path without symbolic links regardless of whether or not the path actually exists. Redefined parentDirectory() to use absPath() and error on certain inputs. Added comments describing behavior of these functions, and added a unit test which verbosely tests many inputs to them.
2019-03-15 23:54:33 -07:00
809861ee88
Merge branch 'master' into fix-parent-directory
...
# Conflicts:
# flow/Platform.cpp
2019-03-15 10:51:12 -07:00
880e8643d1
Fix Windows link errors
2019-03-11 17:49:03 -07:00
e8624efb3b
several minor improvements
2019-03-07 16:49:29 -08:00
2537f26de6
First implementaion of more user-friendly cpack
...
Up unto here this code is only very rudiemantery tested.
This is a firest attempt of making cpack more user-friendly.
The basic idea is to generate a component for package type so
that we can have different paths depending on whether we build
an RPM, a DEB, a TGZ, or a MacOS installer. The cpack package
config file will then chose the correct components to use.
In a later point this should make it possible to build these
with `make packages` and the ugly iteration with calling cmake
between each package would be obsolete. While this solution is
a bit more bloated, it is also much more flexible and it will be
much easier to use.
Another benefit is, that this will get rid of all warnings during
a cpack run
2019-03-07 16:49:29 -08:00
4a4af6fb2c
Make cmake build fail if old build system was used
...
This changes makes a cmake build check for an existing
versions.h file in the source directory before it builds
anything else. If it finds it it will fail the build.
This is to prevent confusion when someone tries to use cmake
on a source directory where the old build system was used
before (as this is not supported).
2019-03-06 13:48:18 -08:00
9b14aeb156
Tell cmake not to link/install on ide build
2019-02-19 15:16:59 -08:00
6da5971e79
Guard all versions.h to not break old WIN32 build
2019-02-08 16:06:00 -08:00
aeccec0ef8
Fix merge conflicts
2019-02-07 18:09:10 -08:00
7a858b902d
Most of FDB compiling on Windows with cmake
2019-02-07 15:37:04 -08:00
935f8a92f4
Install fdbmonitor without lib suffix for cmake
2019-01-31 09:06:49 -08:00
ab37648037
Only link librt on linux fdbmonitor/CMakeLists.txt
...
Co-Authored-By: atn34 <anoyes34@gmail.com>
2019-01-28 21:44:48 -08:00
8fc88306cf
Link librt into fdbmonitor
2019-01-28 17:05:29 -08:00
c167ed5457
Don't link flow into fdbmonitor for cmake
...
It seems that fdbmonitor is not meant to depend on flow, since it
redefines symbols such as `joinPath`
2019-01-24 09:59:38 -08:00
217fb4e6cb
Fix the CMake build.
...
This change was originally authored by @mpilman as part of #1005 , but is
something that can instead be merged quickly and easily.
2019-01-10 14:33:09 -08:00
A.J. Beamon