Implement external user-provided variables.

egorpugin · egorpugin · commit 72bdb5167781 · 2020-01-01T22:02:45.000+03:00
diff --git a/src/sw/client/cli/command/build.cpp b/src/sw/client/cli/command/build.cpp
@@ -62,6 +62,8 @@ static cl::opt<bool> cl_write_output_to_file("write-output-to-file");
 static ::cl::list<String> targets_to_build("target", ::cl::desc("Targets to build"));
 static ::cl::list<String> targets_to_ignore("exclude-target", ::cl::desc("Targets to ignore"));
 
+static ::cl::list<String> Dvariables("D", ::cl::desc("Input variables"), ::cl::ZeroOrMore, ::cl::Prefix);
+
 ////////////////////////////////////////////////////////////////////////////////
 //
 // build configs
@@ -661,6 +663,11 @@ std::unique_ptr<sw::SwBuild> createBuild(sw::SwContext &swctx)
         bs["target-to-build"].push_back(t);
     for (auto &t : targets_to_ignore)
         bs["target-to-exclude"].push_back(t);
+    for (auto &t : Dvariables)
+    {
+        auto p = t.find('=');
+        bs["D"][t.substr(0, p)] = t.substr(p + 1);
+    }
     b->setSettings(bs);
 
     return b;
diff --git a/src/sw/core/build.cpp b/src/sw/core/build.cpp
@@ -797,5 +797,10 @@ void SwBuild::setSettings(const TargetSettings &bs)
     build_settings = bs;
 }
 
+const TargetSettings &SwBuild::getExternalVariables() const
+{
+    return getSettings()["D"].getSettings();
+}
+
 }
 
diff --git a/src/sw/core/build.h b/src/sw/core/build.h
@@ -84,7 +84,8 @@ struct SW_CORE_API SwBuild
 
     std::vector<InputWithSettings> getInputs() const;
 
-    TargetSettings getSettings() const { return build_settings; }
+    const TargetSettings &getExternalVariables() const;
+    const TargetSettings &getSettings() const { return build_settings; }
     void setSettings(const TargetSettings &build_settings);
 
 private:
diff --git a/src/sw/driver/build.cpp b/src/sw/driver/build.cpp
@@ -97,6 +97,11 @@ std::optional<path> Build::getSourceDir(const Source &s, const Version &v) const
         return i->second.getRequestedDirectory();
     return {};
 }
+
+const TargetSettings &Build::getExternalVariables() const
+{
+    return getMainBuild().getExternalVariables();
+}
 
 /*path Build::getTestDir() const
 {
diff --git a/src/sw/driver/build.h b/src/sw/driver/build.h
@@ -66,14 +66,14 @@ struct SW_DRIVER_CPP_API Build : SimpleBuild
     std::unordered_map<PackageId, path> source_dirs_by_package;
     Checker checker;
 
-    // old
-
     //
     bool isKnownTarget(const LocalPackage &p) const;
     path getSourceDir(const LocalPackage &p) const;
     std::optional<path> getSourceDir(const Source &s, const Version &v) const;
     //bool skipTarget(TargetScope Scope) const;
 
+    const TargetSettings &getExternalVariables() const;
+
     // tests
     // TODO: implement some of https://cmake.org/cmake/help/latest/manual/cmake-properties.7.html#properties-on-tests
     /*Commands tests;

Original file line number	Diff line number	Diff line change
`@@ -797,5 +797,10 @@ void SwBuild::setSettings(const TargetSettings &bs)`
`797`	`797`	`build_settings = bs;`
`798`	`798`	`}`
`799`	`799`
	`800`	`+const TargetSettings &SwBuild::getExternalVariables() const`
	`801`	`+{`
	`802`	`+ return getSettings()["D"].getSettings();`
	`803`	`+}`
	`804`	`+`
`800`	`805`	`}`
`801`	`806`
Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,11 @@ std::optional<path> Build::getSourceDir(const Source &s, const Version &v) const`
`97`	`97`	`return i->second.getRequestedDirectory();`
`98`	`98`	`return {};`
`99`	`99`	`}`
	`100`	`+`
	`101`	`+const TargetSettings &Build::getExternalVariables() const`
	`102`	`+{`
	`103`	`+ return getMainBuild().getExternalVariables();`
	`104`	`+}`
`100`	`105`
`101`	`106`	`/*path Build::getTestDir() const`
`102`	`107`	`{`