debug2

tpounds · Sep 2, 2019 · 75de092 · 75de092
1 parent 04fe327
commit 75de092
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/Build/BaseEnvironment.py b/Build/BaseEnvironment.py
@@ -3,6 +3,18 @@
 import subprocess
 
 def Test(target, source, env):
+   print "YYY: " + str(source[0])
+   print "YYY: " + str(source[0].abspath)
+   print "YYY: " + os.path.normpath(str(source[0]))
+   print "YYY: " + os.path.abspath(str(source[0]))
+   print "YYY: " + os.path.abspath('.')
+
+   print "ZZZ: " + os.getcwd()
+   print "ZZZ: " + os.path.abspath(os.getcwd())
+   print "ZZZ: " + " ".join(os.listdir('.'))
+   print "ZZZ: " + " ".join(os.listdir('test'))
+   print "ZZZ: " + " ".join(os.listdir('test\build'))
+
    proc = subprocess.Popen(source[0].abspath)
    proc.wait()
    print "\n============================="

diff --git a/Build/NTEnvironment.py b/Build/NTEnvironment.py
@@ -9,9 +9,9 @@ def __init__(self, **kw):
 
       self.ConfigureCompiler()
 
-      self['ENV']['INCLUDE'] = self['CPPPATH']
-      self['ENV']['LIB'] = self['LIBPATH']
-      self['ENV']['PATH'] = os.environ['PATH']
+      # self['ENV']['INCLUDE'] = self['CPPPATH']
+      # self['ENV']['LIB'] = self['LIBPATH']
+      # self['ENV']['PATH'] = os.environ['PATH']
 
    def ConfigureCompiler(self):
       cxx = self.WhereIs(self['CXX'])
@@ -24,11 +24,12 @@ def ConfigureCompiler(self):
       print "XXX: " + cxx_dir
 
       if cxx_bin.startswith("cl"):
-         common = cxx_dir + "\..\.."
-         if os.path.exists(common + "\Common\IDE"):
-           os.environ['PATH'] = common + "\Common\IDE" + ";" + cxx_dir
-         elif os.path.exists(common + "\Common7\IDE"):
-           os.environ['PATH'] = common + "\Common7\IDE" + ";" + cxx_dir
+         # common = cxx_dir + "\..\.."
+         # if os.path.exists(common + "\Common\IDE"):
+         #   os.environ['PATH'] = common + "\Common\IDE"
+         # elif os.path.exists(common + "\Common7\IDE"):
+         #   os.environ['PATH'] = common + "\Common7\IDE"
+         # os.environ['PATH'] += ";" + cxx_dir
 
          # proc = Popen(cxx_bin, stderr=STDOUT, stdout=PIPE)
          # proc.wait()
@@ -53,8 +54,8 @@ def ConfigureCompiler(self):
          self.AppendUnique(CXXFLAGS = ['/EHsc', '/GR', '/DBOOST_ALL_NO_LIB'])
          self['CXX'] = cxx_bin
 #         self['LINK'] = "link.exe"
-         self['CPPPATH'] = os.path.abspath(cxx_dir + "\..\include")
-         self['LIBPATH'] = os.path.abspath(cxx_dir + "\..\lib")
+         # self['CPPPATH'] = os.path.abspath(cxx_dir + "\..\include")
+         # self['LIBPATH'] = os.path.abspath(cxx_dir + "\..\lib")
 
          sdk_dir = ""
          if os.getenv('MicrosoftPlatformSDK', None) != None: