summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* browse.py: allow port override via environment variablePeter Wu2016-02-252-2/+3
|
* Merge pull request #1110 from G4m4/explicit_std_prefixNico Weber2016-02-171-1/+1
|\ | | | | Fix ambiguous call to set_terminate on Windows platform
| * Fix ambiguous call to set_terminate on Windows platformg4m42016-02-171-1/+1
|/ | | | | | | On Windows set_terminate() could either be the standard C++ one or (actually the same one but in the global namespace) the CRT one declared in corecrt_terminate.h Hence this ambiguity - this patch solves it. Signed-off-by: g4m4 <misept.dieseneuf@gmail.com>
* Merge pull request #1107 from nicolasdespres/ninja_syntax_implicit_outputsNico Weber2016-02-072-1/+13
|\ | | | | Add support for implicit outputs in ninja_syntax.py.
| * Add support for implicit outputs in ninja_syntax.py.Nicolas Despres2016-02-062-1/+13
| |
* | Merge pull request #1108 from edbaunton/patch-1Nico Weber2016-02-071-2/+2
|\ \ | |/ |/| Add link to mailing list
| * Add link to mailing listEd Baunton2016-02-061-2/+2
|/ | | As a convenience to new users, provide a link to the mailing list.
* Merge pull request #1106 from nico/winfixNico Weber2016-02-051-5/+3
|\ | | | | win: Only drop /showIncludes in bootstrap builds.
| * win: Only drop /showIncludes in bootstrap builds.Nico Weber2016-02-051-5/+3
| | | | | | | | Fixes #1103.
* | Merge pull request #1101 from fbenkstein/vs2010Nico Weber2016-02-051-0/+2
|\ \ | | | | | | disable warning about conditional expressions
| * | MSVC: disable warning about constant conditional expressionsFrank Benkstein2016-02-051-0/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | The standard headers for Visual Studio 2008 generate a warning about constant conditional expressions when compiled with exception support disabled. This is caused by the _CATCH_ALL macro in xstddef which is defined thusly: #ifdef _HAS_EXCEPTIONS #define _CATCH_ALL } catch (...) { #else #define _CATCH_ALL } if (0) { #endif
* | Merge pull request #1100 from nico/docNico Weber2016-02-031-9/+5
|\ \ | | | | | | Minor updates to the manual.
| * | Minor updates to the manual.Nico Weber2016-02-031-9/+5
| | | | | | | | | | | | | | | | | | | | | * Update link to Chromium's ninja docs (fixes #1038) * Update cmake URL to what it redirects to, and mention that ninja is well-supported on all platforms in newer CMake versions. * Let "others" link to the wiki page listing generators.
* | | Merge pull request #1033 from colincross/failedNico Weber2016-02-031-2/+9
|\ \ \ | | | | | | | | Print output file on failure
| * | | Print output file on failureColin Cross2015-10-051-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify the FAILED: output to provide the output files that failed to build, followed by the failed command on the next line. This makes the failure much easier to read, as you can immediately see much shorter name of the file that failed instead of trying to parse a very long command line. It also makes manually re-running the failed command much easier because you can copy the whole line without ending up with the FAILED: prefix.
* | | | Merge pull request #989 from bradking/implicit-outputsNico Weber2016-02-037-3/+148
|\ \ \ \ | |_|/ / |/| | | Add support for build statement implicit outputs
| * | | Add support for build statement implicit outputsBrad King2016-02-037-3/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some build rules produce outputs that are not mentioned on the command line but that should be part of the build graph. Such outputs should not be named in the `$out` variable. Extend the build statement syntax to support specification of implicit outputs using the syntax `| out1 out2` after the explicit outputs and before the `:`. For example, compilation of a Fortran source file `foo.f90` that defines `MODULE FOO` may now be specified as: rule fc command = f95 -c $in -o $out build foo.o | foo.mod: fc foo.f90 The `foo.mod` file is an implicit output generated by the compiler based on the content of the source file and not mentioned on the command line.
* | | | Merge pull request #1060 from bradking/deduplicate-disk-interfaceNico Weber2016-02-0312-91/+99
|\ \ \ \ | | | | | | | | | | Deduplicate disk abstraction infrastructure
| * | | | Replace ManifestParser::FileReader with general FileReaderBrad King2016-02-035-63/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid having two separate filesystem interfaces. Simplify test infrastructure by avoiding custom `ManifestParser::FileReader` implementations.
| * | | | Expose more details in FileReader::ReadFile signatureBrad King2016-02-037-24/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return a status so callers can distinguish a missing file from an empty file. This allows our VirtualFileSystem test infrastructure to report as missing any file for which it has no entry.
| * | | | Factor a `FileReader` base class out of `DiskInterface`Brad King2016-02-031-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Some clients will need only the ability to read files, so provide this as a more narrow interface than the full disk interface.
* | | | | Merge pull request #1099 from bradking/fix-perftest-compilationNico Weber2016-02-032-2/+2
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | perftest: fix compilation after dupe_edge_should_err change
| * | | perftest: fix compilation after dupe_edge_should_err changeBrad King2016-02-022-2/+2
| | | | | | | | | | | | | | | | | | | | Fix some ManifestParser constructor calls missed by commit 56bab441b7 (dupe_edge_should_err from bool to enum, 2016-01-27).
* | | | Merge pull request #1076 from colincross/canonicalizeNico Weber2016-02-022-18/+18
|\ \ \ \ | |/ / / |/| | | Canonicalize "." to "."
| * | | Canonicalize "." to "."Colin Cross2015-12-162-18/+18
| | | | | | | | | | | | | | | | | | | | "." is a legal path, if the string is empty after canonicalization return ".".
* | | | Merge pull request #1096 from sgraham/dupe-edge-actionNico Weber2016-01-295-54/+61
|\ \ \ \ | | | | | | | | | | dupe_edge_should_err from bool to enum
| * | | | dupe_edge_should_err from bool to enumScott Graham2016-01-275-54/+61
| | | | |
* | | | | Merge pull request #1098 from shinh/keepdepNico Weber2016-01-294-8/+19
|\ \ \ \ \ | |/ / / / |/| | | | Add -d keepdepfile to preserve depfiles
| * | | | Add -d keepdepfile to preserve depfilesShinichiro Hamaji2016-01-284-8/+19
|/ / / / | | | | | | | | | | | | | | | | This is useful when you are developing a tool which generates GCC-style depfiles.
* | | | Merge pull request #1095 from sgraham/dupbuild-errNico Weber2016-01-274-47/+63
|\ \ \ \ | | | | | | | | | | Make dupbuild=err work in subninja
| * | | | Make dupbuild=err work in subninjaScott Graham2016-01-274-47/+63
|/ / / /
* | | | Merge pull request #1094 from sphawk/masterNico Weber2016-01-271-1/+1
|\ \ \ \ | | | | | | | | | | fix for localized version of cl.exe
| * | | | fix for localized version of cl.exesphawk2016-01-251-1/+1
| | | | |
* | | | | Merge pull request #1085 from tetsuok/remove-unnecessary-stdNico Weber2016-01-275-11/+11
|\ \ \ \ \ | |/ / / / |/| | | | Remove unnecessary `std::`
| * | | | Remove unnecessary `std::`Tetsuo Kiso2016-01-105-11/+11
| | | | |
* | | | | Merge pull request #1086 from tetsuok/use-container-based-infra-for-ciEvan Martin2016-01-101-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | Use container-based infrastructure for travis-ci.
| * | | | Use container-based infrastructure for travis-ci.Tetsuo Kiso2016-01-101-0/+1
|/ / / / | | | | | | | | | | | | To start up faster.
* | | | Merge pull request #1073 from ninja-build/manual-fontNico Weber2015-12-291-6/+0
|\ \ \ \ | | | | | | | | | | use the default font size for manual headings
| * | | | use the default font size for manual headingsEvan Martin2015-12-161-6/+0
| | |/ / | |/| | | | | | | | | | | | | | | | | | The third-level subsection headings were almost indistinguishable from the second-level ones. Fix this by just using the default styling.
* | | | Merge pull request #1074 from ninja-build/manual-commandNico Weber2015-12-291-6/+24
|\ \ \ \ | | | | | | | | | | add a section to the manual discussion the command= variable
| * | | | add a section to the manual discussing the command= variableEvan Martin2015-12-161-6/+24
| |/ / / | | | | | | | | | | | | | | | | This includes a mention of using cmd /c on Windows. This would have helped on issue #1070 for example.
* | | | Merge pull request #1082 from nicolasdespres/zshcomp-intermediary-targetsNico Weber2015-12-291-3/+2
|\ \ \ \ | | | | | | | | | | Teach zsh to complete intermediary targets.
| * | | | Teach zsh to complete intermediary targets.Nicolas Despres2015-12-241-3/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bash completion script uses "-t targets all" to list the target which is faster than "-t targets" and reports intermediary targets (see the manual entry for the 'targets' tool). See commit fc135c45.
* | | | Merge pull request #1069 from nicolasdespres/dry_manifest_regenEvan Martin2015-12-091-0/+4
|\ \ \ \ | | | | | | | | | | Do not attempt to rebuild infinitely in dry-run mode.
| * | | | Do not attempt to rebuild infinitely in dry-run mode.Nicolas Despres2015-12-091-0/+4
|/ / / /
* | | | Merge pull request #1042 from avallee/masterEvan Martin2015-12-062-2/+9
|\ \ \ \ | | | | | | | | | | Fix wrapping file paths in Writer.comment
| * | | | Disable long word wrapping entirely in comments.Alex Vallée2015-11-272-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As pointed out by nico, we should unconditionally disable breaking of long words in comments. It is unlikely long words that are in comments should be split (like pathnames).
| * | | | Fix indent in pull request #1042.Alex Vallee2015-11-121-1/+1
| | | | |
| * | | | Fix wrapping file paths in Writer.commentAlex Vallée2015-10-232-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Long file names, especially with hyphens will get incorrectly wrapped by the comment method. Pass has_path=True to prevent this type of wrapping. This is mainly so that longer path names can show up in comments on their on line without breaking them up.
* | | | | Merge pull request #1062 from tfarina/bindings-typedefEvan Martin2015-12-062-3/+3
|\ \ \ \ \ | | | | | | | | | | | | make use of Bindings typedef