Kaydet (Commit) a6931e8d authored tarafından Edmund Wong's avatar Edmund Wong Kaydeden (comit) jan iversen

No need for a separate variable. Just get the value directly from the dictionary.

Change-Id: Ic8a707ac78cf5ad3e225131ae23f1f1277f3ae7c
Reviewed-on: https://gerrit.libreoffice.org/31991Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarjan iversen <jani@documentfoundation.org>
üst 14e65f7d
...@@ -775,7 +775,7 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator): ...@@ -775,7 +775,7 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
def __init__(self, gbuildparser, ide): def __init__(self, gbuildparser, ide):
IdeIntegrationGenerator.__init__(self, gbuildparser, ide) IdeIntegrationGenerator.__init__(self, gbuildparser, ide)
self.toolset = self.retrieve_toolset(ide) self.toolset = self.retrieve_toolset()
self.solution_directory = './' self.solution_directory = './'
self.configurations = { self.configurations = {
'Build': { 'Build': {
...@@ -795,9 +795,8 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator): ...@@ -795,9 +795,8 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
} }
} }
def retrieve_toolset(self, ide): def retrieve_toolset(self):
ide_toolset_map = {'vs2013': 'v120', 'vs2015': 'v140'} return {'vs2013': 'v120', 'vs2015': 'v140'}.get(self.ide, None)
return ide_toolset_map[ide]
def module_make_command(self, targets): def module_make_command(self, targets):
return '%(sh)s -c "PATH=\\"/bin:$PATH\\";BUILDDIR=\\"%(builddir)s\\" %(makecmd)s -rsC %(location)s ' + targets + '"' return '%(sh)s -c "PATH=\\"/bin:$PATH\\";BUILDDIR=\\"%(builddir)s\\" %(makecmd)s -rsC %(location)s ' + targets + '"'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment