merge brocken gbp import-orig

4 files changed, 14 insertions, 14 deletions

diff --git a/src/script/scons-time.py b/src/script/scons-time.py
index 8ca1ac6..1fe3de5 100644
--- a/src/script/scons-time.py
+++ b/src/script/scons-time.py
@@ -32,7 +32,7 @@
 from __future__ import division
 from __future__ import nested_scopes
 
-__revision__ = "src/script/scons-time.py pchdll:3325:cd517fae59a4 2015/06/18 06:53:27 bdbaddog"
+__revision__ = "src/script/scons-time.py rel_2.3.5:3347:d31d5a4e74b6 2015/07/31 14:36:10 bdbaddog"
 
 import getopt
 import glob
diff --git a/src/script/scons.bat b/src/script/scons.bat
index 3f3069b..add424e 100644
--- a/src/script/scons.bat
+++ b/src/script/scons.bat
@@ -1,11 +1,11 @@
 @REM Copyright (c) 2001 - 2015 The SCons Foundation

-@REM src/script/scons.bat pchdll:3325:cd517fae59a4 2015/06/18 06:53:27 bdbaddog

+@REM src/script/scons.bat rel_2.3.5:3347:d31d5a4e74b6 2015/07/31 14:36:10 bdbaddog

 @echo off

 set SCONS_ERRORLEVEL=

 if "%OS%" == "Windows_NT" goto WinNT

 

 @REM for 9x/Me you better not have more than 9 args

-python -c "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'Lib', 'site-packages', 'scons-2.3.5'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-2.3.5'), join(sys.prefix, 'scons')] + sys.path; import SCons.Script; SCons.Script.main()" %1 %2 %3 %4 %5 %6 %7 %8 %9

+python -c "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'Lib', 'site-packages', 'scons-2.3.6'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-2.3.6'), join(sys.prefix, 'scons')] + sys.path; import SCons.Script; SCons.Script.main()" %1 %2 %3 %4 %5 %6 %7 %8 %9

 @REM no way to set exit status of this script for 9x/Me

 goto endscons

 

diff --git a/src/script/scons.py b/src/script/scons.py
index 155725a..a56dd8d 100644
--- a/src/script/scons.py
+++ b/src/script/scons.py
@@ -23,15 +23,15 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-__revision__ = "src/script/scons.py pchdll:3325:cd517fae59a4 2015/06/18 06:53:27 bdbaddog"
+__revision__ = "src/script/scons.py rel_2.3.5:3347:d31d5a4e74b6 2015/07/31 14:36:10 bdbaddog"
 
-__version__ = "2.3.5"
+__version__ = "2.3.6"
 
-__build__ = ""
+__build__ = "rel_2.3.5:3347:d31d5a4e74b6[MODIFIED]"
 
-__buildsys__ = "ubuntu1404-32bit"
+__buildsys__ = "hpmicrodog"
 
-__date__ = "2015/06/18 06:53:27"
+__date__ = "2015/07/31 14:36:10"
 
 __developer__ = "bdbaddog"
 
@@ -191,7 +191,7 @@ if __name__ == "__main__":
     except:
         print("Import failed. Unable to find SCons files in:")
         for path in libs:
-          print "  %s" % path
+            print("  %s" % path)
         raise
 
     # this does all the work, and calls sys.exit
diff --git a/src/script/sconsign.py b/src/script/sconsign.py
index 197996d..c652bf7 100644
--- a/src/script/sconsign.py
+++ b/src/script/sconsign.py
@@ -23,15 +23,15 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-__revision__ = "src/script/sconsign.py pchdll:3325:cd517fae59a4 2015/06/18 06:53:27 bdbaddog"
+__revision__ = "src/script/sconsign.py rel_2.3.5:3347:d31d5a4e74b6 2015/07/31 14:36:10 bdbaddog"
 
-__version__ = "2.3.5"
+__version__ = "2.3.6"
 
-__build__ = ""
+__build__ = "rel_2.3.5:3347:d31d5a4e74b6[MODIFIED]"
 
-__buildsys__ = "ubuntu1404-32bit"
+__buildsys__ = "hpmicrodog"
 
-__date__ = "2015/06/18 06:53:27"
+__date__ = "2015/07/31 14:36:10"
 
 __developer__ = "bdbaddog"