Changeset c101fe1 for waflib/Tools/msvc.py

Timestamp:

Nov 13, 2013, 1:00:56 PM (10 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

d3066e2

Parents:

54e74f0

Message:

waf, waflib: update to 1.7.13

File:

• waflib/Tools/msvc.py (modified) (12 diffs)

waflib/Tools/msvc.py

@@ -4 +4 @@
 
 import os,sys,re,tempfile
-from waflib import Utils,Task,Logs,Options
+from waflib import Utils,Task,Logs,Options,Errors
 from waflib.Logs import debug,warn
 from waflib.TaskGen import after_method,feature
@@ -29 +29 @@
 wintrust wldap32 wmiutils wow32 ws2_32 wsnmp32 wsock32 wst wtsapi32 xaswitch xolehlp
 '''.split()
-all_msvc_platforms=[('x64','amd64'),('x86','x86'),('ia64','ia64'),('x86_amd64','amd64'),('x86_ia64','ia64')]
+all_msvc_platforms=[('x64','amd64'),('x86','x86'),('ia64','ia64'),('x86_amd64','amd64'),('x86_ia64','ia64'),('x86_arm','arm')]
 all_wince_platforms=[('armv4','arm'),('armv4i','arm'),('mipsii','mips'),('mipsii_fp','mips'),('mipsiv','mips'),('mipsiv_fp','mips'),('sh4','sh'),('x86','cex86')]
 all_icl_platforms=[('intel64','amd64'),('em64t','amd64'),('ia32','x86'),('Itanium','ia64')]
@@ -67 +67 @@
 echo PATH=%%PATH%%
 echo INCLUDE=%%INCLUDE%%
-echo LIB=%%LIB%%
+echo LIB=%%LIB%%;%%LIBPATH%%
 """%(vcvars,target))
         sout=conf.cmd_and_log(['cmd','/E:on','/V:on','/C',batfile.abspath()])
@@ -73 +73 @@
         if not lines[0]:
                 lines.pop(0)
-        if version=='11.0':
-                if lines[0].startswith('Error'):
-                        conf.fatal('msvc: Could not find a valid architecture for building (get_msvc_version_1)')
-        else:
-                for x in('Setting environment','Setting SDK environment','Intel(R) C++ Compiler','Intel Parallel Studio','Intel(R) Parallel Studio','Intel(R) Composer','Intel Corporation. All rights reserved.'):
-                        if lines[0].find(x)>-1:
-                                lines.pop(0)
-                                break
-                else:
-                        debug('msvc: get_msvc_version: %r %r %r -> not found',compiler,version,target)
-                        conf.fatal('msvc: Could not find a valid architecture for building (get_msvc_version_2)')
         MSVC_PATH=MSVC_INCDIR=MSVC_LIBDIR=None
         for line in lines:
@@ -233 +222 @@
                 except conf.errors.ConfigurationError:
                         pass
-        versions.append(('msvc '+version,targets))
+        if targets:
+                versions.append(('msvc '+version,targets))
 @conf
 def gather_wince_targets(conf,versions,version,vc_path,vsvars,supported_platforms):
@@ -254 +244 @@
                         versions.append((device+' '+version,cetargets))
 @conf
+def gather_winphone_targets(conf,versions,version,vc_path,vsvars):
+        targets=[]
+        for target,realtarget in all_msvc_platforms[::-1]:
+                try:
+                        targets.append((target,(realtarget,conf.get_msvc_version('winphone',version,target,vsvars))))
+                except conf.errors.ConfigurationError ,e:
+                        pass
+        if targets:
+                versions.append(('winphone '+version,targets))
+@conf
 def gather_msvc_versions(conf,versions):
         vc_paths=[]
@@ -272 +272 @@
                 if wince_supported_platforms and os.path.isfile(vsvars):
                         conf.gather_wince_targets(versions,version,vc_path,vsvars,wince_supported_platforms)
+                vsvars=os.path.join(vs_path,'VC','WPSDK','WP80','vcvarsphoneall.bat')
+                if os.path.isfile(vsvars):
+                        conf.gather_winphone_targets(versions,'8.0',vc_path,vsvars)
         for version,vc_path in vc_paths:
                 vs_path=os.path.dirname(vc_path)
@@ -370 +373 @@
                                         patch_url='http://software.intel.com/en-us/forums/topic/328487'
                                         compilervars_arch=os.path.join(path,'bin','compilervars_arch.bat')
-                                        vs_express_path=os.environ['VS110COMNTOOLS']+r'..\IDE\VSWinExpress.exe'
-                                        dev_env_path=os.environ['VS110COMNTOOLS']+r'..\IDE\devenv.exe'
-                                        if(r'if exist "%VS110COMNTOOLS%..\IDE\VSWinExpress.exe"'in Utils.readf(compilervars_arch)and not os.path.exists(vs_express_path)and not os.path.exists(dev_env_path)):
-                                                Logs.warn(('The Intel compilervar_arch.bat only checks for one Visual Studio SKU ''(VSWinExpress.exe) but it does not seem to be installed at %r. ''The intel command line set up will fail to configure unless the file %r''is patched. See: %s')%(vs_express_path,compilervars_arch,patch_url))
+                                        for vscomntool in['VS110COMNTOOLS','VS100COMNTOOLS']:
+                                                if vscomntool in os.environ:
+                                                        vs_express_path=os.environ[vscomntool]+r'..\IDE\VSWinExpress.exe'
+                                                        dev_env_path=os.environ[vscomntool]+r'..\IDE\devenv.exe'
+                                                        if(r'if exist "%VS110COMNTOOLS%..\IDE\VSWinExpress.exe"'in Utils.readf(compilervars_arch)and not os.path.exists(vs_express_path)and not os.path.exists(dev_env_path)):
+                                                                Logs.warn(('The Intel compilervar_arch.bat only checks for one Visual Studio SKU ''(VSWinExpress.exe) but it does not seem to be installed at %r. ''The intel command line set up will fail to configure unless the file %r''is patched. See: %s')%(vs_express_path,compilervars_arch,patch_url))
                         except WindowsError:
                                 pass
@@ -545 +550 @@
                 conf.find_program('MT',path_list=path,var='MT')
                 v['MTFLAGS']=['/NOLOGO']
-        conf.load('winres')
-        if not conf.env['WINRC']:
+        try:
+                conf.load('winres')
+        except Errors.WafError:
                 warn('Resource compiler not found. Compiling resource file is disabled')
 @conf
@@ -564 +570 @@
         v['CC_SRC_F']=''
         v['CC_TGT_F']=['/c','/Fo']
-        if v['MSVC_VERSION']>=8:
-                v['CC_TGT_F']=['/FC']+v['CC_TGT_F']
         v['CXX_SRC_F']=''
         v['CXX_TGT_F']=['/c','/Fo']
-        if v['MSVC_VERSION']>=8:
+        if(v.MSVC_COMPILER=='msvc'and v.MSVC_VERSION>=8)or(v.MSVC_COMPILER=='wsdk'and v.MSVC_VERSION>=6):
+                v['CC_TGT_F']=['/FC']+v['CC_TGT_F']
                 v['CXX_TGT_F']=['/FC']+v['CXX_TGT_F']
         v['CPPPATH_ST']='/I%s'
@@ -682 +687 @@
         return ret
 def exec_command_msvc(self,*k,**kw):
-        assert self.env['CC_NAME']=='msvc'
         if isinstance(k[0],list):
                 lst=[]
@@ -725 +729 @@
 for k in'c cxx cprogram cxxprogram cshlib cxxshlib cstlib cxxstlib'.split():
         wrap_class(k)
+def make_winapp(self,family):
+        append=self.env.append_unique
+        append('DEFINES','WINAPI_FAMILY=%s'%family)
+        append('CXXFLAGS','/ZW')
+        append('CXXFLAGS','/TP')
+        for lib_path in self.env.LIBPATH:
+                append('CXXFLAGS','/AI%s'%lib_path)
+@feature('winphoneapp')
+@after_method('process_use')
+@after_method('propagate_uselib_vars')
+def make_winphone_app(self):
+        make_winapp(self,'WINAPI_FAMILY_PHONE_APP')
+        conf.env.append_unique('LINKFLAGS','/NODEFAULTLIB:ole32.lib')
+        conf.env.append_unique('LINKFLAGS','PhoneAppModelHost.lib')
+@feature('winapp')
+@after_method('process_use')
+@after_method('propagate_uselib_vars')
+def make_windows_app(self):
+        make_winapp(self,'WINAPI_FAMILY_DESKTOP_APP')