summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* vim syntax: Correctly highlight $$a as ($$)a instead of $($a).Nico Weber2014-05-131-2/+4
|
* 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.
| * | Propagate file rename to gitignore.Nicolas Despres2014-04-161-1/+1
|/ / | | | | | | This was introduced by 68a4bb27d1a747b240ea68cd320a51dbd261ed14.
* | Merge pull request #740 from nico/formatfileNico Weber2014-04-161-0/+25
|\ \ | | | | | | Add a .clang-format file.
| * | Add a .clang-format file.Nico Weber2014-04-161-0/+25
|/ / | | | | | | | | | | This isn't meant to be authoritative. It's good enough to let the "indent current line using clang-format" hotkey do the right thing often enough to be useful.
* | Merge pull request #739 from nico/renNico Weber2014-04-162-2/+2
|\ \ | | | | | | Rename parser_perftest to depfile_parser_perftest.
| * | Rename parser_perftest to depfile_parser_perftest.Nico Weber2014-04-162-2/+2
|/ /
* | Merge pull request #737 from sorbits/bash-completion-fixesNico Weber2014-04-151-2/+2
|\ \ | | | | | | Bash completion fixes
| * | Expand the -C argument via ‘eval’ in bash completionAllan Odgaard2014-04-151-1/+1
| | | | | | | | | | | | | | | | | | Previously completion would not work for ‘ninja -C $HOME/Source/foo targ‸’. We still do not support using tilde in the directory argument.
| * | Fix bash completion when using command optionsAllan Odgaard2014-04-151-1/+1
|/ / | | | | | | | | | | | | | | By quoting the ‘line’ variable we are making it a single word, but ‘getopts’ wants each option as its own word. Previously bash completion would output an error for a line like: ‘ninja -vn targ‸’. In addition to removing the quotes (to enable word expansion) I also used it as a regular variable, as that is what it is (not an array).
* | Merge pull request #734 from sgraham/no-stderrNico Weber2014-04-142-1/+8
|\ \ | | | | | | CLParser shouldn't read stderr
| * | CLParser shouldn't read stderrScott Graham2014-04-142-1/+8
|/ /
* | Merge pull request #722 from nico/manifestgenNico Weber2014-04-141-0/+219
|\ \ | | | | | | add a script to generate large synthetic manifests
| * | add a script to generate large synthetic manifestsNico Weber2014-03-251-0/+219
| |/ | | | | | | To be used by a manifest parser perf test in a follow-up.
* | Merge pull request #732 from bratell-at-opera/bratell/fewer_list_copies_20140414Nico Weber2014-04-141-5/+4
|\ \ | | | | | | performance: Writer.build should copy less.
| * | performance: Writer.build should copy less.Daniel Bratell2014-04-141-5/+4
|/ / | | | | | | | | | | The build method copies the input lists several times. That cost about 0.1s in the gyp generation for the Chromium project for no gain.
* | Merge pull request #699 from mostynb/avoid_useless_mkdir_failureNico Weber2014-04-071-0/+3
|\ \ | | | | | | don't Fail if trying to mkdir when the dir already exists
| * | don't Fail if trying to mkdir when the dir already existsMostyn Bramley-Moore2014-01-071-0/+3
| | |
* | | Merge pull request #728 from sgraham/both-slashes-on-windows-for-outputNico Weber2014-04-032-6/+20
|\ \ \ | |_|/ |/| | Support both slashes on Windows when making output dirs
| * | Support both slashes on Windows when making output dirsScott Graham2014-04-032-6/+20
|/ /
* | Merge pull request #710 from purcell/patch-1Evan Martin2014-01-231-0/+2
|\ \ | | | | | | ninja-mode: add autoload cookie for the mode itself
| * | ninja-mode: add autoload cookie for the mode itselfSteve Purcell2014-01-221-0/+2
|/ /
* | Merge branch 'fix-provide-form' of git://github.com/yasuyk/ninjaEvan Martin2014-01-211-2/+2
|\ \ | | | | | | | | | | | | Conflicts: misc/ninja-mode.el
| * | emacs: Place provide form at end of fileYasuyuki Oka2014-01-211-2/+2
| | | | | | | | | | | | | | | Any errors in the code after "provide" will leave the feature registered, so it should always be at the end.
* | | Merge branch 'fix-warning' of git://github.com/yasuyk/ninjaEvan Martin2014-01-211-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: misc/ninja-mode.el
| * | | emacs: Fix a warningYasuyuki Oka2014-01-211-1/+1
| |/ / | | | | | | | | | | | | Fix a following byte-compile warning: ninja-mode.el:18:7:Warning: assignment to free variable `ninja-keywords'
* | | Merge pull request #705 from yasuyk/elpaEvan Martin2014-01-211-0/+8
|\ \ \ | |/ / |/| | emacs: ELPA compatibility
| * | emacs: ELPA compatibilityYasuyuki Oka2014-01-211-0/+8
|/ /
* | Merge pull request #702 from nickhutchinson/feature/win32-escaping-fixNico Weber2014-01-092-1/+8
|\ \ | | | | | | Don’t unnecessarily escape backslashes in Win32 paths
| * | Don’t unnecessarily escape backslashes in Win32 pathsNicholas Hutchinson2014-01-082-1/+8
| |/ | | | | | | Under ::CommandLineToArgvW() rules, the backslash character only gets special treatment if it’s immediately followed by a double quote. So, when checking to see if a string needs Win32 escaping, it’s sufficient to check for the presence of a double quote character. This allows paths like "foo\bar" to be recognised as “sensible” paths, which don’t require the full escaping.
* | Merge pull request #701 from nickhutchinson/feature/msvc-gtest-cflagsNico Weber2014-01-091-1/+4
|\ \ | |/ |/| configure.py: use /FS flag under vs2013 when compiling gtest
| * configure.py: use /FS flag under vs2013 when compiling gtestNicholas Hutchinson2014-01-091-1/+4
|/