Improve command mtime work on other platforms. Add ability to save command output. Add -static-deps option. Improve macos builds.

egorpugin · egorpugin · commit ab2f7081050e · 2019-08-10T22:46:51.000+03:00
diff --git a/src/sw/builder/command.cpp b/src/sw/builder/command.cpp
@@ -137,7 +137,7 @@ bool Command::isOutdated() const
     }
     else
     {
-        *((size_t*)&mtime) = r.first->mtime;
+        ((Command*)(this))->mtime = r.first->mtime;
         ((Command*)(this))->implicit_inputs = r.first->implicit_inputs;
         return isTimeChanged();
     }
@@ -459,7 +459,7 @@ void Command::afterCommand()
     auto &cs = getContext().getCommandStorage();
     auto &r = *cs.getStorage(command_storage == CS_LOCAL).insert(k).first;
     r.hash = k;
-    r.mtime = *(size_t*)&mtime;
+    r.mtime = mtime;
     r.implicit_inputs = implicit_inputs;
     cs.async_command_log(r, command_storage == CS_LOCAL);
 }
@@ -595,12 +595,14 @@ void Command::printOutputs()
         s += out.text + "\n";
     if (!err.text.empty())
         s += err.text + "\n";
-    if (!s.empty())
-    {
-        s = log_string + "\n" + s;
-        boost::trim(s);
+    if (s.empty())
+        return;
+    s = log_string + "\n" + s;
+    boost::trim(s);
+    if (write_output_to_file)
+        write_file(fs::current_path() / SW_BINARY_DIR / "rsp" / std::to_string(getHash()) += ".txt", s);
+    else
         LOG_INFO(logger, s);
-    }
 }
 
 String Command::makeErrorString(const String &e)
diff --git a/src/sw/builder/command.h b/src/sw/builder/command.h
@@ -166,6 +166,7 @@ struct SW_BUILDER_API Command : ICastable, CommandNode, detail::ResolvableComman
     bool do_not_save_command = false;
     bool silent = false; // no log record
     bool show_output = false; // no command output
+    bool write_output_to_file = false;
     int strict_order = 0; // used to execute this before other commands
     ResourcePool *pool = nullptr;
 
diff --git a/src/sw/builder/command_storage.cpp b/src/sw/builder/command_storage.cpp
@@ -84,7 +84,11 @@ void FileDb::write(std::vector<uint8_t> &v, const CommandRecord &f)
         return;
 
     write_int(v, f.hash);
+#ifndef __APPLE__
     write_int(v, f.mtime);
+#else
+    write_int(v, decltype(f.mtime)::clock::to_time_t(f.mtime));
+#endif
 
     auto n = f.implicit_inputs.size();
     write_int(v, n);
@@ -151,9 +155,13 @@ static void load(const path &fn, Files &files, ConcurrentCommandStorage &command
             auto r = commands.insert(h);
             r.first->hash = h;
 
-            size_t m;
+            time_t m;
             b.read(m);
-            r.first->mtime = m;
+#ifndef __APPLE__
+            *(time_t*)&r.first->mtime = m;
+#else
+            r.first->mtime = decltype(r.first->mtime)::clock::from_time_t(m);
+#endif
 
             size_t n;
             b.read(n);
diff --git a/src/sw/builder/command_storage.h b/src/sw/builder/command_storage.h
@@ -18,7 +18,7 @@ namespace sw
 struct CommandRecord
 {
     size_t hash = 0;
-    size_t mtime = 0;
+    fs::file_time_type mtime = fs::file_time_type::min();
     Files implicit_inputs;
 };
 
diff --git a/src/sw/builder/execution_plan.cpp b/src/sw/builder/execution_plan.cpp
@@ -57,6 +57,7 @@ void ExecutionPlan::execute(Executor &e) const
         {
             static_cast<builder::Command*>(c)->silent = silent;
             static_cast<builder::Command*>(c)->show_output = show_output;
+            static_cast<builder::Command*>(c)->write_output_to_file = write_output_to_file;
             static_cast<builder::Command*>(c)->always |= build_always;
         }
     }
diff --git a/src/sw/builder/execution_plan.h b/src/sw/builder/execution_plan.h
@@ -44,6 +44,7 @@ struct SW_BUILDER_API ExecutionPlan
     bool build_always = false;
     bool silent = false;
     bool show_output = false;
