platform/upstream/ninja.git
9 years agoadd a --bootstrap mode for configure.py
Evan Martin [Fri, 14 Nov 2014 18:53:33 +0000 (10:53 -0800)]
add a --bootstrap mode for configure.py

Instead of bootstrapping through a separate script, instead make
configure.py able to either generate a build.ninja *or* just execute
all the computed commands to build a ninja binary.

9 years agoadd an "expand" function to ninja_syntax
Evan Martin [Tue, 18 Nov 2014 15:48:26 +0000 (07:48 -0800)]
add an "expand" function to ninja_syntax

Implements basic variable expansion for use in configure.py.

9 years agoMerge pull request #856 from nico/TABS
Nico Weber [Mon, 17 Nov 2014 23:16:18 +0000 (15:16 -0800)]
Merge pull request #856 from nico/TABS

emacs: Remove an empty line, wrap a comment.

9 years agoemacs: Remove an empty line, wrap a comment.
Nico Weber [Mon, 17 Nov 2014 23:15:10 +0000 (15:15 -0800)]
emacs: Remove an empty line, wrap a comment.

9 years agoMerge pull request #842 from nico/solaris
Nico Weber [Fri, 14 Nov 2014 01:57:53 +0000 (17:57 -0800)]
Merge pull request #842 from nico/solaris

Fix building on Solaris.

9 years agoMerge pull request #852 from nico/browse
Nico Weber [Fri, 14 Nov 2014 01:56:12 +0000 (17:56 -0800)]
Merge pull request #852 from nico/browse

Make sure configure.py and ninja.cc always agree on if -t browse is incl...

9 years agoMake sure configure.py and ninja.cc always agree on if -t browse is included.
Nico Weber [Fri, 14 Nov 2014 01:53:26 +0000 (17:53 -0800)]
Make sure configure.py and ninja.cc always agree on if -t browse is included.

No behavior change on most platforms. On solaris, -t browse was compiled in
in ninja.cc but browse.cc wasn't compiled in, which probably means that building
on Solaris didn't work. It might be better now.

This also makes browse.cc automatically not included in bootstrap builds;
previously this was done manually through the NINJA_BOOTSTRAP check.

9 years agoMerge pull request #851 from nico/cleanup
Nico Weber [Fri, 14 Nov 2014 01:35:10 +0000 (17:35 -0800)]
Merge pull request #851 from nico/cleanup

Remove unused variables.

9 years agoRemove unused variables.
Nico Weber [Fri, 14 Nov 2014 01:31:37 +0000 (17:31 -0800)]
Remove unused variables.

9 years agoMerge pull request #850 from sgraham/ocd
Nico Weber [Wed, 12 Nov 2014 20:47:35 +0000 (12:47 -0800)]
Merge pull request #850 from sgraham/ocd

whitespace/comment/wrap fixes, no intended functionality change

9 years agoMerge pull request #849 from sgraham/set-err-canon-components
Nico Weber [Wed, 12 Nov 2014 20:40:57 +0000 (12:40 -0800)]
Merge pull request #849 from sgraham/set-err-canon-components

set *err when too many components in CanonicalizePath

9 years agowhitespace/comment/wrap fixes, no intended functionality change
Scott Graham [Wed, 12 Nov 2014 20:39:20 +0000 (12:39 -0800)]
whitespace/comment/wrap fixes, no intended functionality change

9 years agoset *err when too many components in CanonicalizePath
Scott Graham [Wed, 12 Nov 2014 20:32:45 +0000 (12:32 -0800)]
set *err when too many components in CanonicalizePath

9 years agoMerge pull request #848 from sgraham/canon-maintain
Nico Weber [Wed, 12 Nov 2014 18:10:29 +0000 (10:10 -0800)]
Merge pull request #848 from sgraham/canon-maintain

Maintain bitvector of original slashes from manifest when canonicalizing

9 years agoproperly guard against slash_bits overflow
Scott Graham [Wed, 12 Nov 2014 17:16:25 +0000 (09:16 -0800)]
properly guard against slash_bits overflow

9 years agofix not respecting length
Scott Graham [Tue, 11 Nov 2014 03:38:08 +0000 (19:38 -0800)]
fix not respecting length

