extract vs2015backend into own file

pull/577/head
Nicolas Schneider 9 years ago
parent d34d85b0f5
commit fba749fcb7
  1. 18
      mesonbuild/backend/vs2010backend.py
  2. 34
      mesonbuild/backend/vs2015backend.py
  3. 4
      mesonbuild/mesonmain.py

@ -832,21 +832,3 @@ if %%errorlevel%% neq 0 goto :VCEnd'''
# ElementTree can not do prettyprinting so do it manually
#doc = xml.dom.minidom.parse(ofname)
#open(ofname, 'w').write(doc.toprettyxml())
class Vs2015Backend(Vs2010Backend):
def __init__(self, build):
super().__init__(build)
self.platform_toolset = 'v140'
@staticmethod
def has_objects(objects, additional_objects, generated_objects):
# VS2015 requires generated objects to be added explicitly to the project file.
return len(objects) + len(additional_objects) + len(generated_objects) > 0
@staticmethod
def add_generated_objects(node, generated_objects):
# VS2015 requires generated objects to be added explicitly to the project file.
for s in generated_objects:
ET.SubElement(node, 'Object', Include=s)
return

@ -0,0 +1,34 @@
# Copyright 2014-2016 The Meson development team
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
# http://www.apache.org/licenses/LICENSE-2.0
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from xml.etree import ElementTree as ET
from .vs2010backend import Vs2010Backend
class Vs2015Backend(Vs2010Backend):
def __init__(self, build):
super().__init__(build)
self.platform_toolset = 'v140'
@staticmethod
def has_objects(objects, additional_objects, generated_objects):
# VS2015 requires generated objects to be added explicitly to the project file.
return len(objects) + len(additional_objects) + len(generated_objects) > 0
@staticmethod
def add_generated_objects(node, generated_objects):
# VS2015 requires generated objects to be added explicitly to the project file.
for s in generated_objects:
ET.SubElement(node, 'Object', Include=s)
return

@ -139,8 +139,8 @@ itself as required.'''
from .backend import vs2010backend
g = vs2010backend.Vs2010Backend(b)
elif self.options.backend == 'vs2015':
from .backend import vs2010backend
g = vs2010backend.Vs2015Backend(b)
from .backend import vs2015backend
g = vs2015backend.Vs2015Backend(b)
elif self.options.backend == 'xcode':
from .backend import xcodebackend
g = xcodebackend.XCodeBackend(b)

Loading…
Cancel
Save