From d0cc5fcd5bacd8e5e0fa7fe62a78907c2febb867 Mon Sep 17 00:00:00 2001 From: Federico Bassini Date: Wed, 1 Mar 2017 09:39:55 +0100 Subject: gbuild-to-ide: fix testide problem this patch fix some problem in the class testVS2013Ide: fix some tag xml bad generated, i test the project pocheck and it compiles. Change-Id: I5a4e3e71286a486e03ecbe936fb848e589ff71c9 Reviewed-on: https://gerrit.libreoffice.org/34739 Tested-by: Jenkins Reviewed-by: jan iversen --- bin/gbuild-to-ide | 28 +++++++---------- windows/README | 3 -- windows/soffice.sln | 18 ----------- windows/soffice.vcxproj | 84 ------------------------------------------------- 4 files changed, 12 insertions(+), 121 deletions(-) delete mode 100644 windows/README delete mode 100644 windows/soffice.sln delete mode 100644 windows/soffice.vcxproj diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide index 70b398d1dc7a..a123216d0c0f 100755 --- a/bin/gbuild-to-ide +++ b/bin/gbuild-to-ide @@ -197,20 +197,15 @@ class testVS2013Ide(IdeIntegrationGenerator): self.toolset = self.retrieve_toolset() self.solution_directory = './windows' self.configurations = { - 'Build': { + 'Release': { 'build': self.module_make_command('%(target)s'), 'clean': self.module_make_command('%(target)s.clean'), 'rebuild': self.module_make_command('%(target)s.clean %(target)s') }, - 'Unit Tests': { + 'Debug': { 'build': self.module_make_command('unitcheck'), 'clean': self.module_make_command('clean'), 'rebuild': self.module_make_command('clean unitcheck'), - }, - 'Integration tests': { - 'build': self.module_make_command('unitcheck slowcheck screenshot subsequentcheck'), - 'clean': self.module_make_command('clean'), - 'rebuild': self.module_make_command('clean unitcheck slowcheck screenshot subsequentcheck') } } srcdir=self.gbuildparser.get_json_srcdir() @@ -221,7 +216,7 @@ class testVS2013Ide(IdeIntegrationGenerator): pass def retrieve_toolset(self): - return {'vs2013': 'v120', 'vs2015': 'v140'}.get(self.ide, None) + return {'vs2013': 'v120', '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 + '"' @@ -442,12 +437,12 @@ class testVS2013Ide(IdeIntegrationGenerator): conf_node.text = configuration platform_node = ET.SubElement(proj_conf_node, '{%s}Platform' % ns) platform_node.text = platform - #globals - globals_node = ET.SubElement(proj_node, '{%s}PropertyGroup' % ns, Label='Globals') - proj_guid_node = ET.SubElement(globals_node, '{%s}ProjectGuid' % ns) - proj_guid_node.text = '{%s}' % project_guid - proj_root_namespace=ET.SubElement(globals_node, '{%s}RootNamespace' % ns) - proj_root_namespace.text = target['target_name'] + #globals + globals_node = ET.SubElement(proj_node, '{%s}PropertyGroup' % ns, Label='Globals') + proj_guid_node = ET.SubElement(globals_node, '{%s}ProjectGuid' % ns) + proj_guid_node.text = '{%s}' % project_guid + proj_root_namespace=ET.SubElement(globals_node, '{%s}RootNamespace' % ns) + proj_root_namespace.text = target['target_name'] ET.SubElement(proj_node, '{%s}Import' % ns, Project='$(VCTargetsPath)\Microsoft.Cpp.Default.props') @@ -475,7 +470,7 @@ class testVS2013Ide(IdeIntegrationGenerator): #compiler options cl_compile=ET.SubElement(item_def_group,'{%s}ClCompile' % ns) warn_lvl=ET.SubElement(cl_compile,'{%s}WarningLevel' % ns) - warn_lvl.text='Level 4' + warn_lvl.text='Level4' opt_node=ET.SubElement(cl_compile,'{%s}Optimization' % ns) opt_node.text='Disabled' sdl_check=ET.SubElement(cl_compile,'{%s}SDLCheck' % ns) @@ -510,7 +505,8 @@ class testVS2013Ide(IdeIntegrationGenerator): #cxx files cxx_node=ET.SubElement(proj_node,'{%s}ItemGroup' % ns) for cxx_elem in target['CXXOBJECTS']: - cxx_cl_node=ET.SubElement(cxx_node,'{%s}ClCompile' % ns,Include='../../' + cxx_elem) + modulename=target['module'] + cxx_cl_node=ET.SubElement(cxx_node,'{%s}ClCompile' % ns,Include=os.path.join('../..', modulename, cxx_elem)) #miss headers ET.SubElement(proj_node, '{%s}Import' % ns, Project='$(VCTargetsPath)\Microsoft.Cpp.targets') ET.SubElement(proj_node, '{%s}ImportGroup' % ns, Label='ExtensionTargets') diff --git a/windows/README b/windows/README deleted file mode 100644 index 3287a74d9634..000000000000 --- a/windows/README +++ /dev/null @@ -1,3 +0,0 @@ -This is not supposed to work the way you might think. You can not -build LibreOffice using this solution (or project), and you can not -see all the source code using it. diff --git a/windows/soffice.sln b/windows/soffice.sln deleted file mode 100644 index 18993c834622..000000000000 --- a/windows/soffice.sln +++ /dev/null @@ -1,18 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.40629.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soffice", "soffice.vcxproj", "{4A0AC252-760E-4C2B-A408-C79CBA182370}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4A0AC252-760E-4C2B-A408-C79CBA182370}.Debug|Win32.ActiveCfg = Debug|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/windows/soffice.vcxproj b/windows/soffice.vcxproj deleted file mode 100644 index f868d55c413e..000000000000 --- a/windows/soffice.vcxproj +++ /dev/null @@ -1,84 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {4A0AC252-760E-4C2B-A408-C79CBA182370} - Win32Proj - soffice - - - - Application - true - v120 - Unicode - - - Application - false - v120 - true - Unicode - - - - - - - - - - - - - true - ..\instdir\program - - .bin - - - false - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - - - Console - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - - -- cgit