9 years agono need to save slash_bits, add comment
Scott Graham [Tue, 11 Nov 2014 01:55:18 +0000 (17:55 -0800)]
no need to save slash_bits, add comment

9 years agosave slash_bits in depslog
Scott Graham [Tue, 11 Nov 2014 01:18:16 +0000 (17:18 -0800)]
save slash_bits in depslog

9 years agono need to Decanonicalize on non-Windows
Scott Graham [Tue, 11 Nov 2014 00:35:31 +0000 (16:35 -0800)]
no need to Decanonicalize on non-Windows

9 years agofix CanonicalizePath going past StringPiece length + test
Scott Graham [Mon, 10 Nov 2014 22:48:55 +0000 (14:48 -0800)]
fix CanonicalizePath going past StringPiece length + test

9 years agoinitialize slash_bits on non-win
Scott Graham [Mon, 10 Nov 2014 20:38:55 +0000 (12:38 -0800)]
initialize slash_bits on non-win

9 years agomake all GetNode explicit, add DepsLog canonicalize test
Scott Graham [Mon, 10 Nov 2014 20:00:16 +0000 (12:00 -0800)]
make all GetNode explicit, add DepsLog canonicalize test

9 years agonon-win compilation
Scott Graham [Sun, 9 Nov 2014 07:36:26 +0000 (23:36 -0800)]
non-win compilation

9 years agoimprove test
Scott Graham [Sun, 9 Nov 2014 07:32:21 +0000 (23:32 -0800)]
improve test

9 years agoassert no slashes in default GetNode
Scott Graham [Sun, 9 Nov 2014 07:10:34 +0000 (23:10 -0800)]
assert no slashes in default GetNode

9 years agofix order of args to CanonicalizePath
Scott Graham [Sun, 9 Nov 2014 07:01:23 +0000 (23:01 -0800)]
fix order of args to CanonicalizePath

9 years agoremove CanonicalizePath overloads, test for toplevel behaviour
Scott Graham [Sun, 9 Nov 2014 06:49:21 +0000 (22:49 -0800)]
remove CanonicalizePath overloads, test for toplevel behaviour

9 years agopath decanonicalization when building command
Scott Graham [Sat, 8 Nov 2014 19:47:22 +0000 (11:47 -0800)]
path decanonicalization when building command

9 years agofix multiple sequential slashes
Scott Graham [Sat, 8 Nov 2014 19:25:03 +0000 (11:25 -0800)]
fix multiple sequential slashes

9 years agowip on adding tests at higher level, some not right
Scott Graham [Sat, 8 Nov 2014 06:38:59 +0000 (22:38 -0800)]
wip on adding tests at higher level, some not right

9 years agotrack back->forward conversions in a bitmask
Scott Graham [Sat, 8 Nov 2014 06:20:34 +0000 (22:20 -0800)]
track back->forward conversions in a bitmask

9 years agoMerge pull request #822 from tzik/throttle
Nico Weber [Mon, 3 Nov 2014 22:35:55 +0000 (14:35 -0800)]
Merge pull request #822 from tzik/throttle

Throttle the number of pending commands by the parallelism configuration

9 years agoMerge pull request #825 from Rapptz/master
Nico Weber [Sat, 1 Nov 2014 19:26:19 +0000 (12:26 -0700)]
Merge pull request #825 from Rapptz/master

Suppress warnings from building with MinGW

9 years agoFix building on Solaris.
Nico Weber [Sat, 1 Nov 2014 19:20:42 +0000 (12:20 -0700)]
Fix building on Solaris.

