Merge branch 'master' into lex_space_args

1 files changed, 7 insertions, 1 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index e43cc0e..c986c1e 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -135,7 +135,13 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
       Note that these are called for every build command run by SCons. It could have considerable
       performance impact if not used carefully.
       to connect to the server during start up.
-    - Updated lex emitter to respect escaped spaces when climbing out of a the SConscript dir
+    - Updated lex emitter to respect escaped spaces when climbing out of a the SConscript dir.
+      Previously if the build/source directories absolute path included a space the lex emitter
+      would fail to use the correct paths.
+    - Ninja: added option "--skip-ninja-regen" to enable skipping regeneration of the ninja file
+      if scons can determine the ninja file doesnot need to be regenerated, which will also
+      skip restarting the scons daemon. Note this option is could result in incorrect rebuilds
+      if scons Glob or scons generated files are used in ninja build target's command lines.
     - Ninja: Added new alias "shutdown-ninja-scons-daemon" to allow ninja to shutdown the daemon.
       Also added cleanup to test framework to kill ninja scons daemons and clean ip daemon logs.
       NOTE: Test for this requires python psutil module. It will be skipped if not present.