platform/upstream/ninja.git
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

10 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.

10 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

10 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.

10 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.

10 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.

10 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.

10 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

10 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

10 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

10 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

10 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.

10 years agoMerge pull request #784 from nico/statkeep
Nico Weber [Fri, 20 Jun 2014 14:30:10 +0000 (07:30 -0700)]
Merge pull request #784 from nico/statkeep

do not delete files from the logs that still exist on disk

10 years agodo not delete files from the logs that still exist on disk
Nico Weber [Thu, 19 Jun 2014 23:09:50 +0000 (16:09 -0700)]
do not delete files from the logs that still exist on disk

This is to keep the possibility of maybe having a tool that deletes
old files in the future, or for having a tool which exposes this
information to generators so they can do that.

See https://github.com/martine/ninja/pull/697#issuecomment-37140762
and the discussion on #762.

Idea from @maximuska!

10 years agomake Stat() a const method
Nico Weber [Thu, 19 Jun 2014 23:00:35 +0000 (16:00 -0700)]
make Stat() a const method

10 years agoMerge pull request #783 from sgraham/findexinfobasic
Nico Weber [Thu, 19 Jun 2014 19:21:33 +0000 (12:21 -0700)]
Merge pull request #783 from sgraham/findexinfobasic

use local definition of FindExInfoBasic for earlier sdks

10 years agouse local definition of FindExInfoBasic for earlier sdks
Scott Graham [Thu, 19 Jun 2014 18:22:44 +0000 (11:22 -0700)]
use local definition of FindExInfoBasic for earlier sdks

10 years agoMerge pull request #782 from sgraham/warning-on-81sdk
Nico Weber [Mon, 16 Jun 2014 18:11:00 +0000 (11:11 -0700)]
Merge pull request #782 from sgraham/warning-on-81sdk

suppress warning on win8.1 sdk

10 years agosuppress warning on win8.1 sdk
Scott Graham [Mon, 16 Jun 2014 17:56:24 +0000 (10:56 -0700)]
suppress warning on win8.1 sdk

10 years agoMerge pull request #781 from nico/cleaner
Nico Weber [Mon, 16 Jun 2014 17:33:23 +0000 (10:33 -0700)]
Merge pull request #781 from nico/cleaner

simplify statcache code more

10 years agosimplify statcache code more
Nico Weber [Mon, 16 Jun 2014 17:27:10 +0000 (10:27 -0700)]
simplify statcache code more

10 years agoMerge pull request #780 from nico/versioncheck
Nico Weber [Mon, 16 Jun 2014 17:10:04 +0000 (10:10 -0700)]
Merge pull request #780 from nico/versioncheck

only use FindExInfoBasic on win7+

10 years agoonly use FindExInfoBasic on win7+
Nico Weber [Mon, 16 Jun 2014 16:59:16 +0000 (09:59 -0700)]
only use FindExInfoBasic on win7+

10 years agoMerge pull request #779 from nico/statcache
Nico Weber [Sun, 15 Jun 2014 23:01:49 +0000 (16:01 -0700)]
Merge pull request #779 from nico/statcache

Use FindFirstFileEx() for stat()ing files on Windows.

10 years agos/hFind/find_handle/
Nico Weber [Sun, 15 Jun 2014 23:00:13 +0000 (16:00 -0700)]
s/hFind/find_handle/

10 years agoadd missing _WIN32 checks
Nico Weber [Sun, 15 Jun 2014 22:26:37 +0000 (15:26 -0700)]
add missing _WIN32 checks

10 years agomake bool exist everywhere, for simpler calling code
Nico Weber [Sun, 15 Jun 2014 22:16:50 +0000 (15:16 -0700)]
make bool exist everywhere, for simpler calling code

10 years agoadd some statcache tests
Nico Weber [Sun, 15 Jun 2014 21:42:42 +0000 (14:42 -0700)]
add some statcache tests

10 years agoFree cache memory once it's no longer used.
Nico Weber [Sun, 15 Jun 2014 21:11:27 +0000 (14:11 -0700)]
Free cache memory once it's no longer used.

Doesn't slow down empty build times measurably, and
saves some memory on non-empty builds.

10 years agoerror checking
Nico Weber [Sun, 15 Jun 2014 05:18:28 +0000 (22:18 -0700)]
error checking

10 years agoon by default
Nico Weber [Sun, 15 Jun 2014 05:11:31 +0000 (22:11 -0700)]
on by default

10 years agocomment
Nico Weber [Sun, 15 Jun 2014 05:07:04 +0000 (22:07 -0700)]
comment

10 years agomake win-only
Nico Weber [Sun, 15 Jun 2014 05:05:09 +0000 (22:05 -0700)]
make win-only

10 years agosimplify more, move behind flag
Nico Weber [Sun, 15 Jun 2014 04:50:05 +0000 (21:50 -0700)]
simplify more, move behind flag

10 years agomore minor cleanups
Nico Weber [Sun, 15 Jun 2014 04:38:44 +0000 (21:38 -0700)]
more minor cleanups

