From 8c9aa75f2069bd3c0d2369c404899d457e391d0c Mon Sep 17 00:00:00 2001
From: William Deegan <bill@baddogconsulting.com>
Date: Tue, 10 Jul 2018 14:54:27 -0400
Subject: fix TestSCons.get_platform_python_info() to work on win32, had
 omitted some needed imports

---
 testing/framework/TestSCons.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/testing/framework/TestSCons.py b/testing/framework/TestSCons.py
index c9de47a..50942ab 100644
--- a/testing/framework/TestSCons.py
+++ b/testing/framework/TestSCons.py
@@ -1270,12 +1270,9 @@ SConscript( sconscript )
 
         if sys.platform == 'win32':
             self.run(program=python, stdin="""\
-import sysconfig
+import sysconfig, sys, os.path
 try:
-    if sys.platform == 'win32':
         py_ver = 'python%d%d' % sys.version_info[:2]
-    else:
-        py_ver = 'python%d.%d' % sys.version_info[:2]
 except AttributeError:
     py_ver = 'python' + sys.version[:3]
 # print include and lib path
-- 
cgit v0.12


From 881dbcf2ef36b31be29ad6aff17ee54f04865329 Mon Sep 17 00:00:00 2001
From: Hao Wu <echowuhao@gmail.com>
Date: Wed, 11 Jul 2018 09:04:01 +0800
Subject: typo

credit: https://stackoverflow.com/questions/39856184/does-scons-customized-decider-function-require-to-be-class-member
---
 doc/user/depends.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/user/depends.xml b/doc/user/depends.xml
index f5f2270..8e548d2 100644
--- a/doc/user/depends.xml
+++ b/doc/user/depends.xml
@@ -518,7 +518,7 @@ cc -o hello hello.o
         <file name="SConstruct" printme="1">
 Program('hello.c')
 def decide_if_changed(dependency, target, prev_ni):
-    if self.get_timestamp() != prev_ni.timestamp:
+    if dependency.get_timestamp() != prev_ni.timestamp:
         dep = str(dependency)
         tgt = str(target)
         if specific_part_of_file_has_changed(dep, tgt):
-- 
cgit v0.12


From b8180bf3cbfdc23523a201f3c889291bdabc2c67 Mon Sep 17 00:00:00 2001
From: Hao Wu <echowuhao@gmail.com>
Date: Thu, 12 Jul 2018 08:42:03 +0800
Subject: Update CHANGES.txt

---
 src/CHANGES.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index b3ef826..01418bc 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -97,6 +97,9 @@ RELEASE 3.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
     - xml validity fixes from SConstruct.py change
     - update wiki links to new github location
     - update bug links to new github location
+    
+  From Hao Wu
+    - typo in customized decider example in user guide 
 
 
 
-- 
cgit v0.12