summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix merge mistakev1.10.2releaseJan Niklas Hasse2020-11-281-0/+2
|
* v1.10.2Jan Niklas Hasse2020-11-281-1/+1
|
* Merge branch 'master' into releaseJan Niklas Hasse2020-11-2886-360/+626
|\
| * mark this 1.10.2.gitJan Niklas Hasse2020-11-281-1/+1
| |
| * GitHub Actions: Build Universal Binary for macOSJan Niklas Hasse2020-11-231-4/+5
| |
| * Merge pull request #1879 from kadler/aix-cleanupJan Niklas Hasse2020-11-143-4/+25
| |\ | | | | | | Fix building on AIX
| | * Fix test crashes on AIXKevin Adler2020-11-132-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both hash_collision_bench and manifest_parser_perftest crash on AIX with terminate called after throwing an instance of 'std::bad_alloc' what(): std::bad_alloc IOT/Abort trap (core dumped) 32-bit AIX applications by default allocates only a single 256M segment for stack and heap for 32-bit applications, which is insufficient for these tests. When building these tests on AIX in 32-bit mode, increase the max number of segments so they will run without crashing.
| | * Add libperfstat to AIX CMake buildKevin Adler2020-11-131-0/+5
| | |
| | * Use internal getopt for IBM i and AIXKevin Adler2020-11-132-4/+9
| | |
| * | Merge pull request #1880 from kadler/fix-hash-benchmarkJan Niklas Hasse2020-11-131-1/+2
| |\ \ | | | | | | | | Fix buffer overread in hash_collision_benchmark.cc
| | * | Fix buffer overread in hash_collision_benchmark.ccKevin Adler2020-11-131-1/+2
| | |/ | | | | | | | | | | | | | | | | | | The randomly generated command strings are not null-terminated and implicitly converted to StringPiece objects, which will use strlen to determine how long the passed `char*` is. Without the null terminator, this results in undefined behavior and regularly causes crashes on AIX.
| * | Merge pull request #1878 from hdf89shfdfs/multi_generator_bugJan Niklas Hasse2020-11-131-10/+8
| |\ \ | | |/ | |/| Fix mulit-configuration bug
| | * Fix mulit-configuration bug. This affected users who usehdf89shfdfs2020-11-131-10/+8
| |/ | | | | | | multi-configuration generators for building ninja.
| * Merge pull request #1787 from neheb/strJan Niklas Hasse2020-11-102-2/+4
| |\ | | | | | | [clang-tidy] remove pointless string init
| | * [clang-tidy] remove pointless string initRosen Penev2020-11-072-2/+4
| |/ | | | | | | | | | | Found with readability-redundant-string-init Signed-off-by: Rosen Penev <rosenp@gmail.com>
| * Merge pull request #1867 from jhasse/github-actions-dockerJan Niklas Hasse2020-11-062-0/+64
| |\ | | | | | | GitHub Actions: Run more tests on Ubuntu 20.04 (Docker)
| | * GitHub Actions: Run more tests on Ubuntu 20.04 (Docker)Jan Niklas Hasse2020-10-312-0/+64
| | |
| * | Merge pull request #1870 from nmulcahey/cmakeJan Niklas Hasse2020-11-051-1/+1
| |\ \ | | | | | | | | cmake: Use ${CMAKE_COMMAND} instead of `cmake`
| | * | cmake: Use ${CMAKE_COMMAND} instead of `cmake`Nathan Mulcahey2020-11-031-1/+1
| |/ / | | | | | | | | | | | | Not all users have `cmake` on their PATH and this causes a build failure.
| * | Merge pull request #1868 from kadler/fix-aix-signal-checkingJan Niklas Hasse2020-11-021-0/+10
| |\ \ | | | | | | | | Handle process signalling correctly on AIX
| | * | Handle process signalling correctly on AIXKevin Adler2020-10-311-0/+10
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | POSIX shells set the exit code to 128 + the signal number, which coincidentally matches the layout used by the WIFSIGNALLED/WTERMSIG macros on most Unix-like systems, but not on AIX. Instead, AIX stores the signal value in the bottom 8 bits and also bits 16-23. The only time ninja currently handles signals correctly is when the shell used to call the program dies via signal. To handle both scenarios, we detect the shell exit code format and convert it to the format that the WIFSIGNALED/WTERMSIG macros expect. Fixes #1623
| * | Merge pull request #1834 from jhasse/close-during-generatorJan Niklas Hasse2020-11-022-2/+5
| |\ \ | | |/ | |/| Close BuildLog while running generators, fix #1724
| | * Close BuildLog while running generators, fix #1724Jan Niklas Hasse2020-08-262-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While #1780 delayed opening .ninja_log until the first write, this this didn't fully fix the issue on Windows: There might be build statements which run before the generator resulting in an actual write to .ninja_log. To fix this once and for all the BuildLog now gets closed before running the generator. BuildLog::log_file_path_ won't be cleared so that it can be opened again after the generator finished.
| * | Check return value of setvbuf, fix #509Jan Niklas Hasse2020-10-302-2/+6
| | |
| * | Merge pull request #1865 from ThePrez/ibmiJan Niklas Hasse2020-10-301-0/+7
| |\ \ | | | | | | | | build: Add IBM i compile/link flags
| | * | fixup: remove unneeded CMAKE_C_FLAGSJesse Gorzinski2020-10-291-1/+0
| | | |
| | * | build: Add IBM i compile/link flagsJesse Gorzinski2020-10-291-0/+8
| |/ /
| * | Merge pull request #1614 from splinter-build/std-namespace-for-headerfilesJan Niklas Hasse2020-10-1980-278/+366
| |\ \ | | | | | | | | Remove 'using namespace std' from header files, properly namespace all std symbols
| | * | Comply with project formatting rules wrt 80 column linesMichael Jones2020-09-308-13/+19
| | | |
| | * | Remove 'using namespace std' from header files, properly namespace all std ↵Michael Jones2020-09-3026-276/+250
| | | | | | | | | | | | | | | | symbols
| | * | Add 'using namespace std;' to all cc files to prepare for removing it from ↵Michael Jones2020-09-3055-1/+109
| | | | | | | | | | | | | | | | header files
| * | | Merge pull request #1855 from splinter-build/add-sanitizersJan Niklas Hasse2020-10-031-8/+21
| |\ \ \ | | | | | | | | | | Add debug build with sanitizers support, fix scan-build
| | * | | Add debug build with sanitizers supportMichael Jones2020-10-021-8/+21
| |/ / /
| * | | Merge pull request #1852 from splinter-build/scan-buildJan Niklas Hasse2020-10-021-2/+2
| |\ \ \ | | | | | | | | | | Add clang-analyze to build
| | * | | Add clang-analyze to buildMichael Jones2020-09-301-2/+2
| | |/ /
| * | | Revert "Merge pull request #1768 from jhasse/github-actions-lint"Jan Niklas Hasse2020-10-022-63/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit 18df4d1e5dbd905507476d92351a2f8010a49356, reversing changes made to 54959b0f2c4950d97d94c03810b3b5185be0d69e.
| * | | Merge pull request #1768 from jhasse/github-actions-lintJan Niklas Hasse2020-10-022-0/+63
| |\ \ \ | | |/ / | |/| | Run more CI tests on Ubuntu 20.04
| | * | clang-tidy: Drop readability-container-size-empty due to testsJan Niklas Hasse2020-09-191-2/+0
| | | |
| | * | GitHub Actions: Update to Ubuntu 20.04Jan Niklas Hasse2020-09-191-4/+4
| | | |
| | * | Merge branch 'master' into github-actions-lintJan Niklas Hasse2020-09-1922-140/+356
| | |\ \ | | |/ / | |/| |
| * | | cmake: add BUILD_TESTING option (ON by default) (#1839)David Callu2020-09-141-39/+41
| | | | | | | | | | | | | | | | option provided by cmake's Module CTest enable_testing() is call by this Module
| * | | Merge pull request #1789 from neheb/ifJan Niklas Hasse2020-09-101-2/+1
| |\ \ \ | | | | | | | | | | [clang-tidy] fix small false positive
| | * | | [clang-tidy] fix small false positiveRosen Penev2020-06-181-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | else if has to be on the same line it seems. Found with readability-misleading-indentation Signed-off-by: Rosen Penev <rosenp@gmail.com>
| * | | | Merge pull request #1786 from neheb/membJan Niklas Hasse2020-09-102-8/+3
| |\ \ \ \ | | | | | | | | | | | | [clang-tidy] remove redundant member init
| | * | | | [clang-tidy] remove redundant member initRosen Penev2020-06-182-8/+3
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Found with readability-redundant-member-init Signed-off-by: Rosen Penev <rosenp@gmail.com>
| * | | | Merge pull request #1836 from aharrison24/cmake-browse-mode-supportJan Niklas Hasse2020-08-282-3/+63
| |\ \ \ \ | | | | | | | | | | | | CMake: Add support for "browse" mode
| | * | | | CMake: Add platform checks for browse mode supportAlastair Harrison2020-08-281-10/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Browse mode requires a number of POSIX features to be available. This commit adds configure-time checks that the 'unistd.h' header is available and that the `inline.sh` script executes successfully. If the checks pass then browse mode is enabled.
| | * | | | Improve error handling in inline.shAlastair Harrison2020-08-281-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the script would generate some output and return a zero error code, even if the calls to `od` or `sed` failed. This change ensures that: - If `od` or `sed` fail then the script will fail. - Output will only be written on success.
| | * | | | CMake: Add support for "browse" modeAlastair Harrison2020-08-271-0/+38
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes ninja-build/ninja#1822, fixes ninja-build/ninja#1853 Adds support for `ninja -t browse` to CMake builds. The platform support logic is copied from configure.py, so Windows, Solaris and AIX are treated as 'unsupported' platforms. All other platforms are assumed to be supported. As discussed in #1853, when built via CMake the `ninja` executable looks for a binary called `python` in the current path, in order to launch the "browse" mode. The behaviour differs from that of the configure.py script, which looks for a python executable that has the *same name* as the python executable that invoked the configure script.
| * | | | Merge pull request #1823 from serpent7776/patch-1Jan Niklas Hasse2020-08-271-1/+1
| |\ \ \ \ | | |/ / / | |/| | | Use c++ instead of g++