+    bool write_output_to_file = false;
 
     ExecutionPlan() = default;
     ExecutionPlan(const ExecutionPlan &rhs) = delete;
diff --git a/src/sw/builder/program_version_storage.cpp b/src/sw/builder/program_version_storage.cpp
@@ -27,8 +27,12 @@ ProgramVersionStorage::ProgramVersionStorage(const path &fn)
             break;
         ifile >> v;
         ifile >> t;
-        auto lwt = fs::last_write_time(p).time_since_epoch().count();
-        if (t && lwt <= t)
+        auto lwt = fs::last_write_time(p);
+#ifndef __APPLE__
+        if (t && *(time_t*)&lwt <= t)
+#else
+        if (t && lwt <= decltype(lwt)::clock::from_time_t(t))
+#endif
             versions[p] = {v,lwt};
     }
 }
@@ -37,7 +41,11 @@ ProgramVersionStorage::~ProgramVersionStorage()
 {
     std::ofstream ofile(fn);
     for (auto &[p, v] : std::map{ versions.begin(), versions.end() })
-        ofile << p << " " << v.v.toString() << " " << v.t << "\n";
+#ifndef __APPLE__
+        ofile << p << " " << v.v.toString() << " " << *(time_t*)&v.t << "\n";
+#else
+        ofile << p << " " << v.v.toString() << " " << decltype(v.t)::clock::to_time_t(v.t) << "\n";
+#endif
 }
 
 }
diff --git a/src/sw/builder/program_version_storage.h b/src/sw/builder/program_version_storage.h
@@ -18,7 +18,7 @@ struct ProgramVersionStorage
     struct ProgramInfo
     {
         Version v;
-        time_t t;
+        fs::file_time_type t;
 
         operator Version&() { return v; }
     };
@@ -31,7 +31,7 @@ struct ProgramVersionStorage
 
     void addVersion(const path &p, const Version &v)
     {
-        versions[p] = {v,fs::last_write_time(p).time_since_epoch().count()};
+        versions[p] = {v,fs::last_write_time(p)};
     }
 };
 
diff --git a/src/sw/client/command/build.cpp b/src/sw/client/command/build.cpp
@@ -55,6 +55,9 @@ static cl::list<String> os("os", cl::desc("Set build target os"), cl::CommaSepar
 static cl::list<String> libc("libc", cl::desc("Set build libc"), cl::CommaSeparated);
 static cl::list<String> libcpp("libcpp", cl::desc("Set build libcpp"), cl::CommaSeparated);
 
+static ::cl::opt<bool> static_deps("static-dependencies", ::cl::desc("Build static dependencies of inputs"));
+static cl::alias static_deps2("static-deps", cl::aliasopt(static_deps));
+
 // -setting k1=v1,k2=v2,k3="v3,v3" -setting k4=v4,k5,k6 etc.
 // settings in one setting applied simultaneosly
 // settings in different settings are multiplied
@@ -257,6 +260,9 @@ std::vector<sw::TargetSettings> createSettings(const sw::SwBuild &b)
         applySettingsFromFile(initial_settings["host"].getSettings(), host_settings_file);
     }
 
+    if (static_deps)
+        initial_settings["static-deps"] = "true";
+
     std::vector<sw::TargetSettings> settings;
     settings.push_back(initial_settings);
 
diff --git a/src/sw/core/build.cpp b/src/sw/core/build.cpp
@@ -22,12 +22,13 @@ DECLARE_STATIC_LOGGER(logger, "build");
 
 //cl::opt<bool> dry_run("n", cl::desc("Dry run"));
 
-cl::opt<bool> build_always("B", cl::desc("Build always"));
-cl::opt<int> skip_errors("k", cl::desc("Skip errors"));
+static cl::opt<bool> build_always("B", cl::desc("Build always"));
+static cl::opt<int> skip_errors("k", cl::desc("Skip errors"));
 static cl::opt<bool> time_trace("time-trace", cl::desc("Record chrome time trace events"));
 
 //static cl::opt<bool> hide_output("hide-output");
 static cl::opt<bool> cl_show_output("show-output");
+static cl::opt<bool> cl_write_output_to_file("write-output-to-file");
 static cl::opt<bool> print_graph("print-graph", cl::desc("Print file with build graph"));
 
 #define CHECK_STATE(from)                                                                 \
@@ -339,6 +340,8 @@ void SwBuild::execute(ExecutionPlan &p) const
     CHECK_STATE_AND_CHANGE(BuildState::Prepared, BuildState::Executed);
 
     p.build_always = build_always;
