summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1905 from korli/haikuJan Niklas Hasse2021-01-281-0/+4
|\ | | | | Add Haiku support.
| * Add Haiku support.Augustin Cavalier2021-01-281-0/+4
|/
* Merge pull request #1904 from remexre/masterJan Niklas Hasse2021-01-131-1/+3
|\ | | | | Adds dyndep support to ninja_syntax.py.
| * Adds dyndep support to ninja_syntax.py.Nathan Ringo2021-01-121-1/+3
|/
* Merge pull request #1674 from cameron314/bugfix/core-countJan Niklas Hasse2021-01-011-0/+29
|\ | | | | Fixed processor count detection on Windows
| * Added preprocessor if to clarify processor count workaround code is only ↵Cameron2020-12-311-1/+2
| | | | | | | | needed on 32-bit builds (following code review)
| * Tweaks following code reviewCameron2020-06-101-4/+3
| |
| * Style changes following code reviewCameron Desrochers2019-11-201-4/+8
| |
| * Removed unnecessary #ifdef following code reviewCameron Desrochers2019-11-131-2/+1
| |
| * Use symbolic constant as suggested in code reviewCameron2019-11-131-1/+1
| | | | | | Co-Authored-By: Takuto Ikuta <atetubou@gmail.com>
| * Fixed processor count detection on Windows when multiple processor groups ↵Cameron Desrochers2019-11-121-0/+26
| | | | | | | | (i.e. >64 processors) are present
* | Merge pull request #1893 from AdamKorcz/fuzz1Jan Niklas Hasse2020-12-113-0/+84
|\ \ | | | | | | Added fuzzer with build script and seed
| * | Created oss-fuzz folder and moved build.sh and sample ninja file into itAdamKorcz2020-12-102-0/+0
| | |
| * | Added fuzzer with build script and seedAdamKorcz2020-12-083-0/+84
| | |
* | | Merge pull request #1894 from gjasny/modern-add-test-signatureJan Niklas Hasse2020-12-112-2/+2
|\ \ \ | |/ / |/| | cmake: Use modern add_test signature
| * | cmake: Use modern add_test signatureGregor Jasny2020-12-112-2/+2
|/ / | | | | | | | | | | Using this modern signature makes CMake/CTest use the effective binary path and works also with multi-config generators which put binaries in extra `Release` folders.
* | Ignore new clangd cache directory, tooJan Niklas Hasse2020-12-061-0/+1
| |
* | Merge pull request #1791 from neheb/expJan Niklas Hasse2020-12-062-5/+4
|\ \ | | | | | | [clang-tidy] add explicit to single argument constructors
| * | [clang-tidy] add explicit to single argument constructorsRosen Penev2020-12-062-5/+4
| | | | | | | | | | | | | | | | | | Found with google-explicit-constructor Signed-off-by: Rosen Penev <rosenp@gmail.com>
* | | Merge pull request #1790 from neheb/boolJan Niklas Hasse2020-12-062-4/+3
|\ \ \ | | | | | | | | [clang-tidy] simplify boolean expression
| * | | [clang-tidy] simplify boolean expressionRosen Penev2020-12-052-4/+3
| |/ / | | | | | | | | | | | | | | | Found with readability-simplify-boolean-expr Signed-off-by: Rosen Penev <rosenp@gmail.com>
* | | Merge pull request #1873 from jhasse/remove-travisJan Niklas Hasse2020-12-052-36/+21
|\ \ \ | | | | | | | | Replace Travis CI with GitHub Actions
| * | | Replace Travis CI with GitHub ActionsJan Niklas Hasse2020-11-062-36/+21
| | | |
* | | | Merge pull request #1876 from orgads/msvc-warningsJan Niklas Hasse2020-12-051-1/+3
|\ \ \ \ | | | | | | | | | | Suppress MSVC warnings
| * | | | Suppress MSVC warningsOrgad Shaneh2020-11-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * D9025: overriding '/GR' with '/GR-' * C4100: 'argc': unreferenced formal parameter * C4244: '=': conversion from 'int' to 'char', possible loss of data (on tolower) * C4267: 'initializing': conversion from 'size_t' to 'unsigned int', possible loss of data * C4702: unreachable code (after Fatal) * C4706: assignment within conditional expression * C4996: 'strcpy': This function or variable may be unsafe
* | | | | Ignore clangd filesJan Niklas Hasse2020-12-041-0/+4
| | | | |
* | | | | Merge pull request #1866 from jhasse/unique-edge-idsJan Niklas Hasse2020-12-037-23/+34
|\ \ \ \ \ | | | | | | | | | | | | Add unique IDs to edges
| * | | | | Add unique IDs to edgesColin Cross2020-10-307-23/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edges are nominally ordered by order in the build manifest, but in fact are ordered by memory address. In most cases the memory address will be monontonically increasing. Since serialized build output will need unique IDs, add a monotonically increasing ID to edges, and use that for sorting instead of memory address.
* | | | | | Merge pull request #1792 from neheb/decJan Niklas Hasse2020-12-033-7/+9
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | [clang-tidy] fix inconsistent declarations
| * | | | | [clang-tidy] fix inconsistent declarationsRosen Penev2020-12-023-7/+9
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Found with readability-inconsistent-declaration-parameter-name Signed-off-by: Rosen Penev <rosenp@gmail.com>
* | | | | Merge pull request #1887 from mjguzik/freebsd_cpusetJan Niklas Hasse2020-12-011-1/+12
|\ \ \ \ \ | | | | | | | | | | | | Add FreeBSD support to GetProcessorCount
| * | | | | Add FreeBSD support to GetProcessorCountMateusz Guzik2020-11-301-1/+12
|/ / / / /
* | | | | 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