Makefile.in | 1 -
bin/gbuild-to-ide | 5 ++---
bin/gbuild-to-ideNS | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 374c0e325cbbdd500b1a2b4c26ce3555682311b8
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Jun 28 13:28:48 2017 +0200
remove "vs2013" from gbuild-to-ide
Too old to build master.
Change-Id: I01636c9ae26ddb3954dcfdd1977551c0f115a81b
diff --git a/Makefile.in b/Makefile.in
index 5e0de0555878..5bbbe1682e14 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -466,7 +466,6 @@ $(eval $(call gb_Top_GbuildToIdeIntegration,$(ide))))
$(foreach ide,\
codelite \
- vs2013 \
vs2015 \
kdevelop \
vim \
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 1cc449a28f76..ffa85d3a42e4 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -216,7 +216,7 @@ class testVS2013Ide(IdeIntegrationGenerator):
pass
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):
return '%(sh)s -c "PATH=\\"/bin:$PATH\\";BUILDDIR=\\"%(builddir)s\\"
%(makecmd)s -rsC %(location)s ' + targets + '"'
@@ -838,7 +838,7 @@ class
VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
}
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):
return '%(sh)s -c "PATH=\\"/bin:$PATH\\";BUILDDIR=\\"%(builddir)s\\"
%(makecmd)s -rsC %(location)s ' + targets + '"'
@@ -2183,7 +2183,6 @@ if __name__ == '__main__':
paths = {}
generators = {
# Supported platforms
- 'vs2013': VisualStudioIntegrationGenerator,
'xcode': XcodeIntegrationGenerator,
'debug': DebugIntegrationGenerator,
'testIde': testVS2013Ide,
diff --git a/bin/gbuild-to-ideNS b/bin/gbuild-to-ideNS
index 128d5d5180ef..38785312055b 100755
--- a/bin/gbuild-to-ideNS
+++ b/bin/gbuild-to-ideNS
@@ -744,7 +744,7 @@ class
VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
}
def retrieve_toolset(self, ide):
- ide_toolset_map = {'vs2013': 'v120', 'vs2015': 'v140'}
+ ide_toolset_map = {'vs2015': 'v140'}
return ide_toolset_map[ide]
def module_make_command(self, targets):
@@ -1624,7 +1624,6 @@ if __name__ == '__main__':
'eclipsecdt': EclipseCDTIntegrationGenerator,
'kdevelop': KdevelopIntegrationGenerator,
'xcode': XcodeIntegrationGenerator,
- 'vs2013': VisualStudioIntegrationGenerator,
'vs2015': VisualStudioIntegrationGenerator,
'vim': VimIntegrationGenerator,
'debug': DebugIntegrationGenerator,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