+    p.show_output = cl_show_output | cl_write_output_to_file;
+    p.write_output_to_file = cl_write_output_to_file;
     p.skip_errors = skip_errors.getValue();
 
     //ScopedTime t;
diff --git a/src/sw/core/c.cpp b/src/sw/core/c.cpp
@@ -85,6 +85,7 @@ void *sw_calloc(size_t num, size_t size)
     return calloc(num, size);
 }
 
+#ifndef __APPLE__
 void *sw_aligned_alloc(size_t alignment, size_t size)
 {
 #ifdef _MSC_VER
@@ -95,3 +96,4 @@ void *sw_aligned_alloc(size_t alignment, size_t size)
     return aligned_alloc(alignment, size);
 #endif
 }
+#endif
diff --git a/src/sw/core/c.h b/src/sw/core/c.h
@@ -9,7 +9,7 @@
 #ifndef _SW_CORE_C_H_
 #define _SW_CORE_C_H_
 
-#include <malloc.h>
+#include <stddef.h>
 
 /* memory allocations */
 
diff --git a/src/sw/core/sw_context.cpp b/src/sw/core/sw_context.cpp
@@ -64,9 +64,9 @@ void SwCoreContext::setHostPrograms()
             ts["native"]["program"]["lib"] = "com.Microsoft.VisualStudio.VC.lib";
             ts["native"]["program"]["link"] = "com.Microsoft.VisualStudio.VC.link";
         }
-        // add more defaults
+        // add more defaults (clangcl, clang)
         else
-            SW_UNIMPLEMENTED;
+            throw SW_RUNTIME_ERROR("Seems like you do not have Visual Studio installed.\n Please, install the latest Visual Studio first.");
     }
     // add more defaults
     else
