> On Feb. 26, 2019, 8:22 p.m., Joseph Wu wrote: > > cmake/CompilationConfigure.cmake > > Lines 630-637 (original), 663-667 (patched) > > <https://reviews.apache.org/r/70047/diff/4/?file=2126973#file2126973line663> > > > > I don't think the CMake build needs to follow the autotools one here. > > For one, the packaging for CMake does not need to configure more than once > > (assuming we finish the CMake packaging ;). > > > > A comment mentioning the difference should be enough. i.e. > > ``` > > # NOTE: The `build_git_config.hpp.in` file is specific to the autotools > > build. > > # `build_config.hpp.in` includes the definitions for the CMake build. > > ``` > > Till Toenshoff wrote: > There is indeed only one reason to do this, it is because we might want > zero suprises when finally switching over -- waiting for my shepherd to make > a call here :)
I totally omitted the source-distribution argument when stating the above -- so while academically speaking we wont need this for cmake based package creation (as done via CPack and not rpmbuild), we will still need it to include a git sha artefact in our source tarballs/packages. - Till ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/70047/#review213230 ----------------------------------------------------------- On Feb. 26, 2019, 11:05 a.m., Till Toenshoff wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/70047/ > ----------------------------------------------------------- > > (Updated Feb. 26, 2019, 11:05 a.m.) > > > Review request for mesos, Benjamin Bannier and Joseph Wu. > > > Bugs: MESOS-9605 > https://issues.apache.org/jira/browse/MESOS-9605 > > > Repository: mesos > > > Description > ------- > > For autotools, we extracted additional build info like the git branch > and sha during the automake phase handing them into libbuild via > commandline defines. > > CMake builds however used a configuration file for this purpose. > > This patch updates both build systems to make use of > build_git_config.hpp.in for build specific git information. > > > Diffs > ----- > > cmake/CompilationConfigure.cmake c330324e2e3dea6e71980ae8c9ed71632ebb018e > configure.ac ee29fc784e53ebaf1bb016c33136b200c646ee9b > src/Makefile.am 283d5ed89b36d74da36f38c26aec03c6129d6261 > src/common/build.cpp f5271d87d33ac429fb94093a347be1d6c25d3432 > src/common/build_config.hpp.in 4cce2403c1d7a5feee8fd2fffa7cf4308507cd0c > src/common/build_git_config.hpp.in PRE-CREATION > > > Diff: https://reviews.apache.org/r/70047/diff/4/ > > > Testing > ------- > > Manually tested both cmake and autotools. > > First configure run: > ``` > [...] > checking for src/common/build_git_config.hpp... no > configure: creating src/common/build_git_config.hpp > [...] > > ``` > > Subsequent configure runs: > ``` > [...] > checking for src/common/build_git_config.hpp... yes > [...] > ``` > > Final build from `support/packaging/centos/build-docker-rpmbuild.sh` > installed and ran agent; > ``` > Installed: > mesos.x86_64 0:1.8.0-0.1.pre.20190226gitc125541.el7 > > Complete! > [root@9b0d899ff4c6 ~]# mesos-slave --work_dir=/tmp --master=127.0.0.1:5050 > I0226 01:00:48.581748 157 main.cpp:350] Build: 2019-02-26 00:36:49 by centos > I0226 01:00:48.581817 157 main.cpp:351] Version: 1.8.0 > I0226 01:00:48.581823 157 main.cpp:358] Git SHA: > c125541b8e4f2c2f6f56fe7e1c2e0b26d5bbfc62 > I0226 01:00:48.587003 157 systemd.cpp:240] systemd version `219` detected > I0226 01:00:48.587026 157 main.cpp:453] Initializing systemd state > ``` > > > Thanks, > > Till Toenshoff > >