10 years agomore minor cleanups
Nico Weber [Sun, 15 Jun 2014 04:36:30 +0000 (21:36 -0700)]
more minor cleanups

10 years agominor cleanups
Nico Weber [Sun, 15 Jun 2014 04:29:18 +0000 (21:29 -0700)]
minor cleanups

10 years agoTurn on stat cache. Empty builds of chrome on my laptop 4s -> 1.3s (!)
Nico Weber [Sun, 25 May 2014 04:36:57 +0000 (21:36 -0700)]
Turn on stat cache. Empty builds of chrome on my laptop 4s -> 1.3s (!)

10 years agoAdd a stat cache. Demo-quality, and disabled atm.
Nico Weber [Sun, 25 May 2014 04:17:35 +0000 (21:17 -0700)]
Add a stat cache. Demo-quality, and disabled atm.

10 years agoMerge pull request #778 from nico/spellrsp
Nico Weber [Sun, 15 Jun 2014 05:50:54 +0000 (22:50 -0700)]
Merge pull request #778 from nico/spellrsp

spellcheck "keeprsp" in -d options

10 years agospellcheck "keeprsp" in -d options
Nico Weber [Sun, 15 Jun 2014 05:49:01 +0000 (22:49 -0700)]
spellcheck "keeprsp" in -d options

10 years agoMerge pull request #777 from nico/winconf
Nico Weber [Sun, 15 Jun 2014 05:47:27 +0000 (22:47 -0700)]
Merge pull request #777 from nico/winconf

create a slightly nicer build.ninja on windows

10 years agocreate a slightly nicer build.ninja on windows
Nico Weber [Sun, 15 Jun 2014 05:47:05 +0000 (22:47 -0700)]
create a slightly nicer build.ninja on windows

10 years agoVersion 1.4 of the vim syntax file was merged.
Nico Weber [Thu, 12 Jun 2014 20:22:35 +0000 (13:22 -0700)]
Version 1.4 of the vim syntax file was merged.

See https://code.google.com/p/vim/source/detail?r=92751673cc37c9ef4d1ad1ac4d42d36faa67f88f

10 years agoMerge pull request #770 from debfx/master
Evan Martin [Fri, 30 May 2014 23:24:28 +0000 (16:24 -0700)]
Merge pull request #770 from debfx/master

Use unversioned \ 1gnukfreebsd platform.

10 years agoUse unversioned \ 1gnukfreebsd platform.
Felix Geyer [Fri, 30 May 2014 20:59:02 +0000 (22:59 +0200)]
Use unversioned \ 1gnukfreebsd platform.

10 years agoMerge pull request #769 from nico/plus
Nico Weber [Fri, 30 May 2014 17:41:45 +0000 (10:41 -0700)]
Merge pull request #769 from nico/plus

Allow + in filenames without escaping

10 years agoAllow + in filenames without escaping
Nico Weber [Fri, 30 May 2014 01:14:48 +0000 (03:14 +0200)]
Allow + in filenames without escaping

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.

10 years agoMerge pull request #768 from nico/vimsyn
Nico Weber [Fri, 30 May 2014 00:58:33 +0000 (17:58 -0700)]
Merge pull request #768 from nico/vimsyn

vim syntax: Correctly highlight $$a as ($$)a instead of $($a).

10 years agoMerge pull request #767 from nico/esc_deprspfile
Nico Weber [Thu, 29 May 2014 23:58:09 +0000 (16:58 -0700)]
Merge pull request #767 from nico/esc_deprspfile

Make "depfile=$out.d" work if $out contains escaped characters, rspfile ...

10 years agoreword manual for depfile/rspfile escaping change
Nico Weber [Sat, 24 May 2014 22:52:52 +0000 (15:52 -0700)]
reword manual for depfile/rspfile escaping change

10 years agoMake "depfile=$out.d" work if $out contains escaped characters, rspfile too.
Nico Weber [Wed, 21 May 2014 22:07:47 +0000 (15:07 -0700)]
Make "depfile=$out.d" work if $out contains escaped characters, rspfile too.

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).

10 years agoMerge pull request #766 from nico/cleanup
Nico Weber [Wed, 21 May 2014 21:17:44 +0000 (14:17 -0700)]
Merge pull request #766 from nico/cleanup

CleanTest cleanups:

