Commit Graph

69 Commits

Author SHA1 Message Date
A.J. Beamon 57390bfbc5
Merge pull request #3263 from apple/release-6.2
Merge release-6.2 into release-6.3
2020-05-28 14:14:38 -07:00
A.J. Beamon b0f3754fbb Fix whitespace 2020-05-28 12:42:57 -07:00
A.J. Beamon 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
Markus Pilman 3d1d46b129 simplified further 2020-05-04 10:47:24 -07:00
Markus Pilman d9701f354d Merge remote-tracking branch 'origin/master' into bugfixes/deb-dir-structure 2020-05-04 10:44:25 -07:00
Andrew Noyes 0a8474e995 Install /var/lib/foundationdb/data
This is what the old buildrpms.sh and builddebs.sh seemed to do
2020-04-26 20:53:41 +00:00
Markus Pilman f571564db6 Attempted to fix debian directory structure 2020-04-22 16:29:28 -07:00
Andrew Noyes 9afa3545b5 Prevent server and clients rpm's from conflicting
Before, the file /etc/foundationdb conflicted between the server and
clients package, and /usr/lib64/cmake and /usr/lib64/pkgconfig
conflicted with some system packages.
2020-04-16 22:00:49 +00: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 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 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 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 363feafacd Changed the name of a cmake functions
Added working directory for cmake command
2019-12-11 13:59:03 -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
Chris Donati 8b97bf2b2c Remove vendored argparse installation references 2019-09-17 18:42:36 -07:00
mpilman 23d2c58446 Put fdbmonitor into `sbin` dir in tgz-package
Fixes #1753
2019-07-23 09:40:33 -07:00
Alvin Moore 8ff5150470
Merge pull request #1636 from atn34/export-libfdb_c
Export libfdb c
2019-06-24 13:08:41 -07:00
Andrew Noyes f5e7b8b165 Support pkg-config 2019-06-09 15:21:36 -07:00
Andrew Noyes 882523330c include(/path/to/cmake/file) now works for fdb_c 2019-06-09 15:21:36 -07:00
Andrew Noyes cabe41626c Prepare for exporting fdb_c 2019-06-09 15:21:36 -07:00
Andrew Noyes 2b07a0559e Install headers in foundationdb dir 2019-06-09 15:21:36 -07:00
Andrew Noyes 8e0cbd299b Use 'map' for finding install paths 2019-06-09 15:21:36 -07:00
mpilman 57db135858 Use productbuild instead of PackageMaker on MacOS
fixes #1547
fixes #1549
2019-05-11 14:42:48 -07:00
Alvin Moore 345e8496ab Fixed the cmake package vendor and email information in order to prevent cpack errors 2019-05-02 22:14:18 -07:00
Alex Miller 1f1fb8acee Update cmake/InstallLayout.cmake
Co-Authored-By: atn34 <anoyes34@gmail.com>
2019-03-19 16:28:42 -07:00
Andrew Noyes b20acd6e5c Include empty etc dir in cmake clients deb
This seems to be necessary since without it the postinstall script
complains that directory is missing.
2019-03-19 16:28:42 -07:00
Andrew Noyes 56c14bee0b Remove python dep from cmake-generated deb 2019-03-19 16:28:42 -07:00
Andrew Noyes 143c62b959 Recognize install destination "lib" 2019-03-19 16:28:42 -07:00
Andrew Noyes 4866a8922e Fail build if install destination not recognized 2019-03-19 16:28:42 -07:00
Andrew Noyes fdde63bbdb Remove EXPORT since it's broken and unnecessary 2019-03-19 16:28:42 -07:00
mpilman 668eaeb8ae Packages tested and all seems working 2019-03-07 16:49:29 -08:00
mpilman 51ccdb1c9b Remove pidof hack as it was not stable 2019-03-07 16:49:29 -08:00
mpilman da72306642 several minor bug fixes 2019-03-07 16:49:29 -08:00
mpilman 645eba7b58 fixed cmake generated symlinks 2019-03-07 16:49:29 -08:00
mpilman 55f4d78fcf Support generating el6 and el7 rpms 2019-03-07 16:49:29 -08:00
mpilman 294baa4091 Fix package naming 2019-03-07 16:49:29 -08:00
mpilman e8624efb3b several minor improvements 2019-03-07 16:49:29 -08:00
mpilman 42e0a89a66 This makes package generation work
Resulting packages are not tested yet
2019-03-07 16:49:29 -08:00
mpilman 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
mpilman 41128d5bb5 Remove packages->package dependency
There is a cmake bug not allowing us to have this
dependency :(
2019-02-19 11:11:25 -08:00
mpilman acad3e8201 Put rpm, deb, or msi into the packages folder
This additionally fixes a dependency bug on Windows
2019-02-19 11:11:25 -08:00