third_party: Update waf to version 2.0.17

[samba.git] / third_party / waf / waflib / Tools / msvc.py

diff --git a/third_party/waf/waflib/Tools/msvc.py b/third_party/waf/waflib/Tools/msvc.py
index 17b347d458383031fba8314b9a0ca97683a828b8..f169c7f441b37e643a6423a88c56e271de89729d 100644 (file)
--- a/third_party/waf/waflib/Tools/msvc.py
+++ b/third_party/waf/waflib/Tools/msvc.py
@@ -281,7 +281,7 @@ def gather_wince_supported_platforms():
 
 def gather_msvc_detected_versions():
        #Detected MSVC versions!
-       version_pattern = re.compile('^(\d\d?\.\d\d?)(Exp)?$')
+       version_pattern = re.compile(r'^(\d\d?\.\d\d?)(Exp)?$')
        detected_versions = []
        for vcver,vcvar in (('VCExpress','Exp'), ('VisualStudio','')):
                prefix = 'SOFTWARE\\Wow6432node\\Microsoft\\' + vcver
@@ -367,7 +367,7 @@ def gather_wsdk_versions(conf, versions):
        :param versions: list to modify
        :type versions: list
        """
-       version_pattern = re.compile('^v..?.?\...?.?')
+       version_pattern = re.compile(r'^v..?.?\...?.?')
        try:
                all_versions = Utils.winreg.OpenKey(Utils.winreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\\Wow6432node\\Microsoft\\Microsoft SDKs\\Windows')
        except OSError:
@@ -525,7 +525,7 @@ def gather_icl_versions(conf, versions):
        :param versions: list to modify
        :type versions: list
        """
-       version_pattern = re.compile('^...?.?\....?.?')
+       version_pattern = re.compile(r'^...?.?\....?.?')
        try:
                all_versions = Utils.winreg.OpenKey(Utils.winreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\\Wow6432node\\Intel\\Compilers\\C++')
        except OSError:
@@ -579,7 +579,7 @@ def gather_intel_composer_versions(conf, versions):
        :param versions: list to modify
        :type versions: list
        """
-       version_pattern = re.compile('^...?.?\...?.?.?')
+       version_pattern = re.compile(r'^...?.?\...?.?.?')
        try:
                all_versions = Utils.winreg.OpenKey(Utils.winreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\\Wow6432node\\Intel\\Suites')
        except OSError:
@@ -683,7 +683,7 @@ def find_lt_names_msvc(self, libname, is_static=False):
                                if not is_static and ltdict.get('library_names', ''):
                                        dllnames=ltdict['library_names'].split()
                                        dll=dllnames[0].lower()
-                                       dll=re.sub('\.dll$', '', dll)
+                                       dll=re.sub(r'\.dll$', '', dll)
                                        return (lt_libdir, dll, False)
                                elif ltdict.get('old_library', ''):
                                        olib=ltdict['old_library']
@@ -700,7 +700,7 @@ def find_lt_names_msvc(self, libname, is_static=False):
 @conf
 def libname_msvc(self, libname, is_static=False):
        lib = libname.lower()
-       lib = re.sub('\.lib$','',lib)
+       lib = re.sub(r'\.lib$','',lib)
 
        if lib in g_msvc_systemlibs:
                return lib
@@ -747,11 +747,11 @@ def libname_msvc(self, libname, is_static=False):
                for libn in libnames:
                        if os.path.exists(os.path.join(path, libn)):
                                Logs.debug('msvc: lib found: %s', os.path.join(path,libn))
-                               return re.sub('\.lib$', '',libn)
+                               return re.sub(r'\.lib$', '',libn)
 
        #if no lib can be found, just return the libname as msvc expects it
        self.fatal('The library %r could not be found' % libname)
-       return re.sub('\.lib$', '', libname)
+       return re.sub(r'\.lib$', '', libname)
 
 @conf
 def check_lib_msvc(self, libname, is_static=False, uselib_store=None):
@@ -969,7 +969,7 @@ def apply_flags_msvc(self):
        if not is_static:
                for f in self.env.LINKFLAGS:
                        d = f.lower()
-                       if d[1:] == 'debug':
+                       if d[1:] in ('debug', 'debug:full', 'debug:fastlink'):
                                pdbnode = self.link_task.outputs[0].change_ext('.pdb')
                                self.link_task.outputs.append(pdbnode)