Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' | Demetri Obenour | 2014-05-31 | 15 | -71/+135 |
|\ | |||||
| * | Merge pull request #770 from debfx/master | Evan Martin | 2014-05-30 | 1 | -2/+2 |
| |\ | | | | | | | Use unversioned gnukfreebsd platform. | ||||
| | * | Use unversioned gnukfreebsd platform. | Felix Geyer | 2014-05-30 | 1 | -2/+2 |
| |/ | |||||
| * | Merge pull request #769 from nico/plus | Nico Weber | 2014-05-30 | 2 | -2/+3 |
| |\ | | | | | | | Allow + in filenames without escaping | ||||
| | * | Allow + in filenames without escaping | Nico Weber | 2014-05-30 | 2 | -2/+3 |
| |/ | | | | | | | | | | | Due to #690, file.c++ used to be escaped. + seems as safe as -, so allow it to not be escaped, to keep compile command lines with a fairly common extension slightly cleaner. | ||||
| * | Merge pull request #768 from nico/vimsyn | Nico Weber | 2014-05-30 | 1 | -2/+4 |
| |\ | | | | | | | vim syntax: Correctly highlight $$a as ($$)a instead of $($a). | ||||
| | * | vim syntax: Correctly highlight $$a as ($$)a instead of $($a). | Nico Weber | 2014-05-13 | 1 | -2/+4 |
| | | | |||||
| * | | Merge pull request #767 from nico/esc_deprspfile | Nico Weber | 2014-05-29 | 7 | -35/+99 |
| |\ \ | | | | | | | | | Make "depfile=$out.d" work if $out contains escaped characters, rspfile ... | ||||
| | * | | reword manual for depfile/rspfile escaping change | Nico Weber | 2014-05-24 | 1 | -9/+7 |
| | | | | |||||
| | * | | Make "depfile=$out.d" work if $out contains escaped characters, rspfile too. | Nico Weber | 2014-05-21 | 7 | -32/+98 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #730. This has always been broken, but due to #690 more paths are now escaped (e.g. paths containing + characters, like file.c++). Also see discussion in #689. The approach is to give EdgeEnv an enum deciding on whether or not to escape file names, and provide functions that evaluate depfile and rspfile with that set that to kNoEscape. (depfile=$out.d doesn't make sense on edges with multiple outputs.) This should be relatively safe, as $in and $out can't be used on edges, only on rules (#687). | ||||
| * | | Merge pull request #766 from nico/cleanup | Nico Weber | 2014-05-21 | 1 | -6/+2 |
| |\ \ | | | | | | | | | CleanTest cleanups: | ||||
| | * | | CleanTest cleanups: | Nico Weber | 2014-05-21 | 1 | -6/+2 |
| |/ / | | | | | | | | | | | | | * $in only makes sense on rules, not edges (see issue #687) * Remove unneccesary clear() line at end of test | ||||
| * | | Merge pull request #764 from nico/winconsole | Nico Weber | 2014-05-18 | 6 | -24/+25 |
| |\ \ | | | | | | | | | Implement pool=console support on Windows. | ||||
| | * | | win console wip: Fix comments based on review feedback. | Nico Weber | 2014-05-18 | 2 | -2/+2 |
| | | | | |||||
| | * | | win console wip: resolve FIXME | Nico Weber | 2014-05-14 | 2 | -1/+2 |
| | | | | |||||
| | * | | win console wip: ctrl-c should reach commands running in console pools | Nico Weber | 2014-05-13 | 1 | -1/+4 |
| | | | | |||||
| | * | | win console wip: enable test | Nico Weber | 2014-05-13 | 1 | -4/+2 |
| | | | | |||||
| | * | | wip for console pool on windows | Nico Weber | 2014-05-13 | 5 | -19/+18 |
| | |/ | |||||
* | | | Added test of international character support | Demetri Obenour | 2014-05-08 | 2 | -29/+36 |
| | | | |||||
* | | | Added support for international characters in makefile dependency names | Demetri Obenour | 2014-05-08 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #761 from maximuska/proposed/depfile_parser_fixes | Nico Weber | 2014-05-08 | 3 | -6/+10 |
|\ \ | | | | | | | Allow paths with '{' '}' in depfiles | ||||
| * | | Allow paths with '{' '}' in depfiles | Maxim Kalaev | 2014-05-07 | 3 | -6/+10 |
|/ / | |||||
* | | Merge pull request #756 from ronnychevalier/rc/zsh_completion | Nico Weber | 2014-05-05 | 1 | -3/+44 |
|\ \ | | | | | | | improve zsh completion | ||||
| * | | improve zsh completion | Ronny Chevalier | 2014-05-04 | 1 | -3/+44 |
| | | | |||||
* | | | Merge pull request #758 from mathstuf/dev/fix-compdb-abort | Nico Weber | 2014-05-05 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | compdb: check that inputs is not empty | ||||
| * | | | compdb: check that inputs is not empty | Ben Boeckel | 2014-05-05 | 1 | -0/+2 |
|/ / / | |||||
* | | | Merge pull request #757 from cjdrake/master | Nico Weber | 2014-05-05 | 1 | -18/+17 |
|\ \ \ | |/ / |/| | | Stylistic changes to ninja_syntax.py | ||||
| * | | Get rid of unused import | Chris Drake | 2014-05-05 | 1 | -1/+0 |
| | | | |||||
| * | | Use consistent indentation conventions | Chris Drake | 2014-05-05 | 1 | -17/+17 |
|/ / | |||||
* | | Merge pull request #753 from nico/nlacc | Nico Weber | 2014-05-01 | 3 | -8/+21 |
|\ \ | |/ |/| | Accept \r\n line endings in depfiles. | ||||
| * | Accept \r\n line endings in depfiles. | Nico Weber | 2014-05-01 | 3 | -8/+21 |
|/ | | | | Fixes #752. | ||||
* | Merge pull request #748 from nocnokneo/bash-completion-for-f-and-C | Nico Weber | 2014-04-30 | 1 | -3/+20 |
|\ | | | | | Support completion of arguments to -f and -C options | ||||
| * | Fix getopts barfing over the terminal when trying to complete -f and -C | Taylor Braun-Jones | 2014-04-30 | 1 | -1/+1 |
| | | | | | | | | | | Note that this is only applicable for when bash_completion is unavailable. | ||||
| * | Support completion of arguments to -f and -C options | Taylor Braun-Jones | 2014-04-30 | 1 | -2/+19 |
|/ | | | | Note: This is only available for bash_completion users. | ||||
* | Merge pull request #750 from nico/perfwin | Nico Weber | 2014-04-27 | 1 | -1/+3 |
|\ | | | | | Make manifest_parser_perftest build on Windows. | ||||
| * | Make manifest_parser_perftest build on Windows. | Nico Weber | 2014-04-27 | 1 | -1/+3 |
|/ | |||||
* | Merge pull request #747 from nocnokneo/master | Nico Weber | 2014-04-25 | 1 | -16/+17 |
|\ | | | | | Fix bash-completion support for -C option to expand tilde | ||||
| * | Style: Fix inconsistent indentation | Taylor Braun-Jones | 2014-04-25 | 1 | -17/+17 |
| | | |||||
| * | Fix bash-completion support for -C option to expand tilde | Taylor Braun-Jones | 2014-04-25 | 1 | -1/+2 |
|/ | |||||
* | Merge pull request #714 from pcc/console-pool | Nico Weber | 2014-04-17 | 14 | -43/+213 |
|\ | | | | | Introduce the "console" pool | ||||
| * | Introduce the "console" pool | Peter Collingbourne | 2014-02-03 | 14 | -43/+213 |
| | | | | | | | | | | | | | | This is a pre-defined pool with a depth of 1. It has the special property that any task in the pool has direct access to the console. This can be useful for interactive tasks or long-running tasks which produce status updates on the console (such as test suites). | ||||
* | | Merge pull request #715 from nico/lazyenv | Nico Weber | 2014-04-17 | 1 | -4/+5 |
|\ \ | | | | | | | Allocate per-edge BindingEnvs lazily. | ||||
| * | | Allocate per-edge BindingEnvs lazily. | Nico Weber | 2014-02-11 | 1 | -4/+5 |
| |/ | | | | | | | | | | | | | In chrome, only 2000 of 22000 build edges have bindings. A BindingEnv is 64 bytes, so allocating these only when needed saves a bit over 1 MB of memory. Since env chains are shorter for lookups, builds also become a tiny bit faster. | ||||
* | | Merge pull request #742 from nico/maniperf | Nico Weber | 2014-04-17 | 3 | -4/+120 |
|\ \ | | | | | | | Add a manifest parsing perftest. | ||||
| * | | Manifest perftest: Try to make it build on Linux. | Nico Weber | 2014-04-17 | 1 | -0/+1 |
| | | | |||||
| * | | Manifest perftest: Pull manifest parsing into own function. | Nico Weber | 2014-04-17 | 1 | -17/+20 |
| | | | |||||
| * | | Add manifest_parser_perftest to .gitignore. | Nico Weber | 2014-04-17 | 1 | -1/+2 |
| | | | |||||
| * | | Manifest perftest: Also measure command evaluation time. | Nico Weber | 2014-04-17 | 1 | -5/+31 |
| | | | |||||
| * | | Add a simple manifest parsing perftest. | Nico Weber | 2014-04-17 | 2 | -3/+88 |
|/ / | |||||
* | | Merge pull request #741 from nicolasdespres/propagate-file-rename-to-gitignore | Nico Weber | 2014-04-16 | 1 | -1/+1 |
|\ \ | | | | | | | Propagate file rename to gitignore. |