summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Demetri Obenour2014-05-3115-71/+135
|\
| * Merge pull request #770 from debfx/masterEvan Martin2014-05-301-2/+2
| |\ | | | | | | Use unversioned gnukfreebsd platform.
| | * Use unversioned gnukfreebsd platform.Felix Geyer2014-05-301-2/+2
| |/
| * Merge pull request #769 from nico/plusNico Weber2014-05-302-2/+3
| |\ | | | | | | Allow + in filenames without escaping
| | * Allow + in filenames without escapingNico Weber2014-05-302-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/vimsynNico Weber2014-05-301-2/+4
| |\ | | | | | | vim syntax: Correctly highlight $$a as ($$)a instead of $($a).
| | * vim syntax: Correctly highlight $$a as ($$)a instead of $($a).Nico Weber2014-05-131-2/+4
| | |
| * | Merge pull request #767 from nico/esc_deprspfileNico Weber2014-05-297-35/+99
| |\ \ | | | | | | | | Make "depfile=$out.d" work if $out contains escaped characters, rspfile ...
| | * | reword manual for depfile/rspfile escaping changeNico Weber2014-05-241-9/+7
| | | |
| | * | Make "depfile=$out.d" work if $out contains escaped characters, rspfile too.Nico Weber2014-05-217-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/cleanupNico Weber2014-05-211-6/+2
| |\ \ | | | | | | | | CleanTest cleanups:
| | * | CleanTest cleanups:Nico Weber2014-05-211-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/winconsoleNico Weber2014-05-186-24/+25
| |\ \ | | | | | | | | Implement pool=console support on Windows.
| | * | win console wip: Fix comments based on review feedback.Nico Weber2014-05-182-2/+2
| | | |
| | * | win console wip: resolve FIXMENico Weber2014-05-142-1/+2
| | | |
| | * | win console wip: ctrl-c should reach commands running in console poolsNico Weber2014-05-131-1/+4
| | | |
| | * | win console wip: enable testNico Weber2014-05-131-4/+2
| | | |
| | * | wip for console pool on windowsNico Weber2014-05-135-19/+18
| | |/
* | | Added test of international character supportDemetri Obenour2014-05-082-29/+36
| | |
* | | Added support for international characters in makefile dependency namesDemetri Obenour2014-05-081-2/+2
|/ /
* | Merge pull request #761 from maximuska/proposed/depfile_parser_fixesNico Weber2014-05-083-6/+10
|\ \ | | | | | | Allow paths with '{' '}' in depfiles
| * | Allow paths with '{' '}' in depfilesMaxim Kalaev2014-05-073-6/+10
|/ /
* | Merge pull request #756 from ronnychevalier/rc/zsh_completionNico Weber2014-05-051-3/+44
|\ \ | | | | | | improve zsh completion
| * | improve zsh completionRonny Chevalier2014-05-041-3/+44
| | |
* | | Merge pull request #758 from mathstuf/dev/fix-compdb-abortNico Weber2014-05-051-0/+2
|\ \ \ | | | | | | | | compdb: check that inputs is not empty
| * | | compdb: check that inputs is not emptyBen Boeckel2014-05-051-0/+2
|/ / /
* | | Merge pull request #757 from cjdrake/masterNico Weber2014-05-051-18/+17
|\ \ \ | |/ / |/| | Stylistic changes to ninja_syntax.py
| * | Get rid of unused importChris Drake2014-05-051-1/+0
| | |
| * | Use consistent indentation conventionsChris Drake2014-05-051-17/+17
|/ /
* | Merge pull request #753 from nico/nlaccNico Weber2014-05-013-8/+21
|\ \ | |/ |/| Accept \r\n line endings in depfiles.
| * Accept \r\n line endings in depfiles.Nico Weber2014-05-013-8/+21
|/ | | | Fixes #752.
* Merge pull request #748 from nocnokneo/bash-completion-for-f-and-CNico Weber2014-04-301-3/+20
|\ | | | | Support completion of arguments to -f and -C options
| * Fix getopts barfing over the terminal when trying to complete -f and -CTaylor Braun-Jones2014-04-301-1/+1
| | | | | | | | | | Note that this is only applicable for when bash_completion is unavailable.
| * Support completion of arguments to -f and -C optionsTaylor Braun-Jones2014-04-301-2/+19
|/ | | | Note: This is only available for bash_completion users.
* Merge pull request #750 from nico/perfwinNico Weber2014-04-271-1/+3
|\ | | | | Make manifest_parser_perftest build on Windows.
| * Make manifest_parser_perftest build on Windows.Nico Weber2014-04-271-1/+3
|/
* Merge pull request #747 from nocnokneo/masterNico Weber2014-04-251-16/+17
|\ | | | | Fix bash-completion support for -C option to expand tilde
| * Style: Fix inconsistent indentationTaylor Braun-Jones2014-04-251-17/+17
| |
| * Fix bash-completion support for -C option to expand tildeTaylor Braun-Jones2014-04-251-1/+2
|/
* Merge pull request #714 from pcc/console-poolNico Weber2014-04-1714-43/+213
|\ | | | | Introduce the "console" pool
| * Introduce the "console" poolPeter Collingbourne2014-02-0314-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/lazyenvNico Weber2014-04-171-4/+5
|\ \ | | | | | | Allocate per-edge BindingEnvs lazily.
| * | Allocate per-edge BindingEnvs lazily.Nico Weber2014-02-111-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/maniperfNico Weber2014-04-173-4/+120
|\ \ | | | | | | Add a manifest parsing perftest.
| * | Manifest perftest: Try to make it build on Linux.Nico Weber2014-04-171-0/+1
| | |
| * | Manifest perftest: Pull manifest parsing into own function.Nico Weber2014-04-171-17/+20
| | |
| * | Add manifest_parser_perftest to .gitignore.Nico Weber2014-04-171-1/+2
| | |
| * | Manifest perftest: Also measure command evaluation time.Nico Weber2014-04-171-5/+31
| | |
| * | Add a simple manifest parsing perftest.Nico Weber2014-04-172-3/+88
|/ /
* | Merge pull request #741 from nicolasdespres/propagate-file-rename-to-gitignoreNico Weber2014-04-161-1/+1
|\ \ | | | | | | Propagate file rename to gitignore.