strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrade to vs2017-ide-integration, since we don't support VS2015 in master

Browse source 
This allows to avoid the "(Visual Studio 2015)" labels next to project
names in Solution Explorer; and also avoid multiple warnilgs like

    project-name.vcxproj : warning  : The build tools for Visual Studio
    2015 (v140) cannot be found. Install Visual Studio 2015 (v140) to
    build using the Visual Studio 2015 (v140) build tools.

in IDE's Output pane in case VS2015 is absent locally.

Change-Id: I53b68ac810cbf2a31667c35dd549310e7209e010
Reviewed-on: https://gerrit.libreoffice.org/59797
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski 2018-08-30 12:47:46 +03:00
parent c00948d9bd
commit 80d071f834
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.in
View file

@ -478,7 +478,7 @@ endef
$(foreach ide,\
codelite \
vs2015 \
vs2017 \
kdevelop \
vim \
qtcreator \

6
bin/gbuild-to-ide
View file

@ -744,7 +744,7 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
}
def retrieve_toolset(self, ide):
ide_toolset_map = {'vs2015': 'v140'}
ide_toolset_map = {'vs2017': 'v141'}
return ide_toolset_map[ide]
def module_make_command(self, targets):
@ -879,7 +879,7 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
# Type of project used by the MSBuild to determine build process, see Microsoft.Makefile.targets
conf_type_node = ET.SubElement(conf_node, '{%s}ConfigurationType' % ns)
conf_type_node.text = 'Makefile'
# VS2012: I need to have this otherwise the names of projects will contain text Visual Studio 2010 in the Solution Explorer
# This defines the version of Visual Studio which can show next to project names in the Solution Explorer
platform_toolset_node = ET.SubElement(conf_node, '{%s}PlatformToolset' % ns)
platform_toolset_node.text = self.toolset
@ -1651,7 +1651,7 @@ if __name__ == '__main__':
'eclipsecdt': EclipseCDTIntegrationGenerator,
'kdevelop': KdevelopIntegrationGenerator,
'xcode': XcodeIntegrationGenerator,
'vs2015': VisualStudioIntegrationGenerator,
'vs2017': VisualStudioIntegrationGenerator,
'vim': VimIntegrationGenerator,
'debug': DebugIntegrationGenerator,
'qtcreator': QtCreatorIntegrationGenerator,