summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* mark this 1.5.3.gitNico Weber2014-11-241-1/+1
|
* Merge pull request #864 from Fanael/ninja-mode.el-refactorEvan Martin2014-11-241-23/+52
|\ | | | | Ninja mode.el refactor
| * Use lexical-binding.Fanael Linithien2014-11-231-1/+1
| | | | | | | | | | There's no reason not to use lexical-binding when supporting only Emacs 24+. Its semantics are just that much saner.
| * Add a Emacs 24 requirement.Fanael Linithien2014-11-231-0/+2
| | | | | | | | Only Emacs >= 24 has prog-mode.
| * Correctly recognize a comment if the previous line is a comment ending in $.Fanael Linithien2014-11-231-2/+9
| |
| * Avoid putting properties past the end of the buffer.Fanael Linithien2014-11-231-1/+4
| |
| * Don't use dotted list syntax unless necessary.Fanael Linithien2014-11-231-4/+4
| |
| * Remove unnecessary regexp group.Fanael Linithien2014-11-231-2/+2
| |
| * Correctly recognize comments.Fanael Linithien2014-11-231-0/+17
| |
| * Set up a proper syntax table for ninja-mode.Fanael Linithien2014-11-231-5/+8
| | | | | | | | | | | | | | | | Since quotes are not meant to be treated as string delimiters, the syntax table is the place to tell Emacs so. This also means syntactic fontification can be reenabled and the font-lock keyword entry for comments removed.
| * Set comment-start buffer-locally, not globally.Fanael Linithien2014-11-231-1/+1
| |
| * Use quasi-quoting instead of list+cons.Fanael Linithien2014-11-231-15/+14
| |
| * Reindent ninja-mode.el using Emacs.Fanael Linithien2014-11-231-16/+16
| | | | | | | | Emacs knows best how to indent Emacs Lisp.
| * Use double semicolon comments.Fanael Linithien2014-11-231-2/+2
| |
| * Don't leave lone closing parens.Fanael Linithien2014-11-231-4/+2
|/
* no subshellElan Ruusamäe2014-11-231-1/+1
| | | don't need subshell to send stderr to /dev/null
* Merge pull request #772 from drbo/syntax_bugfixEvan Martin2014-11-231-0/+1
|\ | | | | Added highlighting in Emacs for ${...} variables
| * Removed tab and added . in variable name regexpDemetri Obenour2014-06-011-1/+1
| |
| * Added highlighting in Emacs for ${...} variablesDemetri Obenour2014-06-011-0/+1
| |
* | Merge pull request #866 from nico/winfixNico Weber2014-11-221-1/+1
|\ \ | | | | | | Fix Windows build after #862. Thanks to @harig for the report.
| * | Fix Windows build after #862. Thanks to @harig for the report.Nico Weber2014-11-221-1/+1
|/ /
* | Merge pull request #862 from nico/browseNico Weber2014-11-221-4/+5
|\ \ | | | | | | Make browse detection consistent with other platform checks.
| * | Make browse detection consistent with other platform checks.Nico Weber2014-11-211-4/+5
| | |
* | | Merge pull request #863 from nico/nopthreadNico Weber2014-11-221-4/+1
|\ \ \ | |/ / |/| | Stop linking pthread.
| * | Remove now-unused variable test_libs.Nico Weber2014-11-221-2/+1
| | |
| * | Stop linking pthread.Nico Weber2014-11-221-2/+0
|/ / | | | | | | | | | | | | | | | | It was only needed by gtest, which is no longer used. (Intesting note: I checked when the -lpthread flag was added, and it's been around since the first revision of build.ninja, which used to be checked in before configure.py existed. Back then, it looks like '@' was used to dereference built-in variables, and build outputs were also prefixed by '@'!).
* | Merge pull request #861 from nico/nosubNico Weber2014-11-211-1/+0
|\ \ | | | | | | Remove duplicate import. No behavior change.
| * | Remove duplicate import. No behavior change.Nico Weber2014-11-211-1/+0
|/ /
* | Merge pull request #859 from martine/platform-helperEvan Martin2014-11-182-95/+76
|\ \ | | | | | | merge platform_helper into configure script
| * | merge platform_helper into configure scriptEvan Martin2014-11-182-95/+76
|/ / | | | | | | | | With this code all in one place, it's easier to spot unused code and simplification opportunities.
* | drop leftover references to bootstrap.pyEvan Martin2014-11-182-7/+4
| |
* | Merge pull request #858 from martine/travis-bootstrapEvan Martin2014-11-181-1/+1
|\ \ | | | | | | switch travis to use new --bootstrap mode for building
| * | switch travis to use new --bootstrap mode for buildingEvan Martin2014-11-181-1/+1
| | |
* | | Merge pull request #813 from cdlm/emacs-mode-require-newlineEvan Martin2014-11-181-2/+2
|\ \ \ | | | | | | | | Emacs mode: inherit from prog-mode
| * | | Emacs mode: inherit from prog-modeDamien Pollet2014-09-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `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`.
* | | | Merge pull request #836 from nocnokneo/patch-1Evan Martin2014-11-181-2/+4
|\ \ \ \ | |_|/ / |/| | | Mention optional files in installation instructions
| * | | Mention optional files in installation instructionsTaylor Braun-Jones2014-10-281-2/+4
| | | |
* | | | Merge pull request #854 from martine/bootstrapEvan Martin2014-11-187-172/+189
|\ \ \ \ | | | | | | | | | | add a --bootstrap mode for configure.py
| * | | | drop NINJA_BOOTSTRAP defineEvan Martin2014-11-182-4/+3
| | | | |
| * | | | drop bootstrap.pyEvan Martin2014-11-182-150/+9
| | | | | | | | | | | | | | | | | | | | | | | | | We now use configure.py --bootstrap. Direct users of this script to use the other one.
| * | | | add a --bootstrap mode for configure.pyEvan Martin2014-11-182-18/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | add an "expand" function to ninja_syntaxEvan Martin2014-11-182-0/+41
| | | | | | | | | | | | | | | | | | | | Implements basic variable expansion for use in configure.py.
* | | | | Merge pull request #857 from martine/travis-python-testEvan Martin2014-11-181-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | also test ninja_syntax.py in travis
| * | | | also test ninja_syntax.py in travisEvan Martin2014-11-181-1/+1
|/ / / /
* | | | Merge pull request #856 from nico/TABSNico Weber2014-11-171-2/+2
|\ \ \ \ | | | | | | | | | | emacs: Remove an empty line, wrap a comment.
| * | | | emacs: Remove an empty line, wrap a comment.Nico Weber2014-11-171-2/+2
|/ / / /
* | | | Merge pull request #842 from nico/solarisNico Weber2014-11-142-5/+2
|\ \ \ \ | | | | | | | | | | Fix building on Solaris.
| * | | | Fix building on Solaris.Nico Weber2014-11-012-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "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).
* | | | | Merge pull request #852 from nico/browseNico Weber2014-11-142-3/+7
|\ \ \ \ \ | | | | | | | | | | | | Make sure configure.py and ninja.cc always agree on if -t browse is incl...
| * | | | | Make sure configure.py and ninja.cc always agree on if -t browse is included.Nico Weber2014-11-142-3/+7
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.