summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Simplify. No behavior change.Nico Weber2015-03-101-2/+1
|
* Merge pull request #917 from pinotree/rlimitNico Weber2015-03-091-2/+2
|\ | | | | subprocess_test: gracefully handle rlim.rlim_cur < kNumProcs
| * subprocess_test: gracefully handle rlim.rlim_cur < kNumProcsPino Toscano2015-02-281-2/+2
| | | | | | | | | | | | Instead of expecting that the number of open files is well above kNumProcs, simply "skip" the test in that case, still printing the message about the test limit (adding the current system limit too).
* | Merge pull request #910 from jlnt/masterNico Weber2015-03-092-5/+33
|\ \ | | | | | | POSIX: detach background subprocesses from terminal.
| * | POSIX: detach background subprocesses from terminal.Julien Tinnes2015-01-292-5/+33
| | | | | | | | | | | | | | | | | | | | | | | | Put background subprocesses (i.e. subprocesses with no access to the console) in their own session and detach them from the terminal. This fixes martine/ninja#909.
* | | Merge pull request #927 from nico/colorgccNico Weber2015-03-091-3/+6
|\ \ \ | | | | | | | | Make diagnostics colored with new gccs (4.9+) too.
| * | | Make diagnostics colored with new gccs (4.9+) too.Nico Weber2015-03-091-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | Both clang and gcc understand -fdiagnostics-color, so use that flag name. (This will disable colored diagnostics for clangs older than LLVM 3.3, but that is several years old by now.)
* | | | Merge pull request #926 from nico/fixlibcppNico Weber2015-03-091-29/+29
|\ \ \ \ | |/ / / |/| | | Fix build with libc++ after #921.
| * | | Fix build with libc++ after #921.Nico Weber2015-03-091-29/+29
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | It failed with error: field has incomplete type 'EvalString' note: in instantiation of exception specification for 'map' requested here explicit Rule(const string& name) : name_(name) {} ^
* | | Merge pull request #921 from mohamed/masterNico Weber2015-03-0910-87/+117
|\ \ \ | | | | | | | | Allow scoping rules through subninja
| * | | Added a new test to illustrate scoped rulesMohamed Bamakhrama2015-03-081-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | The new test shows the added value of scoped rules by demonstrating a multi-level build where a single rules file gets included at all the levels. By scoping rules, this is possible.
| * | | Allow scoping rules through subninjaMohamed Bamakhrama2015-03-0110-87/+104
| | |/ | |/| | | | | | | | | | | | | | | | | | | Ninja didn't support scoping rules through subninja and assumed a unique rule name in the whole namespace. With this change, this behavior is changed to allow scoping rules. Two rules can have the same name if they belong to two different scopes. However, two rules can NOT have the same name in the same scope.
* | | Merge pull request #925 from kirbyfan64/masterNico Weber2015-03-091-2/+6
|\ \ \ | | | | | | | | Test for Clang by checking --version
| * | | Test for Clang by checking --versionRyan Gonzalez2015-03-091-2/+6
|/ / /
* | | Merge pull request #923 from HeisSpiter/masterNico Weber2015-03-081-1/+1
|\ \ \ | |/ / |/| | Directly pass the string instead of char * to Truncate util function. It...
| * | Directly pass the string instead of char * to Truncate util function. It ↵Pierre Schweitzer2015-03-071-1/+1
|/ / | | | | | | will prevent useless conversions.
* | Merge pull request #914 from tzik/typo_fixNico Weber2015-02-071-1/+1
|\ \ | | | | | | Typo fix in graph.cc
| * | Typo fix in graph.cctzik2015-02-061-1/+1
|/ /
* | Merge pull request #908 from colincross/multipassNico Weber2015-02-031-14/+13
|\ \ | |/ |/| Allow manifest rebuild to loop up to 100 times
| * Allow manifest rebuild to loop up to 100 timesColin Cross2015-02-031-14/+13
|/ | | | | | | | | Ninja generators that bootstrap themselves with Ninja may need to rebuild build.ninja multiple times. Replace the 2 cycle loop with a 100 cycle loop, and print the pass number each time it restarts. Original-author: Jamie Gennis <jgennis@gmail.com>
* Merge pull request #897 from tzik/pendingNico Weber2015-01-241-0/+21
|\ | | | | Check pending SIGINT after ppoll/pselect
| * Check pending SIGINT after ppoll/pselectTaiju Tsuiki2015-01-191-0/+21
| | | | | | | | | | | | | | | | | | ppoll/pselect prioritizes file descriptor events over a signal delivery. So a flood of events prevents ninja from reacting keyboard interruption by the user. This CL adds a check for pending keyboard interruptions after file descriptor events.
* | Merge pull request #903 from nico/gcovNico Weber2015-01-211-0/+16
|\ \ | | | | | | Document how to run gcov on ninja.
| * | Document how to run gcov on ninja.Nico Weber2015-01-211-0/+16
|/ /
* | Merge pull request #901 from nico/assertlessNico Weber2015-01-202-1/+10
|\ \ | | | | | | Remove an incorrect assert.
| * | Remove an incorrect assert.Nico Weber2015-01-202-1/+10
|/ / | | | | | | | | | | The assert fires on cyclic manifests (found by afl-fuzz). Since there was explicit error handing for this case already, just remove the assert.
* | Merge pull request #894 from tfarina/has-indentNico Weber2015-01-141-4/+4
|\ \ | |/ |/| Cleanup: Fix 'hasIdent' variable name/style.
| * Cleanup: Fix 'hasIdent' variable name/style.Thiago Farina2015-01-101-4/+4
| | | | | | | | | | | | | | Seems more correct to name it has_indent_token and to use the unix_hacker style. Signed-off-by: Thiago Farina <tfarina@chromium.org>
* | Merge pull request #889 from nico/del2Nico Weber2015-01-041-3/+3
|\ \ | | | | | | Try to simplify d1e6a29 a bit.
| * | Try to simplify d1e6a29 a bit.Nico Weber2015-01-041-3/+3
|/ /
* | Merge pull request #888 from nico/delNico Weber2015-01-041-9/+0
|\ \ | | | | | | Remove unused hash<std::string>.
| * | Remove unused hash<std::string>.Nico Weber2015-01-041-9/+0
|/ / | | | | | | | | ExternalStringHashMap used to store std::strings long ago. Since it doesn't anymore, this specialization isn't needed. No behavior change.
* | Merge pull request #887 from berenm/masterNico Weber2015-01-043-4/+23
|\ \ | |/ |/| Fix compilation errors on Visual Studio 2015 (_MSC_VER 1900)
| * Fix compilation errors on Visual Studio 2015 (_MSC_VER 1900).Beren Minor2014-12-313-4/+23
|/
* Merge pull request #884 from nico/sshhNico Weber2014-12-256-13/+2
|\ | | | | Remove 'Recompacting...' messages.
| * Remove 'Recompacting...' messages.Nico Weber2014-12-186-13/+2
| | | | | | | | | | | | | | | | | | | | Recompacting the build log used to be slow, so it made sense to print this message. We then made recompaction much faster, but didn't remove this message back then. The deps log only has it because the build log had it. Since both steps are effectively instant in practice, remove these log messages.
* | Merge pull request #885 from frasercrmck/zsh_comp_modesNico Weber2014-12-221-1/+1
|\ \ | | | | | | zsh-completion: remove use of 'head' with negative offset
| * | zsh-completion: remove use of 'head' with negative offsetFraser Cormack2014-12-201-1/+1
|/ / | | | | | | | | | | | | | | | | | | Some systems - like OSX - don't come with a version of head that supports a negative value for the -n flag. Such systems get a message such as this when tab-completing ninja's -d flag: ninja -dhead: illegal line count -- -1 Using sed instead should be more universally supported.
* | Merge pull request #882 from mathstuf/verbose-configureNico Weber2014-12-111-4/+13
|\ \ | |/ |/| configure: add a verbose mode
| * configure: add a verbose modeBen Boeckel2014-12-111-4/+13
|/ | | | | Required for Fedora infrastructure so that the commands used to build ninja are logged.
* Merge pull request #881 from nico/depscancyclesNico Weber2014-12-093-4/+89
|\ | | | | Let DependencyScan::RecomputeDirty() work correclty with cyclic graphs.
| * Let DependencyScan::RecomputeDirty() work correclty with cyclic graphs.Nico Weber2014-12-083-4/+89
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RecomputDirty(edge) currently works roughly like this: RecomputeDirty(edge): LoadDeps(edge) for in in edge.inputs: if in.StatIfNecessary(): RecomputeDirty(in.in_edge) # recurse into inputs for out in edge.outputs: out.StatIfNecessary() # mark outputs as visited It uses the stat state of each node to mark nodes as visited and doesn't traverse across nodes that have been visited already. For cyclic graphs with an edge with multiple outputs on the cycle, nothing prevents an edge to be visited more than once if the cycle is entered through an output that isn't on the cycle. In other words, RecomputeDirty() for the same edge can be on the call stack more than once. This is bad for at least two reasons: 1. Deps are added multiple times, making the graph confusing to reason about. 2. LoadDeps() will insert into the inputs_ of an edge that's iterated over in a callframe higher up. This can invalidate the iterator, which causes a crash when the callframe with the loop over the now-invalidated iterator resumes. To fix this, let RecomputeDirty() mark all outputs of an edge as visited as the first thing it does. This way, even if the edge is on a cycle with several outputs, each output is already marked and no edge will have its deps loaded more than once. Fixes the crashes in #875. (In practice, it turns the crashes into "stuck [this is a bug]" messages for now, due to the example without duplicate rules in #867)
* Rename a few iterators. No behavior change.Nico Weber2014-12-072-67/+67
| | | | | | | | | It confused me that the iterator iterating over `outputs_` was called `i` -- this always made me think of "input", not "iterator". Call iterators over edge outputs "o", iterators over edge inputs "i", iterators over node input edges "oe", and general iterators over edges "e".
* remove two unneeded `explicit`sNico Weber2014-12-072-3/+3
|
* Merge pull request #703 from ovinn/masterNico Weber2014-12-041-0/+1
|\ | | | | Added *.obj ignore rule
| * Added *.obj ignoreOliver Vinn2014-01-131-0/+1
| |
* | Merge pull request #835 from rainlabs-eu/fix-cygwin-compatibilityNico Weber2014-12-041-1/+4
|\ \ | | | | | | Fixed cygwin compatibility (issue #806)
| * | Fixed cygwin compatibility (issue #806)kwesolowski2014-10-251-1/+4
| | | | | | | | | | | | Fixed platform specific issues causing cygwin build to fail.
* | | Rename num_collisions to collision_count.Nico Weber2014-12-041-3/+3
| | | | | | | | | | | | | | | All other counting variables are called foo_count, not num_foos. No behavior change.
* | | Merge pull request #868 from Fanael/ninja-mode.el-refactorNico Weber2014-12-041-22/+21
|\ \ \ | | | | | | | | Remove unneeded save-excursion.