From 4651ec8f77217a35515e037966c62a72456682dc Mon Sep 17 00:00:00 2001 From: Nicolas Schneider Date: Thu, 25 Feb 2016 15:02:13 +0100 Subject: vs2010: fix REGEN project input files --- mesonbuild/backend/vs2010backend.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'mesonbuild/backend') diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index 9b80edd..73363da 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -580,8 +580,7 @@ if %%errorlevel%% neq 0 goto :VCEnd''' ('" "'.join(regen_command), private_dir) ET.SubElement(custombuild, 'Outputs').text = os.path.join(self.environment.get_scratch_dir(), 'regen.stamp') deps = self.get_regen_filelist() - depstr = ';'.join([os.path.join(self.environment.get_source_dir(), d) for d in deps]) - ET.SubElement(custombuild, 'AdditionalInputs').text = depstr + ET.SubElement(custombuild, 'AdditionalInputs').text = ';'.join(deps) ET.SubElement(root, 'Import', Project='$(VCTargetsPath)\Microsoft.Cpp.targets') ET.SubElement(root, 'ImportGroup', Label='ExtensionTargets') tree = ET.ElementTree(root) -- cgit v1.1 From bffc84e77e871e1b671ac15064fe985b33972e7d Mon Sep 17 00:00:00 2001 From: Nicolas Schneider Date: Thu, 25 Feb 2016 22:42:26 +0100 Subject: vs2010: write regen.rule in gen_regenproj --- mesonbuild/backend/vs2010backend.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'mesonbuild/backend') diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index 73363da..5b40f6d 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -94,9 +94,6 @@ class Vs2010Backend(backends.Backend): self.generate_solution(sln_filename, projlist) self.generate_regen_info(sln_filename) open(os.path.join(self.environment.get_scratch_dir(), 'regen.stamp'), 'wb') - rulefile = os.path.join(self.environment.get_scratch_dir(), 'regen.rule') - if not os.path.exists(rulefile): - open(rulefile, 'w').write("# For some reason this needs to be here.") def generate_regen_info(self, sln_filename): deps = self.get_regen_filelist() @@ -573,7 +570,11 @@ exit /b %%1 :cmDone if %%errorlevel%% neq 0 goto :VCEnd''' igroup = ET.SubElement(root, 'ItemGroup') - custombuild = ET.SubElement(igroup, 'CustomBuild', Include='meson-private/regen.rule') + rulefile = os.path.join(self.environment.get_scratch_dir(), 'regen.rule') + if not os.path.exists(rulefile): + with open(rulefile, 'w') as f: + f.write("# Meson regen file.") + custombuild = ET.SubElement(igroup, 'CustomBuild', Include=rulefile) message = ET.SubElement(custombuild, 'Message') message.text = 'Checking whether solution needs to be regenerated.' ET.SubElement(custombuild, 'Command').text = cmd_templ % \ -- cgit v1.1 From 40a7287a59304abe64984c697e764640e06a4599 Mon Sep 17 00:00:00 2001 From: Nicolas Schneider Date: Thu, 25 Feb 2016 23:09:44 +0100 Subject: vs2010: properly check whether solution needs to be regenerated --- mesonbuild/backend/vs2010backend.py | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'mesonbuild/backend') diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index 5b40f6d..58a7bd3 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -21,13 +21,13 @@ from .. import mlog import xml.etree.ElementTree as ET import xml.dom.minidom from ..coredata import MesonException +from ..environment import Environment class RegenInfo(): - def __init__(self, source_dir, build_dir, depfiles, solutionfile): + def __init__(self, source_dir, build_dir, depfiles): self.source_dir = source_dir self.build_dir = build_dir self.depfiles = depfiles - self.solutionfile = solutionfile class Vs2010Backend(backends.Backend): def __init__(self, build): @@ -92,15 +92,22 @@ class Vs2010Backend(backends.Backend): self.gen_testproj('RUN_TESTS', os.path.join(self.environment.get_build_dir(), 'RUN_TESTS.vcxproj')) self.gen_regenproj('REGEN', os.path.join(self.environment.get_build_dir(), 'REGEN.vcxproj')) self.generate_solution(sln_filename, projlist) - self.generate_regen_info(sln_filename) - open(os.path.join(self.environment.get_scratch_dir(), 'regen.stamp'), 'wb') + self.generate_regen_info() + Vs2010Backend.touch_regen_timestamp(self.environment.get_build_dir()) - def generate_regen_info(self, sln_filename): + @staticmethod + def get_regen_stampfile(build_dir): + return os.path.join(os.path.join(build_dir, Environment.private_dir), 'regen.stamp') + + @staticmethod + def touch_regen_timestamp(build_dir): + open(Vs2010Backend.get_regen_stampfile(build_dir), 'w').close() + + def generate_regen_info(self): deps = self.get_regen_filelist() regeninfo = RegenInfo(self.environment.get_source_dir(), self.environment.get_build_dir(), - deps, - sln_filename) + deps) pickle.dump(regeninfo, open(os.path.join(self.environment.get_scratch_dir(), 'regeninfo.dump'), 'wb')) def get_obj_target_deps(self, obj_list): @@ -579,7 +586,7 @@ if %%errorlevel%% neq 0 goto :VCEnd''' message.text = 'Checking whether solution needs to be regenerated.' ET.SubElement(custombuild, 'Command').text = cmd_templ % \ ('" "'.join(regen_command), private_dir) - ET.SubElement(custombuild, 'Outputs').text = os.path.join(self.environment.get_scratch_dir(), 'regen.stamp') + ET.SubElement(custombuild, 'Outputs').text = Vs2010Backend.get_regen_stampfile(self.environment.get_build_dir()) deps = self.get_regen_filelist() ET.SubElement(custombuild, 'AdditionalInputs').text = ';'.join(deps) ET.SubElement(root, 'Import', Project='$(VCTargetsPath)\Microsoft.Cpp.targets') -- cgit v1.1