Kaydet (Commit) 374c0e32 authored tarafından Michael Stahl's avatar Michael Stahl

remove "vs2013" from gbuild-to-ide

Too old to build master.

Change-Id: I01636c9ae26ddb3954dcfdd1977551c0f115a81b
üst 48f64e97
...@@ -466,7 +466,6 @@ $(eval $(call gb_Top_GbuildToIdeIntegration,$(ide)))) ...@@ -466,7 +466,6 @@ $(eval $(call gb_Top_GbuildToIdeIntegration,$(ide))))
$(foreach ide,\ $(foreach ide,\
codelite \ codelite \
vs2013 \
vs2015 \ vs2015 \
kdevelop \ kdevelop \
vim \ vim \
......
...@@ -216,7 +216,7 @@ class testVS2013Ide(IdeIntegrationGenerator): ...@@ -216,7 +216,7 @@ class testVS2013Ide(IdeIntegrationGenerator):
pass pass
def retrieve_toolset(self): def retrieve_toolset(self):
return {'vs2013': 'v120', 'vs2015': 'v140', 'testIde':'v120'}.get(self.ide, None) return {'vs2015': 'v140', 'testIde':'v120'}.get(self.ide, None)
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 + '"'
...@@ -838,7 +838,7 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator): ...@@ -838,7 +838,7 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
} }
def retrieve_toolset(self): def retrieve_toolset(self):
return {'vs2013': 'v120', 'vs2015': 'v140'}.get(self.ide, None) return {'vs2015': 'v140'}.get(self.ide, None)
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 + '"'
...@@ -2183,7 +2183,6 @@ if __name__ == '__main__': ...@@ -2183,7 +2183,6 @@ if __name__ == '__main__':
paths = {} paths = {}
generators = { generators = {
# Supported platforms # Supported platforms
'vs2013': VisualStudioIntegrationGenerator,
'xcode': XcodeIntegrationGenerator, 'xcode': XcodeIntegrationGenerator,
'debug': DebugIntegrationGenerator, 'debug': DebugIntegrationGenerator,
'testIde': testVS2013Ide, 'testIde': testVS2013Ide,
......
...@@ -744,7 +744,7 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator): ...@@ -744,7 +744,7 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
} }
def retrieve_toolset(self, ide): def retrieve_toolset(self, ide):
ide_toolset_map = {'vs2013': 'v120', 'vs2015': 'v140'} ide_toolset_map = {'vs2015': 'v140'}
return ide_toolset_map[ide] return ide_toolset_map[ide]
def module_make_command(self, targets): def module_make_command(self, targets):
...@@ -1624,7 +1624,6 @@ if __name__ == '__main__': ...@@ -1624,7 +1624,6 @@ if __name__ == '__main__':
'eclipsecdt': EclipseCDTIntegrationGenerator, 'eclipsecdt': EclipseCDTIntegrationGenerator,
'kdevelop': KdevelopIntegrationGenerator, 'kdevelop': KdevelopIntegrationGenerator,
'xcode': XcodeIntegrationGenerator, 'xcode': XcodeIntegrationGenerator,
'vs2013': VisualStudioIntegrationGenerator,
'vs2015': VisualStudioIntegrationGenerator, 'vs2015': VisualStudioIntegrationGenerator,
'vim': VimIntegrationGenerator, 'vim': VimIntegrationGenerator,
'debug': DebugIntegrationGenerator, 'debug': DebugIntegrationGenerator,
......
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