diff --git a/src/sw/driver/build_settings.cpp b/src/sw/driver/build_settings.cpp
@@ -19,14 +19,15 @@ static OS fromTargetSettings(const TargetSettings &ts)
 {
     OS os;
 
-#define IF_SETTING(s, var, value) \
-    else if (v == s)      \
+#define IF_SETTING(s, var, value)   \
+    else if (v == s)                \
         var = value
 
-#define IF_KEY(k)            \
+#define IF_KEY(k)           \
     {                       \
-        auto &v = ts[k]; \
+        auto &v = ts[k];    \
         if (v) {
+
 #define IF_END }}
 
     IF_KEY("os"]["kernel")
@@ -112,11 +113,22 @@ String BuildSettings::getTargetTriplet() const
     // See https://clang.llvm.org/docs/CrossCompilation.html
 
     String target;
+
+    // arch
     target += toTripletString(TargetOS.Arch);
     if (TargetOS.Arch == ArchType::arm)
         target += toTripletString(TargetOS.SubArch);
-    target += "-unknown"; // vendor
+
+    // vendor
+    if (TargetOS.is(OSType::Macos))
+        target += "-apple";
+    else
+        target += "-unknown";
+
+    // os
     target += "-" + toTripletString(TargetOS.Type);
+    if (TargetOS.is(OSType::Macos) && TargetOS.Version > Version(1))
+        target += TargetOS.Version.toString();
     if (TargetOS.Type == OSType::Android)
         target += "-android";
     if (TargetOS.Arch == ArchType::arm)
diff --git a/src/sw/driver/checks.cpp b/src/sw/driver/checks.cpp
@@ -481,7 +481,10 @@ int main() { return IsBigEndian(); }
                 ctx.addLine("echo \"# " + defs + "\" >> " + mfn);
 
                 if (!bat)
+                {
+                    ctx.addLine("chmod 755 " + fn);
                     ctx.addLine("./");
+                }
                 ctx.addText(fn + checker.build.getBuildSettings().TargetOS.getExecutableExtension());
 
                 ctx.addLine("echo " + std::to_string(c->getHash()) + " ");
diff --git a/src/sw/driver/options_cl.yml b/src/sw/driver/options_cl.yml
@@ -35,6 +35,13 @@ flags:
         type: bool
         default: true
 
+    nologo:
+        name: Nologo
+        flag: nologo
+        type: bool
+        default: true
+        order: -100
+
 types:
     # internal name
     vscomn:
@@ -44,18 +51,11 @@ types:
         name: VisualStudioCommonCompilerOptions
         parent: VisualStudioCommonOptions
 
-        flags:
-            nologo:
-                name: Nologo
-                flag: nologo
-                type: bool
-                default: true
-                order: -100
-
         using:
             - compile
             - pp_to_stdout
             - vsoutput
+            - nologo
 
     vsasm:
         name: VisualStudioAssemblerOptions
@@ -572,6 +572,7 @@ types:
 
         using:
             - vsoutput
+            - nologo
             - input:
                 order: 100
 
@@ -780,7 +781,6 @@ types:
                 name: Permissive
                 flag: fpermissive
                 type: bool
-                default: true
 
             isr:
                 name: IncludeSystemRoot
diff --git a/src/sw/driver/target/native.cpp b/src/sw/driver/target/native.cpp
diff --git a/sw.cpp b/sw.cpp
diff --git a/test/build/simple/1.patch b/test/build/simple/1.patch
diff --git a/test/build/simple/f.cpp b/test/build/simple/f.cpp
diff --git a/test/build/simple/main.cpp b/test/build/simple/main.cpp
diff --git a/test/build/simple/sw.cpp b/test/build/simple/sw.cpp

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ namespace sw`
`18`	`18`	`struct CommandRecord`
`19`	`19`	`{`
`20`	`20`	`size_t hash = 0;`
`21`		`- size_t mtime = 0;`
	`21`	`+ fs::file_time_type mtime = fs::file_time_type::min();`
`22`	`22`	`Files implicit_inputs;`
`23`	`23`	`};`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ void ExecutionPlan::execute(Executor &e) const`
`57`	`57`	`{`
`58`	`58`	`static_cast<builder::Command*>(c)->silent = silent;`
`59`	`59`	`static_cast<builder::Command*>(c)->show_output = show_output;`
	`60`	`+ static_cast<builder::Command*>(c)->write_output_to_file = write_output_to_file;`
`60`	`61`	`static_cast<builder::Command*>(c)->always \|= build_always;`
`61`	`62`	`}`
`62`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,12 @@ ProgramVersionStorage::ProgramVersionStorage(const path &fn)`
`27`	`27`	`break;`
`28`	`28`	`ifile >> v;`
`29`	`29`	`ifile >> t;`
`30`		`- auto lwt = fs::last_write_time(p).time_since_epoch().count();`
`31`		`- if (t && lwt <= t)`
	`30`	`+ auto lwt = fs::last_write_time(p);`
	`31`	`+#ifndef __APPLE__`
	`32`	`+ if (t && (time_t)&lwt <= t)`
	`33`	`+#else`
	`34`	`+ if (t && lwt <= decltype(lwt)::clock::from_time_t(t))`
	`35`	`+#endif`
`32`	`36`	`versions[p] = {v,lwt};`
`33`	`37`	`}`
`34`	`38`	`}`
`@@ -37,7 +41,11 @@ ProgramVersionStorage::~ProgramVersionStorage()`
`37`	`41`	`{`
`38`	`42`	`std::ofstream ofile(fn);`
`39`	`43`	`for (auto &[p, v] : std::map{ versions.begin(), versions.end() })`
`40`		`- ofile << p << " " << v.v.toString() << " " << v.t << "\n";`
	`44`	`+#ifndef __APPLE__`
	`45`	`+ ofile << p << " " << v.v.toString() << " " << (time_t)&v.t << "\n";`
	`46`	`+#else`
	`47`	`+ ofile << p << " " << v.v.toString() << " " << decltype(v.t)::clock::to_time_t(v.t) << "\n";`
	`48`	`+#endif`
`41`	`49`	`}`
`42`	`50`
`43`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ struct ProgramVersionStorage`
`18`	`18`	`struct ProgramInfo`
`19`	`19`	`{`
`20`	`20`	`Version v;`
`21`		`- time_t t;`
	`21`	`+ fs::file_time_type t;`
`22`	`22`
`23`	`23`	`operator Version&() { return v; }`
`24`	`24`	`};`
`@@ -31,7 +31,7 @@ struct ProgramVersionStorage`
`31`	`31`
`32`	`32`	`void addVersion(const path &p, const Version &v)`
`33`	`33`	`{`
`34`		`- versions[p] = {v,fs::last_write_time(p).time_since_epoch().count()};`
	`34`	`+ versions[p] = {v,fs::last_write_time(p)};`
`35`	`35`	`}`
`36`	`36`	`};`
`37`	`37`