Differential D19933 Diff 54884 blueprints/libs/runtime/runtime.py

Changeset View

Standalone View

View Options

blueprints/libs/runtime/runtime.py

Context not available.
48 srcdir = os.path.join(self.rootdir, "mingw64", "bin") 48​ srcdir = os.path.join(self.rootdir, "mingw64", "bin")
49 elif CraftCore.compiler.isMSVC(): 49​ elif CraftCore.compiler.isMSVC():
50 if self.buildType() != "Debug": 50​ if self.buildType() != "Debug":
51 if CraftCore.compiler.isMSVC2017(): 51​ if CraftCore.compiler.isMSVC2019() or CraftCore.compiler.isMSVC2017():
52​ if CraftCore.compiler.isMSVC2019:
53​ flavor="2019"
54​ else:
55​ flavor="2017"
vonrethAuthorUnsubmitted
Not Done

I think that file was already changed so the patch needs an update,
also could you unify the check with msvc2017?

vonreth: I think that file was already changed so the patch needs an update, also could you unify the…
52 if "VCTOOLSREDISTDIR" in os.environ: 56​ if "VCTOOLSREDISTDIR" in os.environ:
53 redistDir = os.environ["VCTOOLSREDISTDIR"] 57​ redistDir = os.environ["VCTOOLSREDISTDIR"]
54 else: 58​ else:
55 CraftCore.log.error("Could not find Mycrosoft Visual Studio 2017.\n" 59​ CraftCore.log.error((r"Could not find Microsoft Visual Studio {0}.\n" +
56 "VCTOOLSREDISTDIR does not exist, and should point to " 60​ r"VCTOOLSREDISTDIR does not exist, and likely should point to '*\Microsoft Visual Studio\{0}\Community\VC\Redist\MSVC\xx.xx.xxxxx'.").format(flavor))
57 r"'*\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\xx.xx.xxxxx'.") ​
58 elif CraftCore.compiler.isMSVC2015(): 61​ elif CraftCore.compiler.isMSVC2015():
59 if "VCINSTALLDIR" in os.environ: 62​ if "VCINSTALLDIR" in os.environ:
60 redistDir = os.path.join(os.environ["VCINSTALLDIR"], "redist") 63​ redistDir = os.path.join(os.environ["VCINSTALLDIR"], "redist")
61 else: 64​ else:
62 CraftCore.log.error("Could not find Mycrosoft Visual Studio 2015.\n" 65​ CraftCore.log.error("Could not find Microsoft Visual Studio 2015.\n" +
63 "VCINSTALLDIR does not exist, and should point to " 66​ r"VCINSTALLDIR does not exist, and should point to '*\Microsoft Visual Studio\2015\Community\VC\'.")
64 r"'*\Microsoft Visual Studio\2015\Community\VC\'.") ​
65 if redistDir: 67​ if redistDir:
66 files = glob.glob(os.path.join(redistDir, CraftCore.compiler.architecture, "**/*.dll"), recursive=True) 68​ files = glob.glob(os.path.join(redistDir, CraftCore.compiler.architecture, "**/*.dll"), recursive=True)
67 else: 69​ else:
Context not available.