"SunOS" and "Solaris" are the same thing these days, so make them go
down the same code paths. In particular, the browse feature was omitted
on solaris but not sunos5, causing trouble for some folks (see #838).

9 years agoMerge pull request #841 from sgraham/strchr
Nico Weber [Fri, 31 Oct 2014 01:58:28 +0000 (18:58 -0700)]
Merge pull request #841 from sgraham/strchr

Use strchr in \ conversion in CanonicalizePath on Windows

9 years agoUse strchr in \ conversion in CanonicalizePath on Windows
Scott Graham [Thu, 30 Oct 2014 23:52:55 +0000 (16:52 -0700)]
Use strchr in \ conversion in CanonicalizePath on Windows

9 years agoMerge pull request #840 from sgraham/canon-win-squashed
Nico Weber [Thu, 30 Oct 2014 23:35:33 +0000 (16:35 -0700)]
Merge pull request #840 from sgraham/canon-win-squashed

CanonicalizePath handles \ on Windows

9 years agoCanonicalizePath handles \ on Windows
Scott Graham [Thu, 30 Oct 2014 22:34:25 +0000 (15:34 -0700)]
CanonicalizePath handles \ on Windows

9 years agoMention optional files in installation instructions
Taylor Braun-Jones [Sun, 26 Oct 2014 20:36:36 +0000 (16:36 -0400)]
Mention optional files in installation instructions

9 years agoMerge pull request #837 from ppbrown/master
Nico Weber [Mon, 27 Oct 2014 21:00:23 +0000 (14:00 -0700)]
Merge pull request #837 from ppbrown/master

Update line_printer.cc with termios.h

9 years agoUpdate line_printer.cc
ppbrown [Mon, 27 Oct 2014 20:36:37 +0000 (13:36 -0700)]
Update line_printer.cc

Include POSIX termios.h

9 years agoMerge pull request #834 from frasercrmck/master
Nico Weber [Sun, 26 Oct 2014 20:39:49 +0000 (13:39 -0700)]
Merge pull request #834 from frasercrmck/master

Add zsh completion for targets in conjunction with -C

9 years agoFixed cygwin compatibility (issue #806)
kwesolowski [Sat, 25 Oct 2014 13:21:53 +0000 (15:21 +0200)]
Fixed cygwin compatibility (issue #806)

Fixed platform specific issues causing cygwin build to fail.

9 years agoAdd zsh completion for targets in conjunction with -C
Fraser Cormack [Fri, 24 Oct 2014 19:34:06 +0000 (20:34 +0100)]
Add zsh completion for targets in conjunction with -C

zsh can now list completions for targets in the directory specified by
the -C option

9 years agoFix unknown pragma warnings
Danny [Sun, 28 Sep 2014 09:52:08 +0000 (05:52 -0400)]
Fix unknown pragma warnings

9 years agoThrottle the number of pending commands by the parallelism configuration
tzik [Fri, 19 Sep 2014 08:07:29 +0000 (17:07 +0900)]
Throttle the number of pending commands by the parallelism configuration

9 years agoMerge pull request #823 from nico/conf
Nico Weber [Fri, 19 Sep 2014 16:30:00 +0000 (09:30 -0700)]
Merge pull request #823 from nico/conf

Make auto-reconfiguring work if CFLAGS contains more than one flag.

9 years agoMake auto-reconfiguring work if CFLAGS contains more than one flag.
Nico Weber [Fri, 19 Sep 2014 15:49:00 +0000 (08:49 -0700)]
Make auto-reconfiguring work if CFLAGS contains more than one flag.

When using an open-source clang on OS X, one has to pass an isysroot
flag so that it can find system headers (stdio.h), like so:

  CXX=path/to/clang++ CFLAGS="-isysroot $(xcrun -show-sdk-path)" ./configure.py

Previously, configure.py wouldn't quote envvars containing spaces, so
it'd rerun this as

  CXX=path/to/clang++ CFLAGS=-isysroot /sysroot/path ./configure.py

which would then die because /sysroot/path wasn't excecutable.

9 years agoMerge pull request #820 from nico/ohceedee
Nico Weber [Fri, 19 Sep 2014 04:30:19 +0000 (21:30 -0700)]
Merge pull request #820 from nico/ohceedee

Don't print "Recompacting..." message from tests.

9 years agoDon't print "Recompacting..." message from tests.
Nico Weber [Fri, 19 Sep 2014 04:25:32 +0000 (21:25 -0700)]
Don't print "Recompacting..." message from tests.

Now tests don't print anything. Non-test behavior is unchanged.

9 years agoMerge pull request #819 from nico/win
Nico Weber [Thu, 18 Sep 2014 23:12:45 +0000 (16:12 -0700)]
Merge pull request #819 from nico/win

Fix building tests on Windows again.

9 years agoFix building tests on Windows again.
Nico Weber [Thu, 18 Sep 2014 23:08:25 +0000 (16:08 -0700)]
Fix building tests on Windows again.

Turns out gtest was pulling in sys/stat.h, and we were
using stat() through that in tests. This doesn't work
with old MSVCs, so we should probably replace that with
RealDiskInterface in a follow-up.

9 years agoMerge pull request #818 from nico/lesstest
Nico Weber [Thu, 18 Sep 2014 16:27:48 +0000 (09:27 -0700)]
Merge pull request #818 from nico/lesstest

remove more things not needed without gtest

9 years agoremove more things not needed without gtest
Nico Weber [Thu, 18 Sep 2014 16:14:20 +0000 (09:14 -0700)]
remove more things not needed without gtest

9 years agoMerge pull request #817 from nico/warn
Nico Weber [Thu, 18 Sep 2014 15:18:40 +0000 (08:18 -0700)]
Merge pull request #817 from nico/warn

fix warning

9 years agofix warning
Nico Weber [Thu, 18 Sep 2014 15:15:31 +0000 (08:15 -0700)]
fix warning

9 years agoMerge pull request #815 from sgraham/gtest-tidy
Nico Weber [Thu, 18 Sep 2014 15:10:57 +0000 (08:10 -0700)]
Merge pull request #815 from sgraham/gtest-tidy

Don't need to install and configure with gtest any more

9 years agoDon't need to install and configure with gtest any more
Scott Graham [Thu, 18 Sep 2014 05:18:08 +0000 (22:18 -0700)]
Don't need to install and configure with gtest any more

9 years agoMerge pull request #812 from nico/ninjatest
Nico Weber [Thu, 18 Sep 2014 05:00:33 +0000 (22:00 -0700)]
Merge pull request #812 from nico/ninjatest

Use a small, standalone testing framework for ninja instead of googletest.

9 years agoDon't support ? and : for --gtest-filter, a bit simpler.
Nico Weber [Thu, 18 Sep 2014 04:22:49 +0000 (21:22 -0700)]
Don't support ? and : for --gtest-filter, a bit simpler.

Let me know if you use these!

9 years agoAdd support for --gtest_filter. The bots need it, and it is a useful flag.
Nico Weber [Thu, 18 Sep 2014 03:35:07 +0000 (20:35 -0700)]
Add support for --gtest_filter. The bots need it, and it is a useful flag.

9 years agoUse a small, standalone testing framework instead of googletest.
Nico Weber [Thu, 18 Sep 2014 02:48:26 +0000 (19:48 -0700)]
Use a small, standalone testing framework instead of googletest.

Ninja currently uses googletest for testing. That makes building
ninja_test somewhat annoying since it requires that one passes
--with-gtest PATH to configure. It turns out just implementing the bits
of googletest that ninja uses needs about the same amount of code than
making the --with-gtest flag in configure.py work and making googletest
print test results in a way we want (!)

In addition to making configuration simpler, this also makes compiling
tests much faster: On my system, touching src/build_test.cc (the slowest
file to build in ninja) and rebuilding ninja_tests is twice as fast than
without this patch. Building all is noticeably faster too: 5.6s with
this patch, 9.1s without this patch (38% faster).

The most noticeable things missing: EXPECT_* and ASSERT_* don't support
streaming notes to them with operator<<, and for failing tests the lhs
and rhs are not printed. That's so that this header does not have to
include sstream, which slows down building ninja_test almost 20%.
If this turns out to be annoying, we can maybe add it.

9 years agoEmacs mode: inherit from prog-mode
Damien Pollet [Tue, 16 Sep 2014 12:28:46 +0000 (14:28 +0200)]
Emacs mode: inherit from prog-mode

`prog-mode` ensures a final newline when saving files, which is useful
since ninja fails otherwise.

See `require-final-newline` and `mode-require-final-newline`.

9 years agoDocument target^ syntax.
Andrey Malets [Sat, 6 Sep 2014 17:28:05 +0000 (23:28 +0600)]
Document target^ syntax.

Added a note into the documentation about interesting target^ syntax

9 years agoMerge pull request #808 from nico/bettererror
Nico Weber [Thu, 4 Sep 2014 02:33:47 +0000 (19:33 -0700)]
Merge pull request #808 from nico/bettererror

Provide an error message on malformed lets. Fixes #807.

9 years agoProvide an error message on malformed lets. Fixes #807.
Nico Weber [Thu, 4 Sep 2014 02:31:29 +0000 (19:31 -0700)]
Provide an error message on malformed lets. Fixes #807.

9 years agoMerge pull request #803 from martine/arch
Nico Weber [Tue, 5 Aug 2014 22:24:37 +0000 (15:24 -0700)]
Merge pull request #803 from martine/arch

amend HACKING.md with instructions for Arch Linux

9 years agoMerge pull request #802 from martine/parens
Nico Weber [Tue, 5 Aug 2014 22:24:04 +0000 (15:24 -0700)]
Merge pull request #802 from martine/parens

add some parens to silence a gcc warning

9 years agoamend HACKING.md with instructions for Arch Linux
Evan Martin [Mon, 4 Aug 2014 15:35:56 +0000 (08:35 -0700)]
amend HACKING.md with instructions for Arch Linux

9 years agoadd some parens to silence a gcc warning
Evan Martin [Mon, 4 Aug 2014 15:21:34 +0000 (08:21 -0700)]
add some parens to silence a gcc warning

9 years agoMerge pull request #798 from kwesolowski/master
Nico Weber [Sun, 27 Jul 2014 20:16:41 +0000 (13:16 -0700)]
Merge pull request #798 from kwesolowski/master

Provided Basic Support for -l N option on windows platform.

9 years agoRemove extra info from Usage()
kwesolowski [Sat, 26 Jul 2014 23:17:34 +0000 (01:17 +0200)]
Remove extra info from Usage()

As now behavior is similar on on platforms, this can probably be removed

9 years agoChanged implementation to provide load from 0 to ProcessorCount
kwesolowski [Sat, 26 Jul 2014 10:38:26 +0000 (12:38 +0200)]
Changed implementation to provide load from 0 to ProcessorCount

This makes this implementation more consisten with POSIX load avarage.

9 years agoFixed naming convention in GetLoadAverage support functions.
kwesolowski [Sat, 26 Jul 2014 08:01:29 +0000 (10:01 +0200)]
Fixed naming convention in GetLoadAverage support functions.

9 years agoMerge pull request #799 from ryo-on/netbsd-support
Nico Weber [Sat, 26 Jul 2014 03:57:59 +0000 (20:57 -0700)]
Merge pull request #799 from ryo-on/netbsd-support

Add NetBSD support.

9 years agoImproved load calculation
kwesolowski [Fri, 25 Jul 2014 09:24:45 +0000 (11:24 +0200)]
Improved load calculation

Added code to gracefully handle:
1. Call to CalculateProcessorLoad with not incremented ticks (fast calls
to GetSystemTimes can result same results),
2. Smooth/filter load estimation for consecutive calls.

9 years agoSmall usage info fix for windows
kwesolowski [Fri, 25 Jul 2014 09:22:20 +0000 (11:22 +0200)]
Small usage info fix for windows

9 years agoFixes for windows CalculateProcessorLoad
kwesolowski [Fri, 25 Jul 2014 08:36:21 +0000 (10:36 +0200)]
Fixes for windows CalculateProcessorLoad

- Fixed bad logic condition,
- Added comment to clarify

9 years agoFixed/improved -l N documentation For windows
kwesolowski [Fri, 25 Jul 2014 07:42:33 +0000 (09:42 +0200)]
Fixed/improved -l N documentation For windows

On windows "system load" is not so obvious term, added line explaining N
argument in -l N

9 years agoPrepared load (-l N) support for windows.
kwesolowski [Thu, 24 Jul 2014 22:05:31 +0000 (00:05 +0200)]
Prepared load (-l N) support for windows.

Inspired by:
http://stackoverflow.com/questions/23143693/retrieving-cpu-load-percent-total-in-windows-with-c

9 years agoAdd NetBSD support.
Ryo ONODERA [Sat, 19 Jul 2014 09:45:25 +0000 (18:45 +0900)]
Add NetBSD support.
It works fine under NetBSD/amd64 6.99.47.

10 years agoMerge pull request #788 from donkopotamus/patch-2
Nico Weber [Mon, 30 Jun 2014 02:17:49 +0000 (19:17 -0700)]
Merge pull request #788 from donkopotamus/patch-2

Add highlighting of rule in build statements

10 years agoMerge pull request #755 from zmodem/working_dir_vs_msvc_tool
Nico Weber [Sun, 29 Jun 2014 21:17:37 +0000 (14:17 -0700)]
Merge pull request #755 from zmodem/working_dir_vs_msvc_tool

Process the -C option before running RUN_AFTER_FLAGS tools.

10 years agomark this 1.5.1.git
Nico Weber [Fri, 27 Jun 2014 23:36:18 +0000 (16:36 -0700)]
mark this 1.5.1.git

10 years agoMerge pull request #792 from nico/statdir
Nico Weber [Fri, 27 Jun 2014 23:32:31 +0000 (16:32 -0700)]
Merge pull request #792 from nico/statdir

try to fix stat()ing directories on windows in statcache code

10 years agotry to fix stat()ing directories on windows
Nico Weber [Fri, 27 Jun 2014 23:11:50 +0000 (16:11 -0700)]
try to fix stat()ing directories on windows

10 years agoadd more tests for stat()ing a directory
Nico Weber [Fri, 27 Jun 2014 22:58:32 +0000 (15:58 -0700)]
add more tests for stat()ing a directory

10 years agoadd a test for stat()ing a directory
Nico Weber [Fri, 27 Jun 2014 22:51:56 +0000 (15:51 -0700)]
add a test for stat()ing a directory

10 years agoMerge pull request #791 from nico/relmore
Nico Weber [Fri, 27 Jun 2014 21:11:58 +0000 (14:11 -0700)]
Merge pull request #791 from nico/relmore

also note that branch release needs to be pushed

10 years agoalso note that branch release needs to be pushed
Nico Weber [Fri, 27 Jun 2014 21:11:23 +0000 (14:11 -0700)]
also note that branch release needs to be pushed

10 years agoMerge pull request #790 from nico/relnotes2
Nico Weber [Fri, 27 Jun 2014 20:37:11 +0000 (13:37 -0700)]
Merge pull request #790 from nico/relnotes2

expand RELEASING a bit

10 years agoexpand RELEASING a bit
Nico Weber [Fri, 27 Jun 2014 20:29:16 +0000 (13:29 -0700)]
expand RELEASING a bit

10 years agomark this 1.5.0.git, update RELEASING
Nico Weber [Fri, 27 Jun 2014 20:15:57 +0000 (13:15 -0700)]
mark this 1.5.0.git, update RELEASING

10 years agoMerge pull request #789 from nico/dontwin
Nico Weber [Fri, 27 Jun 2014 20:07:54 +0000 (13:07 -0700)]
Merge pull request #789 from nico/dontwin

Rename -d nowinstatcache to -d nostatcache; might become useful elsewhere (#787)

10 years agoRename -d nowinstatcache to -d nostatcache; might become useful elsewhere (#787)
Nico Weber [Fri, 27 Jun 2014 20:03:41 +0000 (13:03 -0700)]
Rename -d nowinstatcache to -d nostatcache; might become useful elsewhere (#787)

10 years agoAdd highlighting of rule in build statements
donkopotamus [Fri, 27 Jun 2014 00:26:37 +0000 (12:26 +1200)]
Add highlighting of rule in build statements

Highlight the rule being used in a build statement.  Also add `.` to acceptable characters in a rule name and relax whitespace matching before the name.

10 years agoMerge pull request #786 from donkopotamus/patch-1
Nico Weber [Thu, 26 Jun 2014 05:12:01 +0000 (22:12 -0700)]
Merge pull request #786 from donkopotamus/patch-1

Update ninja-mode for emacs to handle hyphens in rule names

10 years agoUpdate ninja-mode for emacs to handle hyphens in rule names
donkopotamus [Thu, 26 Jun 2014 04:34:35 +0000 (16:34 +1200)]
Update ninja-mode for emacs to handle hyphens in rule names

10 years agoMerge pull request #785 from nico/unused
Nico Weber [Wed, 25 Jun 2014 00:57:28 +0000 (17:57 -0700)]
Merge pull request #785 from nico/unused

Fix -Wunused-result warning for chdir on linux.

10 years agoFix -Wunused-result warning for chdir on linux.
Nico Weber [Wed, 25 Jun 2014 00:49:22 +0000 (17:49 -0700)]
Fix -Wunused-result warning for chdir on linux.