Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

backend/vs: Deduplicate basic project template. 

Note that a few minor details of the output changed for some target types. I
think I called them out with XXXs in the code for now.
This commit is contained in:
Andres Freund 2021-10-08 10:09:20 -07:00
parent f2e4177c76
commit 1fb2818d42
1 changed files with 61 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

232
mesonbuild/backend/vs2010backend.py
View File

@ -516,11 +516,15 @@ class Vs2010Backend(backends.Backend):
tid = self.environment.coredata.target_guids[dep.get_id()] tid = self.environment.coredata.target_guids[dep.get_id()]
self.add_project_reference(root, vcxproj, tid) self.add_project_reference(root, vcxproj, tid)
def create_basic_crap(self, target, guid): def create_basic_project(self, target_name, *,
project_name = target.name temp_dir,
guid,
conftype = 'Utility',
target_ext = None):
root = ET.Element('Project', {'DefaultTargets': "Build", root = ET.Element('Project', {'DefaultTargets': "Build",
'ToolsVersion': '4.0', 'ToolsVersion': '4.0',
'xmlns': 'http://schemas.microsoft.com/developer/msbuild/2003'}) 'xmlns': 'http://schemas.microsoft.com/developer/msbuild/2003'})
confitems = ET.SubElement(root, 'ItemGroup', {'Label': 'ProjectConfigurations'}) confitems = ET.SubElement(root, 'ItemGroup', {'Label': 'ProjectConfigurations'})
prjconf = ET.SubElement(confitems, 'ProjectConfiguration', prjconf = ET.SubElement(confitems, 'ProjectConfiguration',
{'Include': self.buildtype + '|' + self.platform}) {'Include': self.buildtype + '|' + self.platform})
@ -528,38 +532,59 @@ class Vs2010Backend(backends.Backend):
p.text = self.buildtype p.text = self.buildtype
pl = ET.SubElement(prjconf, 'Platform') pl = ET.SubElement(prjconf, 'Platform')
pl.text = self.platform pl.text = self.platform
# Globals
globalgroup = ET.SubElement(root, 'PropertyGroup', Label='Globals') globalgroup = ET.SubElement(root, 'PropertyGroup', Label='Globals')
guidelem = ET.SubElement(globalgroup, 'ProjectGuid') guidelem = ET.SubElement(globalgroup, 'ProjectGuid')
guidelem.text = '{%s}' % guid guidelem.text = '{%s}' % guid
kw = ET.SubElement(globalgroup, 'Keyword') kw = ET.SubElement(globalgroup, 'Keyword')
kw.text = self.platform + 'Proj' kw.text = self.platform + 'Proj'
# XXX Wasn't here before for anything but gen_vcxproj , but seems fine?
ns = ET.SubElement(globalgroup, 'RootNamespace')
ns.text = target_name
p = ET.SubElement(globalgroup, 'Platform') p = ET.SubElement(globalgroup, 'Platform')
p.text = self.platform p.text = self.platform
pname = ET.SubElement(globalgroup, 'ProjectName') pname = ET.SubElement(globalgroup, 'ProjectName')
pname.text = project_name pname.text = target_name
if self.windows_target_platform_version: if self.windows_target_platform_version:
ET.SubElement(globalgroup, 'WindowsTargetPlatformVersion').text = self.windows_target_platform_version ET.SubElement(globalgroup, 'WindowsTargetPlatformVersion').text = self.windows_target_platform_version
ET.SubElement(root, 'Import', Project=r'$(VCTargetsPath)\Microsoft.Cpp.Default.props') ET.SubElement(root, 'Import', Project=r'$(VCTargetsPath)\Microsoft.Cpp.Default.props')
# Start configuration
type_config = ET.SubElement(root, 'PropertyGroup', Label='Configuration') type_config = ET.SubElement(root, 'PropertyGroup', Label='Configuration')
ET.SubElement(type_config, 'ConfigurationType') ET.SubElement(type_config, 'ConfigurationType').text = conftype
ET.SubElement(type_config, 'CharacterSet').text = 'MultiByte' ET.SubElement(type_config, 'CharacterSet').text = 'MultiByte'
# Fixme: wasn't here before for gen_vcxproj()
ET.SubElement(type_config, 'UseOfMfc').text = 'false' ET.SubElement(type_config, 'UseOfMfc').text = 'false'
if self.platform_toolset: if self.platform_toolset:
ET.SubElement(type_config, 'PlatformToolset').text = self.platform_toolset ET.SubElement(type_config, 'PlatformToolset').text = self.platform_toolset
# End configuration section (but it can be added to further via type_config)
ET.SubElement(root, 'Import', Project=r'$(VCTargetsPath)\Microsoft.Cpp.props') ET.SubElement(root, 'Import', Project=r'$(VCTargetsPath)\Microsoft.Cpp.props')
# Project information
direlem = ET.SubElement(root, 'PropertyGroup') direlem = ET.SubElement(root, 'PropertyGroup')
fver = ET.SubElement(direlem, '_ProjectFileVersion') fver = ET.SubElement(direlem, '_ProjectFileVersion')
fver.text = self.project_file_version fver.text = self.project_file_version
outdir = ET.SubElement(direlem, 'OutDir') outdir = ET.SubElement(direlem, 'OutDir')
outdir.text = '.\\' outdir.text = '.\\'
intdir = ET.SubElement(direlem, 'IntDir') intdir = ET.SubElement(direlem, 'IntDir')
intdir.text = target.get_id() + '\\' intdir.text = temp_dir + '\\'
tname = ET.SubElement(direlem, 'TargetName') tname = ET.SubElement(direlem, 'TargetName')
tname.text = target.name tname.text = target_name
return root
if target_ext:
ET.SubElement(direlem, 'TargetExt').text = target_ext
return (root, type_config)
def gen_run_target_vcxproj(self, target, ofname, guid): def gen_run_target_vcxproj(self, target, ofname, guid):
root = self.create_basic_crap(target, guid) (root, type_config) = self.create_basic_project(target.name,
temp_dir = target.get_id(),
guid = guid)
depend_files = self.get_custom_target_depend_files(target) depend_files = self.get_custom_target_depend_files(target)
if not target.command: if not target.command:
@ -587,7 +612,9 @@ class Vs2010Backend(backends.Backend):
self._prettyprint_vcxproj_xml(ET.ElementTree(root), ofname) self._prettyprint_vcxproj_xml(ET.ElementTree(root), ofname)
def gen_custom_target_vcxproj(self, target, ofname, guid): def gen_custom_target_vcxproj(self, target, ofname, guid):
root = self.create_basic_crap(target, guid) (root, type_config) = self.create_basic_project(target.name,
temp_dir = target.get_id(),
guid = guid)
# We need to always use absolute paths because our invocation is always # We need to always use absolute paths because our invocation is always
# from the target dir, not the build root. # from the target dir, not the build root.
target.absolute_paths = True target.absolute_paths = True
@ -829,43 +856,23 @@ class Vs2010Backend(backends.Backend):
build_args += compiler.sanitizer_compile_args(self.sanitize) build_args += compiler.sanitizer_compile_args(self.sanitize)
buildtype_link_args = compiler.get_buildtype_linker_args(self.buildtype) buildtype_link_args = compiler.get_buildtype_linker_args(self.buildtype)
vscrt_type = self.environment.coredata.options[OptionKey('b_vscrt')] vscrt_type = self.environment.coredata.options[OptionKey('b_vscrt')]
project_name = target.name
target_name = target.name target_name = target.name
if target.for_machine is MachineChoice.BUILD: if target.for_machine is MachineChoice.BUILD:
platform = self.build_platform platform = self.build_platform
else: else:
platform = self.platform platform = self.platform
root = ET.Element('Project', {'DefaultTargets': "Build",
'ToolsVersion': '4.0', tfilename = os.path.splitext(target.get_filename())
'xmlns': 'http://schemas.microsoft.com/developer/msbuild/2003'})
confitems = ET.SubElement(root, 'ItemGroup', {'Label': 'ProjectConfigurations'}) (root, type_config) = self.create_basic_project(tfilename[0],
prjconf = ET.SubElement(confitems, 'ProjectConfiguration', temp_dir = target.get_id(),
{'Include': self.buildtype + '|' + platform}) guid = guid,
p = ET.SubElement(prjconf, 'Configuration') conftype = conftype,
p.text = self.buildtype target_ext = tfilename[1])
pl = ET.SubElement(prjconf, 'Platform')
pl.text = platform # FIXME: Should these just be set in create_basic_project(), even if
# Globals # irrelevant for current target?
globalgroup = ET.SubElement(root, 'PropertyGroup', Label='Globals')
guidelem = ET.SubElement(globalgroup, 'ProjectGuid')
guidelem.text = '{%s}' % guid
kw = ET.SubElement(globalgroup, 'Keyword')
kw.text = self.platform + 'Proj'
ns = ET.SubElement(globalgroup, 'RootNamespace')
ns.text = target_name
p = ET.SubElement(globalgroup, 'Platform')
p.text = platform
pname = ET.SubElement(globalgroup, 'ProjectName')
pname.text = project_name
if self.windows_target_platform_version:
ET.SubElement(globalgroup, 'WindowsTargetPlatformVersion').text = self.windows_target_platform_version
ET.SubElement(root, 'Import', Project=r'$(VCTargetsPath)\Microsoft.Cpp.Default.props')
# Start configuration
type_config = ET.SubElement(root, 'PropertyGroup', Label='Configuration')
ET.SubElement(type_config, 'ConfigurationType').text = conftype
ET.SubElement(type_config, 'CharacterSet').text = 'MultiByte'
if self.platform_toolset:
ET.SubElement(type_config, 'PlatformToolset').text = self.platform_toolset
# FIXME: Meson's LTO support needs to be integrated here # FIXME: Meson's LTO support needs to be integrated here
ET.SubElement(type_config, 'WholeProgramOptimization').text = 'false' ET.SubElement(type_config, 'WholeProgramOptimization').text = 'false'
# Let VS auto-set the RTC level # Let VS auto-set the RTC level
@ -874,9 +881,6 @@ class Vs2010Backend(backends.Backend):
if '/INCREMENTAL:NO' in buildtype_link_args: if '/INCREMENTAL:NO' in buildtype_link_args:
ET.SubElement(type_config, 'LinkIncremental').text = 'false' ET.SubElement(type_config, 'LinkIncremental').text = 'false'
# End configuration (but note we add further to type_config, below)
ET.SubElement(root, 'Import', Project=r'$(VCTargetsPath)\Microsoft.Cpp.props')
# Build information # Build information
compiles = ET.SubElement(root, 'ItemDefinitionGroup') compiles = ET.SubElement(root, 'ItemDefinitionGroup')
clconf = ET.SubElement(compiles, 'ClCompile') clconf = ET.SubElement(compiles, 'ClCompile')
@ -946,17 +950,6 @@ class Vs2010Backend(backends.Backend):
gen_src += custom_src gen_src += custom_src
gen_hdrs += custom_hdrs gen_hdrs += custom_hdrs
gen_langs += custom_langs gen_langs += custom_langs
# Project information
direlem = ET.SubElement(root, 'PropertyGroup')
fver = ET.SubElement(direlem, '_ProjectFileVersion')
fver.text = self.project_file_version
outdir = ET.SubElement(direlem, 'OutDir')
outdir.text = '.\\'
intdir = ET.SubElement(direlem, 'IntDir')
intdir.text = target.get_id() + '\\'
tfilename = os.path.splitext(target.get_filename())
ET.SubElement(direlem, 'TargetName').text = tfilename[0]
ET.SubElement(direlem, 'TargetExt').text = tfilename[1]
# Arguments, include dirs, defines for all files in the current target # Arguments, include dirs, defines for all files in the current target
target_args = [] target_args = []
@ -1395,44 +1388,10 @@ class Vs2010Backend(backends.Backend):
self._prettyprint_vcxproj_xml(ET.ElementTree(root), ofname) self._prettyprint_vcxproj_xml(ET.ElementTree(root), ofname)
def gen_regenproj(self, project_name, ofname): def gen_regenproj(self, project_name, ofname):
root = ET.Element('Project', {'DefaultTargets': 'Build', guid = self.environment.coredata.regen_guid
'ToolsVersion': '4.0', (root, type_config) = self.create_basic_project(project_name,
'xmlns': 'http://schemas.microsoft.com/developer/msbuild/2003'}) temp_dir = 'regen-temp',
confitems = ET.SubElement(root, 'ItemGroup', {'Label': 'ProjectConfigurations'}) guid = guid)
prjconf = ET.SubElement(confitems, 'ProjectConfiguration',
{'Include': self.buildtype + '|' + self.platform})
p = ET.SubElement(prjconf, 'Configuration')
p.text = self.buildtype
pl = ET.SubElement(prjconf, 'Platform')
pl.text = self.platform
globalgroup = ET.SubElement(root, 'PropertyGroup', Label='Globals')
guidelem = ET.SubElement(globalgroup, 'ProjectGuid')
guidelem.text = '{%s}' % self.environment.coredata.regen_guid
kw = ET.SubElement(globalgroup, 'Keyword')
kw.text = self.platform + 'Proj'
p = ET.SubElement(globalgroup, 'Platform')
p.text = self.platform
pname = ET.SubElement(globalgroup, 'ProjectName')
pname.text = project_name
if self.windows_target_platform_version:
ET.SubElement(globalgroup, 'WindowsTargetPlatformVersion').text = self.windows_target_platform_version
ET.SubElement(root, 'Import', Project=r'$(VCTargetsPath)\Microsoft.Cpp.Default.props')
type_config = ET.SubElement(root, 'PropertyGroup', Label='Configuration')
ET.SubElement(type_config, 'ConfigurationType').text = "Utility"
ET.SubElement(type_config, 'CharacterSet').text = 'MultiByte'
ET.SubElement(type_config, 'UseOfMfc').text = 'false'
if self.platform_toolset:
ET.SubElement(type_config, 'PlatformToolset').text = self.platform_toolset
ET.SubElement(root, 'Import', Project=r'$(VCTargetsPath)\Microsoft.Cpp.props')
direlem = ET.SubElement(root, 'PropertyGroup')
fver = ET.SubElement(direlem, '_ProjectFileVersion')
fver.text = self.project_file_version
outdir = ET.SubElement(direlem, 'OutDir')
outdir.text = '.\\'
intdir = ET.SubElement(direlem, 'IntDir')
intdir.text = 'regen-temp\\'
tname = ET.SubElement(direlem, 'TargetName')
tname.text = project_name
action = ET.SubElement(root, 'ItemDefinitionGroup') action = ET.SubElement(root, 'ItemDefinitionGroup')
midl = ET.SubElement(action, 'Midl') midl = ET.SubElement(action, 'Midl')
@ -1455,45 +1414,10 @@ class Vs2010Backend(backends.Backend):
self._prettyprint_vcxproj_xml(ET.ElementTree(root), ofname) self._prettyprint_vcxproj_xml(ET.ElementTree(root), ofname)
def gen_testproj(self, target_name, ofname): def gen_testproj(self, target_name, ofname):
project_name = target_name guid = self.environment.coredata.test_guid
root = ET.Element('Project', {'DefaultTargets': "Build", (root, type_config) = self.create_basic_project(target_name,
'ToolsVersion': '4.0', temp_dir = 'test-temp',
'xmlns': 'http://schemas.microsoft.com/developer/msbuild/2003'}) guid = guid)
confitems = ET.SubElement(root, 'ItemGroup', {'Label': 'ProjectConfigurations'})
prjconf = ET.SubElement(confitems, 'ProjectConfiguration',
{'Include': self.buildtype + '|' + self.platform})
p = ET.SubElement(prjconf, 'Configuration')
p.text = self.buildtype
pl = ET.SubElement(prjconf, 'Platform')
pl.text = self.platform
globalgroup = ET.SubElement(root, 'PropertyGroup', Label='Globals')
guidelem = ET.SubElement(globalgroup, 'ProjectGuid')
guidelem.text = '{%s}' % self.environment.coredata.test_guid
kw = ET.SubElement(globalgroup, 'Keyword')
kw.text = self.platform + 'Proj'
p = ET.SubElement(globalgroup, 'Platform')
p.text = self.platform
pname = ET.SubElement(globalgroup, 'ProjectName')
pname.text = project_name
if self.windows_target_platform_version:
ET.SubElement(globalgroup, 'WindowsTargetPlatformVersion').text = self.windows_target_platform_version
ET.SubElement(root, 'Import', Project=r'$(VCTargetsPath)\Microsoft.Cpp.Default.props')
type_config = ET.SubElement(root, 'PropertyGroup', Label='Configuration')
ET.SubElement(type_config, 'ConfigurationType')
ET.SubElement(type_config, 'CharacterSet').text = 'MultiByte'
ET.SubElement(type_config, 'UseOfMfc').text = 'false'
if self.platform_toolset:
ET.SubElement(type_config, 'PlatformToolset').text = self.platform_toolset
ET.SubElement(root, 'Import', Project=r'$(VCTargetsPath)\Microsoft.Cpp.props')
direlem = ET.SubElement(root, 'PropertyGroup')
fver = ET.SubElement(direlem, '_ProjectFileVersion')
fver.text = self.project_file_version
outdir = ET.SubElement(direlem, 'OutDir')
outdir.text = '.\\'
intdir = ET.SubElement(direlem, 'IntDir')
intdir.text = 'test-temp\\'
tname = ET.SubElement(direlem, 'TargetName')
tname.text = target_name
action = ET.SubElement(root, 'ItemDefinitionGroup') action = ET.SubElement(root, 'ItemDefinitionGroup')
midl = ET.SubElement(action, 'Midl') midl = ET.SubElement(action, 'Midl')
@ -1517,45 +1441,11 @@ class Vs2010Backend(backends.Backend):
def gen_installproj(self, target_name, ofname): def gen_installproj(self, target_name, ofname):
self.create_install_data_files() self.create_install_data_files()
project_name = target_name
root = ET.Element('Project', {'DefaultTargets': "Build", guid = self.environment.coredata.install_guid
'ToolsVersion': '4.0', (root, type_config) = self.create_basic_project(target_name,
'xmlns': 'http://schemas.microsoft.com/developer/msbuild/2003'}) temp_dir = 'install-temp',
confitems = ET.SubElement(root, 'ItemGroup', {'Label': 'ProjectConfigurations'}) guid = guid)
prjconf = ET.SubElement(confitems, 'ProjectConfiguration',
{'Include': self.buildtype + '|' + self.platform})
p = ET.SubElement(prjconf, 'Configuration')
p.text = self.buildtype
pl = ET.SubElement(prjconf, 'Platform')
pl.text = self.platform
globalgroup = ET.SubElement(root, 'PropertyGroup', Label='Globals')
guidelem = ET.SubElement(globalgroup, 'ProjectGuid')
guidelem.text = '{%s}' % self.environment.coredata.install_guid
kw = ET.SubElement(globalgroup, 'Keyword')
kw.text = self.platform + 'Proj'
p = ET.SubElement(globalgroup, 'Platform')
p.text = self.platform
pname = ET.SubElement(globalgroup, 'ProjectName')
pname.text = project_name
if self.windows_target_platform_version:
ET.SubElement(globalgroup, 'WindowsTargetPlatformVersion').text = self.windows_target_platform_version
ET.SubElement(root, 'Import', Project=r'$(VCTargetsPath)\Microsoft.Cpp.Default.props')
type_config = ET.SubElement(root, 'PropertyGroup', Label='Configuration')
ET.SubElement(type_config, 'ConfigurationType')
ET.SubElement(type_config, 'CharacterSet').text = 'MultiByte'
ET.SubElement(type_config, 'UseOfMfc').text = 'false'
if self.platform_toolset:
ET.SubElement(type_config, 'PlatformToolset').text = self.platform_toolset
ET.SubElement(root, 'Import', Project=r'$(VCTargetsPath)\Microsoft.Cpp.props')
direlem = ET.SubElement(root, 'PropertyGroup')
fver = ET.SubElement(direlem, '_ProjectFileVersion')
fver.text = self.project_file_version
outdir = ET.SubElement(direlem, 'OutDir')
outdir.text = '.\\'
intdir = ET.SubElement(direlem, 'IntDir')
intdir.text = 'install-temp\\'
tname = ET.SubElement(direlem, 'TargetName')
tname.text = target_name
action = ET.SubElement(root, 'ItemDefinitionGroup') action = ET.SubElement(root, 'ItemDefinitionGroup')
midl = ET.SubElement(action, 'Midl') midl = ET.SubElement(action, 'Midl')