summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2293 from digit-google/fix-ppoll-auto-detectionHEADmasterJan Niklas Hasse2023-05-111-2/+10
|\ | | | | CMakeLists: Fix ppoll() feature detection.
| * CMakeLists: Fix ppoll() feature detection.David 'Digit' Turner2023-05-101-2/+10
|/ | | | | | | | Use check_cxx_symbol_exists() instead of check_symbol_exists() for the subtle reason explained in the comment added in this patch. Change-Id: Id949b8f2c7af39eeef3a848d3bdbc7639432f38a
* Merge pull request #2281 from Hi-Angel/improve-ninja-modeJan Niklas Hasse2023-04-211-6/+31
|\ | | | | emacs: improve ninja-mode
| * ninja-mode.el: add support for indentationKonstantin Kharlamov2023-03-281-5/+30
| | | | | | | | | | | | | | | | | | | | | | We default `ninja-indent-offset` to `2` because Meson and CMake use `1` and `2` values accordingly, but `1` seems like too little, so use `2`. The correctness was tested in particular on two `build.ninja` files, one generated by Meson (1790 lines), and another by CMake (7777 lines). After setting `ninja-indent-offset` to the expected by the file value and re-indenting whole file the buffer was left unchanged, i.e. the calculated offset matched the ones already used.
| * ninja-mode.el: fix variables highlightingKonstantin Kharlamov2023-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The code previously did not take into account that between the name and assignment may be any number of space including no space at all. It was also incorrectly highlighting in a code like foo = bar = buzz the `bar` as a variable, even though the `bar = buzz` is just a text that gets assigned to `foo`, i.e. `bar` is not a variable. Fix that.
* | Merge pull request #2282 from arxanas/patch-4Jan Niklas Hasse2023-04-211-6/+5
|\ \ | | | | | | Fix formatting for `msvc` tool documentation
| * | Fix formatting for `msvc` tool documentationWaleed Khan2023-03-311-6/+5
| |/
* | Merge pull request #2290 from digit-google/use-ppollJan Niklas Hasse2023-04-211-0/+11
|\ \ | | | | | | Enable ppoll() usage when available.
| * | Enable ppoll() usage when available.David 'Digit' Turner2023-04-211-0/+11
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch modifies the CMakeLists.txt file to probe for ppoll() on the target system, and define -DUSE_PPOLL=1 if it is available. This can be disabled by setting -DNINJA_FORCE_PSELECT=ON when invoking CMake. This matches the default behavior of the configure.py script (and its `--force-pselect` option). Note that there is no noticeable performance difference before build commands are launched, so this change is very hard to benchmark properly. Fix for https://github.com/ninja-build/ninja/issues/1821
* | Increment ninja_log version (#2240)Junji Watanabe2023-04-182-25/+33
|/ | | | | | | | | | | * Increment ninjg_log version * fix test * remove code for ninjg_log version 4 * line length * split error messages
* Clean up Windows workflow and add an x86 build (#2251)Nikhil Dabas2023-02-071-44/+15
| | | | | | | | | * Clean up Windows workflow, add support for x86 * Sensible naming for artifacts No suffix for the x64 version, as that was the default already. * Remove x86 build from Windows workflow
* Merge pull request #2245 from scivision/cimacJan Niklas Hasse2023-01-311-2/+2
|\ | | | | CI:macos package with macos 12 for macos >= 10.15
| * ci:macos package with macos 12 for macos >= 10.15scivision2023-01-241-2/+2
| | | | | | | | | | when this parameter was added, it was also for the last version that recently went end of life
* | Merge pull request #2250 from tocic/fix/docs_typosJan Niklas Hasse2023-01-312-11/+11
|\ \ | |/ |/| Fix typos in docs
| * Fix typos in docstocic2023-01-272-11/+11
|/
* Merge pull request #2235 from orgads/no-auto-ptrJan Niklas Hasse2023-01-151-5/+1
|\ | | | | Remove auto_ptr
| * Remove auto_ptrOrgad Shaneh2023-01-141-5/+1
|/ | | | C++11 is now a hard requirement.
* Use python3 in all run linesNico Weber2023-01-105-11/+5
| | | | | We already did this in some, this converts the rest. Also chmod +x on write_fake_manifests.py while here.
* Merge pull request #2143 from orgads/flushJan Niklas Hasse2022-12-262-0/+2
|\ | | | | Flush output after each line
| * Flush output after each lineOrgad Shaneh2022-06-072-0/+2
| | | | | | | | The output is not flushed automatically after \n, at least on Windows 10.
* | Merge pull request #2225 from cristianadam/longpathJan Niklas Hasse2022-12-151-0/+1
|\ \ | | | | | | Add longPathAware manifest to enable long paths on Windows
| * | Add longPathAware manifest to enable long paths on WindowsCristian Adam2022-12-131-0/+1
| | | | | | | | | | | | Fixes: #1900
* | | Add overridable parameter for name of Python binary (#2224)William Kent2022-12-131-1/+3
|/ / | | | | | | | | | | | | | | | | * Add overridable parameter for name of Python binary On macOS, python is not an available command any more. python3 is. * Use option() as requested * Store variable in different way
* | Merge pull request #2160 from zmodem/fix_FindFirstFileExANico Weber2022-12-092-1/+13
|\ \ | | | | | | Handle ERROR_DIRECTORY when calling FindFirstFileExA
| * | Handle ERROR_DIRECTORY when calling FindFirstFileExAHans Wennborg2022-07-122-1/+13
| | | | | | | | | | | | | | | | | | | | | If a directory referenced by .ninja_deps has changed to a regular file since the last build, FindFirstFileExA will return ERROR_DIRECTORY. Fixes #2159
* | | Merge pull request #2208 from ThadHouse/winarmciJan Niklas Hasse2022-11-091-0/+40
|\ \ \ | | | | | | | | Add build job for Windows Arm64
| * | | Add build job for Windows Arm64Thad House2022-10-311-0/+40
|/ / /
* | | Merge pull request #2020 from randomascii/steady_clock_now_goodJan Niklas Hasse2022-10-312-49/+36
|\ \ \ | | | | | | | | Make ScopedMetric portable, accurate, and efficient
| * | | Revert configure.py changeBruce Dawson2022-10-241-0/+0
| | | |
| * | | Remove bad merge text from .md fileBruce Dawson2022-10-241-3/+0
| | | |
| * | | Merge branch 'master' into steady_clock_now_goodBruce Dawson2022-10-2431-223/+981
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #2086 from randomascii/compiler_detectJan Niklas Hasse2022-10-231-0/+9
|\ \ \ \ | | | | | | | | | | Detect whether VC++ compiler can be found in configure.py
| * \ \ \ Merge branch 'master' into compiler_detectJan Niklas Hasse2022-08-2224-194/+819
| |\ \ \ \
| * | | | | Fix function and parameter names, and commentBruce Dawson2022-03-091-4/+4
| | | | | |
| * | | | | Merge branch 'ninja-build:master' into compiler_detectBruce Dawson2022-02-171-11/+0
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ninja-build:master' into compiler_detectBruce Dawson2022-02-1635-222/+1141
| |\ \ \ \ \ \
| * | | | | | | Improve error messages when VS cannot be foundBruce Dawson2021-07-261-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first experience for most developers who start working on ninja is this cryptic error message: bootstrapping ninja... Traceback (most recent call last): File "configure.py", line 329, in <module> if platform.msvc_needs_fs(): File "configure.py", line 89, in msvc_needs_fs stderr=subprocess.PIPE) File "python\bin\lib\subprocess.py", line 394, in __init__ errread, errwrite) File "python\bin\lib\subprocess.py", line 644, in _execute_child startupinfo) WindowsError: [Error 2] The system cannot find the file specified This message happens when bootstrap.py first tries to invoke cl.exe and it cannot be found. This change looks for cl.exe and warns if it is not in the user's path, leading to this friendlier message: bootstrapping ninja... Traceback (most recent call last): File "configure.py", line 317, in <module> raise Exception('cl.exe not found. Run again from the Developer Command Prompt for VS') Exception: cl.exe not found. Run again from the Developer Command Prompt for VS
* | | | | | | | Merge pull request #2201 from martin-g/release-linux-aarch64Jan Niklas Hasse2022-10-231-0/+60
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add build job for Linux ARM64
| * | | | | | | | Add build job for Linux ARM64Martin Tzvetanov Grigorov2022-10-051-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Martin Tzvetanov Grigorov <mgrigorov@apache.org>
* | | | | | | | | Merge pull request #2203 from imaiguo/masterJan Niklas Hasse2022-10-234-4/+55
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | support 32bit system like i386 (#829)
| * | | | | | | | | support 32bit system like i386 (#829)Ma Aiguo2022-10-094-4/+55
| |/ / / / / / / /
* | | | | | | | | Merge pull request #2188 from ninja-build/nico-patch-1Jan Niklas Hasse2022-10-231-1/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove requirement for Google copyright from CONTRIBUTING
| * | | | | | | | | Remove requirement for Google copyright from CONTRIBUTINGNico Weber2022-08-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should keep the Google copyright on files authored by people at Google, but for new files added by people not at Google, this really isn't necessary. (Someone from open-source compliance at Google reached out to me and suggested removing this line.)
* | | | | | | | | | Merge pull request #2204 from picsel2/re2c-required-versionJan Niklas Hasse2022-10-181-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | Increase version check of re2c to 0.15.3
| * | | | | | | | | Increase required version of re2c to 0.15.3Sebastian Grabowski2022-10-111-2/+2
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `--no-version` command line argument was introduced with re2c v0.15.3. See https://re2c.org/releases/changelog/changelog.html
* | | | | | | | | Merge pull request #2191 from pseyfert/feature/zsh-completion-quiet-flagJan Niklas Hasse2022-09-051-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add --quiet flag to zsh completion
| * | | | | | | | | Add --quiet flag to zsh completionPaul Seyfert2022-09-041-1/+2
|/ / / / / / / / /
* | | | | | | | | Convert RELEASING to Markdown and add instruction for GitHub releaseJan Niklas Hasse2022-08-301-14/+22
| | | | | | | | |
* | | | | | | | | Merge pull request #2101 from ken-matsui/patch-1Jan Niklas Hasse2022-08-301-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Avoid shadowing `time_millis_`, the field of `StatusPrinter`
| * | | | | | | | | Avoid shadowing `time_millis_`, the field of `StatusPrinter`Ken Matsui2022-03-161-2/+2
| | | | | | | | | |
View Lorry Controller Status