Skip to content

Commit c960381

Browse files
committed
Add flymake as a git submodule
Easier to setup and pin flymake versions as a submodule.
1 parent d220719 commit c960381

File tree

6 files changed

+45
-11
lines changed

6 files changed

+45
-11
lines changed

.gitmodules

+6
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,9 @@
1010
[submodule "extern/nlohmann/json"]
1111
path = extern/nlohmann/json
1212
url = https://github.com/nlohmann/json.git
13+
[submodule "extern/flymake"]
14+
path = extern/flymake
15+
url = https://github.com/trflynn89/flymake.git
16+
[submodule "extern/trflynn89/flymake"]
17+
path = extern/trflynn89/flymake
18+
url = https://github.com/trflynn89/flymake.git

build/ci/Makefile

+5-3
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55
.PHONY: push
66
.PHONY: run
77

8+
SOURCE_ROOT := $(CURDIR)/../..
9+
810
# Import the build system.
9-
include /usr/local/src/fly/system.mk
10-
include /usr/local/src/fly/config.mk
11-
include /usr/local/src/fly/flags.mk
11+
include $(SOURCE_ROOT)/extern/trflynn89/flymake/src/system.mk
12+
include $(SOURCE_ROOT)/extern/trflynn89/flymake/src/config.mk
13+
include $(SOURCE_ROOT)/extern/trflynn89/flymake/src/flags.mk
1214

1315
# Docker settings.
1416
USER := trflynn89

build/nix/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SOURCE_ROOT := $(CURDIR)/../..
22
VERSION := $(shell cat $(SOURCE_ROOT)/VERSION.md)
33

4-
include /usr/local/src/fly/api.mk
4+
include $(SOURCE_ROOT)/extern/trflynn89/flymake/src/api.mk
55

66
# Main targets.
77
$(eval $(call ADD_TARGET, libfly, fly, LIB))
@@ -32,4 +32,4 @@ $(eval $(call EXCLUDE_FROM_COVERAGE, fly/types/numeric/detail/literal_parser.hpp
3232
# Paths to exclude from generation of compilation database.
3333
$(eval $(call EXCLUDE_FROM_COMPILATION_DATABASE, extern/))
3434

35-
include /usr/local/src/fly/build.mk
35+
include $(SOURCE_ROOT)/extern/trflynn89/flymake/src/build.mk

extern/README.md

+10-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
1-
# External Libraries
1+
# External Projects
22

3-
This directory contains all third-party libraries used by libfly for testing purposes only. The core
4-
libfly library does not have any depedencies (except for the STL). The libraries here are only for
5-
unit testing and benchmarking comparisons.
3+
This directory contains all third-party projects used by libfly. Most are for benchmarking and
4+
testing purposes only.
65

7-
Libraries used for unit testing:
6+
The only dependency required by libfly is its build system (for Linux and macOS), flymake, which was
7+
originally part of libfly itself:
8+
9+
* [flymake](https://github.com/trflynn89/flymake)
10+
11+
For unit testing, libfly uses the Catch2 framework:
812

913
* [Catch2](https://github.com/catchorg/Catch2)
1014

11-
Libraries used for benchmarking:
15+
All other submodules are only for benchmark comparisons:
1216

1317
* [{fmt}](https://github.com/fmtlib/fmt)
1418
* [Boost.JSON](https://github.com/boostorg/json)

extern/trflynn89/LICENSE.md

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2021 Tim Flynn
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

extern/trflynn89/flymake

Submodule flymake added at 86f8137

0 commit comments

Comments
 (0)