Chiebot-Mirror
/
meson
mirror of https://github.com/mesonbuild/meson.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix ProjectGuid values in VS projects.

Browse Source
pull/4524/head
John Preston 6 years ago committed by Jussi Pakkanen
parent 16144fd61b
commit 5d6dcf8850
1 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      mesonbuild/backend/vs2010backend.py

10
mesonbuild/backend/vs2010backend.py
Unescape View File

@ -417,7 +417,7 @@ class Vs2010Backend(backends.Backend):
pref = ET.SubElement(ig, 'ProjectReference', Include=include) pref = ET.SubElement(ig, 'ProjectReference', Include=include)
ET.SubElement(pref, 'Project').text = '{%s}' % projid ET.SubElement(pref, 'Project').text = '{%s}' % projid
def create_basic_crap(self, target): def create_basic_crap(self, target, guid):
project_name = target.name project_name = target.name
root = ET.Element('Project', {'DefaultTargets': "Build", root = ET.Element('Project', {'DefaultTargets': "Build",
'ToolsVersion': '4.0', 'ToolsVersion': '4.0',
@ -431,7 +431,7 @@ class Vs2010Backend(backends.Backend):
pl.text = self.platform pl.text = self.platform
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}' % self.environment.coredata.test_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'
p = ET.SubElement(globalgroup, 'Platform') p = ET.SubElement(globalgroup, 'Platform')
@ -460,7 +460,7 @@ class Vs2010Backend(backends.Backend):
return root return root
def gen_run_target_vcxproj(self, target, ofname, guid): def gen_run_target_vcxproj(self, target, ofname, guid):
root = self.create_basic_crap(target) root = self.create_basic_crap(target, guid)
action = ET.SubElement(root, 'ItemDefinitionGroup') action = ET.SubElement(root, 'ItemDefinitionGroup')
customstep = ET.SubElement(action, 'PostBuildEvent') customstep = ET.SubElement(action, 'PostBuildEvent')
cmd_raw = [target.command] + target.args cmd_raw = [target.command] + target.args
@ -486,7 +486,7 @@ 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) root = self.create_basic_crap(target, guid)
action = ET.SubElement(root, 'ItemDefinitionGroup') action = ET.SubElement(root, 'ItemDefinitionGroup')
customstep = ET.SubElement(action, 'CustomBuildStep') customstep = ET.SubElement(action, 'CustomBuildStep')
# We need to always use absolute paths because our invocation is always # We need to always use absolute paths because our invocation is always
@ -1176,7 +1176,7 @@ class Vs2010Backend(backends.Backend):
pl.text = self.platform pl.text = self.platform
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}' % self.environment.coredata.test_guid guidelem.text = '{%s}' % self.environment.coredata.regen_guid
kw = ET.SubElement(globalgroup, 'Keyword') kw = ET.SubElement(globalgroup, 'Keyword')
kw.text = self.platform + 'Proj' kw.text = self.platform + 'Proj'
p = ET.SubElement(globalgroup, 'Platform') p = ET.SubElement(globalgroup, 'Platform')

Write Preview
Loading…
Cancel
Save