summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Provide 'ninja' as alias for 'ninja.exe' too. Tidy up.Nico Weber2012-04-301-2/+4
|
* Provide 'ninja_test' as alias for 'ninja_test.exe' on windows.Nico Weber2012-04-301-0/+3
|
* Merge pull request #274 from polrop/max_load_averageEvan Martin2012-04-285-4/+51
|\ | | | | Max load average
| * Add -l N option to limit the load average.Nicolas Despres2012-04-195-4/+51
| | | | | | | | | | | | | | This is similar to GNU make -l/--load-average option. It limits the number of job started if the load average exceed the given value. It can be very useful when running ninja on a continuous integration server where we want to use parallelism as much as possible without overloading the server.
| * Remove trailing white spaces.Nicolas Despres2012-04-191-6/+6
| |
* | emacs: hook up ninja-mode to extensionEvan Martin2012-04-281-0/+4
| |
* | Merge pull request #282 from iwadon/fix-link-to-gplusEvan Martin2012-04-281-1/+1
|\ \ | | | | | | Fix a link to Google+
| * | Fix a link to Google+.Hiroyuki Iwatsuki2012-04-281-1/+1
|/ /
* | rearrange the manualEvan Martin2012-04-271-127/+208
| | | | | | | | | | | | | | | | | | My goals were: - shorten the introductory text, hopefully quickly answering the "why?" question first. - put the information relevant to ninja users (e.g. people using CMake who don't especially care about ninja) next, at the beginning. - consolidate the "generating ninja files" text below.
* | manual: limit width to 45emEvan Martin2012-04-271-1/+1
| | | | | | | | | | I had a local user stylesheet that was doing this for all sites so I hadn't noticed how bad it was!
* | suggest ninja -h when someone runs 'ninja help'Evan Martin2012-04-261-0/+2
| |
* | doc encoding supportEvan Martin2012-04-261-0/+4
| |
* | allow UTF-8 in rule descriptionsEvan Martin2012-04-263-5/+12
| | | | | | | | | | The lexer already mostly allowed this, except that chars >127 were being interpreted as negative indexes into the lexer table.
* | Merge pull request #278 from tychoish/masterEvan Martin2012-04-261-1/+3
|\ \ | | | | | | Minor Documentation Tweak
| * | docs: clarifying that there can be only one command per ruletycho garen2012-04-241-1/+3
| |/
* | reduce custom ninja status patch in minor waysEvan Martin2012-04-263-128/+53
| | | | | | | | | | Elsewhere in the code I avoid sstream and manual buffer management, so switch this code to behave similarly. Sorry for being OCD.
* | Merge branch 'custom_ninja_status' of git://github.com/polrop/ninjaEvan Martin2012-04-264-51/+216
|\ \
| * | Refactor and test progress status formatting.Nicolas Despres2012-04-243-69/+140
| | |
| * | Introduce NINJA_STATUS env var for customization.Nicolas Despres2012-04-242-2/+96
| | | | | | | | | | | | | | | | | | Some people may want to display different relevant information about the progress of the build. Also it can be usefull to debug jobs allocation.
| * | Remove trailing white spaces.Nicolas Despres2012-04-242-13/+13
| |/
* | Merge pull request #272 from nico/statstweakEvan Martin2012-04-261-3/+3
|\ \ | | | | | | Switch the order of total and avg columns in -d stats output.
| * | Switch the order of total and avg columns in -d stats output.Nico Weber2012-04-171-3/+3
| |/
* | Merge pull request #269 from sgraham/explainEvan Martin2012-04-267-10/+73
|\ \ | | | | | | add support for -d explain to help debug why rules are running
| * | add support for -d explain to help debug why rules are runningScott Graham2012-04-137-10/+73
| |/
* | Merge pull request #228 from pcc/lazily-create-commandrunnerEvan Martin2012-04-261-4/+8
|\ \ | | | | | | Lazily create the CommandRunner in Builder::Build
| * | Lazily create the CommandRunner in Builder::BuildPeter Collingbourne2012-02-271-4/+8
| | | | | | | | | | | | | | | This allows the user to interrupt the build (i.e. using Ctrl-C) while the build plan is being computed.
* | | Merge branch 'dont-clean-phony' of git://github.com/pcc/ninjaEvan Martin2012-04-262-9/+36
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: src/clean.cc
| * | | Don't delete phony targets when cleaning a specified targetPeter Collingbourne2012-02-282-7/+34
| |/ / | | | | | | | | | Also, modify Cleaner::CleanAll to use Edge::is_phony.
* | | Merge pull request #207 from iwadon/fix-configure.py-windowsEvan Martin2012-04-261-3/+6
|\ \ \ | |_|/ |/| | Fix configure.py for unpacked gtest on Windows platform.
| * | Just add /nologo to gtest_cflags, instead of use cflags + gtest_cflagsHiroyuki Iwatsuki2012-01-251-3/+3
| | |
| * | Fix configure.py for unpacked gtest on Windows platform.Hiroyuki Iwatsuki2012-01-251-5/+8
| | | | | | | | | | | | | | | | | | -Use /EHsc instead of -fvisibility=hidden -Use valid objext -Use cflags + gtest_cflags
* | | Merge pull request #252 from qhuo/remove-depfile-when-cleaningEvan Martin2012-04-112-0/+34
|\ \ \ | | | | | | | | Remove depfiles when running "ninja -t clean <target>" or "ninja -t clean -r <rule>"
| * | | Remove depfiles when running when running "ninja -t clean <target>"Qingning Huo2012-03-142-0/+34
| | | | | | | | | | | | | | | | or "ninja -t clean -r <rule>"
* | | | Merge pull request #265 from mathstuf/dev/verbose-bootstrapEvan Martin2012-04-101-2/+16
|\ \ \ \ | | | | | | | | | | Allow the bootstrap to be verbose
| * | | | Allow the bootstrap to be verboseBen Boeckel2012-03-301-2/+16
| | | | |
* | | | | Merge pull request #253 from qhuo/include-io.hEvan Martin2012-04-101-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix windows build (add #include <io.h>)
| * | | | | Fix windows build (add #include <io.h>)Qingning Huo2012-03-151-0/+1
| | |/ / / | |/| | |
* | | | | Make |log_| variable private to BuildLog.Evan Martin2012-04-052-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix the TODO in build_log.h file. Signed-off-by: Thiago Farina <tfarina@chromium.org>
* | | | | Merge pull request #263 from mathstuf/dev/gcc-470-build-fixesEvan Martin2012-04-053-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Include unistd.h where needed
| * | | | | Include unistd.h where neededBen Boeckel2012-03-283-0/+3
| | |/ / / | |/| | |
* | | | | Merge pull request #260 from sgraham/rspfile_syntaxEvan Martin2012-04-051-1/+5
|\ \ \ \ \ | | | | | | | | | | | | add rspfile and rspfile_content to ninja_syntax
| * | | | | add rspfile and rspfile_content to ninja_syntaxScott Graham2012-03-271-1/+5
| |/ / / /
* | | | | Merge pull request #259 from usovalx/distcc_depfile_fixEvan Martin2012-04-051-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Explicitly specify target name for gcc depfiles
| * | | | | Explicitly specify target name for gcc depfilesOleksandr Usov2012-03-231-1/+1
| |/ / / /
* | | | | Merge pull request #256 from iwadon/fix-sign-compareEvan Martin2012-04-053-10/+10
|\ \ \ \ \ | | | | | | | | | | | | fix warning: "comparison between signed and unsigned integer expressions"
| * | | | | fix warning: "comparison between signed and unsigned integer expressions"Hiroyuki Iwatsuki2012-03-163-10/+10
| | |/ / / | |/| | |
* | | | | Merge pull request #257 from PetrWolf/53598255Evan Martin2012-04-052-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | | Add NOMINMAX macro to fix a compilation error on Win32
| * | | | Add NOMINMAX macro to fix a compilation error on Win32Petr Wolf2012-03-162-2/+2
| |/ / /
* | | | Merge pull request #251 from polrop/depfile-parser-accept-tildeEvan Martin2012-03-183-10/+21
|\ \ \ \ | |/ / / |/| | | Depfile parser accept tilde.
| * | | Depfile parser accept tilde.Nicolas Despres2012-03-143-10/+21
|/ / /