msvs.py (scons-4.2.0) | : | msvs.py (SCons-4.3.0) | ||
---|---|---|---|---|
skipping to change at line 378 | skipping to change at line 378 | |||
'WebServiceDebuggerHttpUrl': None, | 'WebServiceDebuggerHttpUrl': None, | |||
'WebServiceDebuggerDebuggerType': None, | 'WebServiceDebuggerDebuggerType': None, | |||
'WebServiceDebuggerSQLDebugging': None, | 'WebServiceDebuggerSQLDebugging': None, | |||
} | } | |||
class _GenerateV10User(_UserGenerator): | class _GenerateV10User(_UserGenerator): | |||
"""Generates a Project'user file for MSVS 2010 or later""" | """Generates a Project'user file for MSVS 2010 or later""" | |||
def __init__(self, dspfile, source, env): | def __init__(self, dspfile, source, env): | |||
version_num, suite = msvs_parse_version(env['MSVS_VERSION']) | version_num, suite = msvs_parse_version(env['MSVS_VERSION']) | |||
if version_num >= 14.2: | if version_num >= 14.3: | |||
# Visual Studio 2022 is considered to be version 17. | ||||
self.versionstr = '17.0' | ||||
elif version_num >= 14.2: | ||||
# Visual Studio 2019 is considered to be version 16. | # Visual Studio 2019 is considered to be version 16. | |||
self.versionstr = '16.0' | self.versionstr = '16.0' | |||
elif version_num >= 14.1: | elif version_num >= 14.1: | |||
# Visual Studio 2017 is considered to be version 15. | # Visual Studio 2017 is considered to be version 15. | |||
self.versionstr = '15.0' | self.versionstr = '15.0' | |||
elif version_num == 14.0: | elif version_num == 14.0: | |||
self.versionstr = '14.0' | self.versionstr = '14.0' | |||
else: | else: | |||
self.versionstr = '4.0' | self.versionstr = '4.0' | |||
self.usrhead = V10UserHeader | self.usrhead = V10UserHeader | |||
skipping to change at line 1597 | skipping to change at line 1600 | |||
except KeyboardInterrupt: | except KeyboardInterrupt: | |||
raise | raise | |||
except: | except: | |||
return # unable to unpickle any data for some reason | return # unable to unpickle any data for some reason | |||
self.configs.update(data) | self.configs.update(data) | |||
def PrintSolution(self): | def PrintSolution(self): | |||
"""Writes a solution file""" | """Writes a solution file""" | |||
self.file.write('Microsoft Visual Studio Solution File, Format Version % s\n' % self.versionstr) | self.file.write('Microsoft Visual Studio Solution File, Format Version % s\n' % self.versionstr) | |||
if self.version_num >= 14.2: | if self.version_num >= 14.3: | |||
# Visual Studio 2022 is considered to be version 17. | ||||
self.file.write('# Visual Studio 17\n') | ||||
elif self.version_num >= 14.2: | ||||
# Visual Studio 2019 is considered to be version 16. | # Visual Studio 2019 is considered to be version 16. | |||
self.file.write('# Visual Studio 16\n') | self.file.write('# Visual Studio 16\n') | |||
elif self.version_num > 14.0: | elif self.version_num > 14.0: | |||
# Visual Studio 2015 and 2017 are both considered to be version 15. | # Visual Studio 2015 and 2017 are both considered to be version 15. | |||
self.file.write('# Visual Studio 15\n') | self.file.write('# Visual Studio 15\n') | |||
elif self.version_num >= 12.0: | elif self.version_num >= 12.0: | |||
self.file.write('# Visual Studio 14\n') | self.file.write('# Visual Studio 14\n') | |||
elif self.version_num >= 11.0: | elif self.version_num >= 11.0: | |||
self.file.write('# Visual Studio 11\n') | self.file.write('# Visual Studio 11\n') | |||
elif self.version_num >= 10.0: | elif self.version_num >= 10.0: | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 8 lines changed or added |