10 years agoCleanTest cleanups:
Nico Weber [Wed, 21 May 2014 21:16:18 +0000 (14:16 -0700)]
CleanTest cleanups:
* $in only makes sense on rules, not edges (see issue #687)
* Remove unneccesary clear() line at end of test

10 years agoMerge pull request #764 from nico/winconsole
Nico Weber [Sun, 18 May 2014 22:17:44 +0000 (15:17 -0700)]
Merge pull request #764 from nico/winconsole

Implement pool=console support on Windows.

10 years agowin console wip: Fix comments based on review feedback.
Nico Weber [Sun, 18 May 2014 00:20:20 +0000 (17:20 -0700)]
win console wip: Fix comments based on review feedback.

10 years agowin console wip: resolve FIXME
Nico Weber [Wed, 14 May 2014 10:00:34 +0000 (03:00 -0700)]
win console wip: resolve FIXME

10 years agovim syntax: Correctly highlight $$a as ($$)a instead of $($a).
Nico Weber [Tue, 13 May 2014 21:51:51 +0000 (23:51 +0200)]
vim syntax: Correctly highlight $$a as ($$)a instead of $($a).

10 years agowin console wip: ctrl-c should reach commands running in console pools
Nico Weber [Tue, 13 May 2014 19:58:01 +0000 (12:58 -0700)]
win console wip: ctrl-c should reach commands running in console pools

10 years agowin console wip: enable test
Nico Weber [Tue, 13 May 2014 19:47:08 +0000 (12:47 -0700)]
win console wip: enable test

10 years agowip for console pool on windows
Nico Weber [Tue, 13 May 2014 19:35:52 +0000 (12:35 -0700)]
wip for console pool on windows

10 years agoMerge pull request #761 from maximuska/proposed/depfile_parser_fixes
Nico Weber [Thu, 8 May 2014 00:11:37 +0000 (17:11 -0700)]
Merge pull request #761 from maximuska/proposed/depfile_parser_fixes

Allow paths with '{' '}' in depfiles

10 years agoAllow paths with '{' '}' in depfiles
Maxim Kalaev [Wed, 7 May 2014 17:56:32 +0000 (20:56 +0300)]
Allow paths with '{' '}' in depfiles

10 years agoMerge pull request #756 from ronnychevalier/rc/zsh_completion
Nico Weber [Mon, 5 May 2014 22:54:26 +0000 (15:54 -0700)]
Merge pull request #756 from ronnychevalier/rc/zsh_completion

improve zsh completion

10 years agoMerge pull request #758 from mathstuf/dev/fix-compdb-abort
Nico Weber [Mon, 5 May 2014 22:51:11 +0000 (15:51 -0700)]
Merge pull request #758 from mathstuf/dev/fix-compdb-abort

compdb: check that inputs is not empty

10 years agocompdb: check that inputs is not empty
Ben Boeckel [Mon, 5 May 2014 19:00:26 +0000 (15:00 -0400)]
compdb: check that inputs is not empty

10 years agoMerge pull request #757 from cjdrake/master
Nico Weber [Mon, 5 May 2014 03:25:57 +0000 (20:25 -0700)]
Merge pull request #757 from cjdrake/master

Stylistic changes to ninja_syntax.py

10 years agoGet rid of unused import
Chris Drake [Mon, 5 May 2014 01:35:28 +0000 (18:35 -0700)]
Get rid of unused import

10 years agoUse consistent indentation conventions
Chris Drake [Mon, 5 May 2014 01:34:55 +0000 (18:34 -0700)]
Use consistent indentation conventions

10 years agoimprove zsh completion
Ronny Chevalier [Sun, 4 May 2014 02:55:40 +0000 (04:55 +0200)]
improve zsh completion

10 years agoProcess the -C option before running RUN_AFTER_FLAGS tools.
Hans Wennborg [Sat, 3 May 2014 23:07:09 +0000 (16:07 -0700)]
Process the -C option before running RUN_AFTER_FLAGS tools.

This brings the flag more inline with its description: "change to
DIR before doing anything else".

The use case is to make it possible to use -C together with -t msvc.
When debugging Windows builds, it's handy to be able to copy-paste
the commands from "ninja -v" and make them run in the correct
directory by adding this flag.

10 years agoMerge pull request #753 from nico/nlacc
Nico Weber [Thu, 1 May 2014 15:50:21 +0000 (08:50 -0700)]
Merge pull request #753 from nico/nlacc

Accept \r\n line endings in depfiles.

10 years agoAccept \r\n line endings in depfiles.
Nico Weber [Thu, 1 May 2014 03:46:12 +0000 (20:46 -0700)]
Accept \r\n line endings in depfiles.

Fixes #752.

10 years agoMerge pull request #748 from nocnokneo/bash-completion-for-f-and-C
Nico Weber [Wed, 30 Apr 2014 19:10:54 +0000 (12:10 -0700)]
Merge pull request #748 from nocnokneo/bash-completion-for-f-and-C

Support completion of arguments to -f and -C options

10 years agoFix getopts barfing over the terminal when trying to complete -f and -C
Taylor Braun-Jones [Sun, 27 Apr 2014 22:31:40 +0000 (18:31 -0400)]
Fix getopts barfing over the terminal when trying to complete -f and -C

Note that this is only applicable for when bash_completion is
unavailable.

10 years agoSupport completion of arguments to -f and -C options
Taylor Braun-Jones [Fri, 25 Apr 2014 18:20:42 +0000 (14:20 -0400)]
Support completion of arguments to -f and -C options

Note: This is only available for bash_completion users.