Fix build failure on Windows Many tests failing due to CRLF, and one test failing for some unknown reason (Day and Night difference, probably due to datetime things.) But it compiles and runs...honestly I'm not gonna spend much time on Windows. I'm not willing to configure Git, clone a repository, setup toolchains, compile this project, then test things working on that insecure bloated slow garbage. I'll fix CRLF thingy and address bugs if there are assistances, though.

Changes

3 changed files (+57/-13)

• README.md
  • @@ -60,3 +60,10 @@
    # Build and install man page in addition to the application binary zig build -Dman ``` + + ## Development + + ### Testing Windows build via Wine + + Add `-Dtarget=native-windows -fwine` options to build command. + You need working Wine installation on your machine.
• flake.nix
  • @@ -80,6 +80,10 @@ # Copyright and license linter based on SPDX
    # https://github.com/fsfe/reuse-tool reuse + # Open Source implementation of the Windows API on top of X, OpenGL, and Unix + # https://www.winehq.org/ + wineWowPackages.stable + # For text editors, optional. # > ZLS is a non-official implementation of the Language Server Protocol for Zig # https://github.com/zigtools/zls
• src/RunOptions.zig
  • @@ -15,6 +15,7 @@ // along with this program. If not, see <https://www.gnu.org/licenses/>.
    // // SPDX-License-Identifier: GPL-3.0-only + const builtin = @import("builtin"); const std = @import("std"); const ArgIterator = @import("./RunOptions/ArgIterator.zig");
  • @@ -596,10 +597,18 @@
    fn getTargetDay(time: c.time_t, opts: GetTargetDayOptions) c.time_t { var tm: c.tm = undefined; if (opts.is_utc) { - _ = c.gmtime_r(&time, &tm); + if (builtin.os.tag == .windows) { + tm = c.gmtime(&time).*; + } else { + _ = c.gmtime_r(&time, &tm); + } } else { - c.tzset(); - _ = c.localtime_r(&time, &tm); + if (builtin.os.tag == .windows) { + tm = c.localtime(&time).*; + } else { + c.tzset(); + _ = c.localtime_r(&time, &tm); + } } if (opts.year_since_2000) |y| {
  • @@ -620,10 +629,33 @@ tm.tm_hour = 0;
    tm.tm_min = 0; tm.tm_sec = 0; - return c.timegm(&tm); + return if (builtin.os.tag == .windows) c._mkgmtime(&tm) else c.timegm(&tm); } pub fn toC(self: *const @This()) c.runStruct { + const timezone: c_long = timezone: switch (builtin.os.tag) { + .windows => { + // This header file is available from newer Windows (probably 10?) + // and does not exist in old ones such as XP. + const win32 = @cImport({ + @cInclude("timezoneapi.h"); + }); + + var info: win32.DYNAMIC_TIME_ZONE_INFORMATION = undefined; + _ = win32.GetDynamicTimeZoneInformation(&info); + + break :timezone info.Bias * -60; + }, + else => { + c.tzset(); + var now = c.time(null); + var tm: c.tm = undefined; + _ = c.localtime_r(&now, &tm); + + break :timezone tm.tm_gmtoff; + }, + }; + const now: c.time_t = now: switch (self.command) { .poll => |opts| { if (opts.at) |at| {
  • @@ -639,12 +671,12 @@
    var now = c.mktime(&tm); if (at.offset) |offset| { - now -= tm.tm_gmtoff; + now -= timezone; now += @as(c_long, if (offset.positive) 1 else -1) * (@as(c_long, offset.hour) * 60 + offset.minute) * std.time.s_per_min; } else if (self.utc) { - now -= tm.tm_gmtoff; + now -= timezone; } break :now now;
  • @@ -668,12 +700,12 @@
    var t = c.mktime(&tm); if (now.offset) |offset| { - t -= tm.tm_gmtoff; + t -= timezone; t += @as(c_long, if (offset.positive) 1 else -1) * (@as(c_long, offset.hour) * 60 + offset.minute) * std.time.s_per_min; } else if (self.utc) { - t -= tm.tm_gmtoff; + t -= timezone; } break :now t;
  • @@ -689,7 +721,11 @@ .tm_mon = from.month - 1,
    .tm_mday = from.day, }; - break :now if (self.utc) c.timegm(&tm) else c.timelocal(&tm); + if (!self.utc) { + break :now c.mktime(&tm); + } + + break :now if (builtin.os.tag == .windows) c._mkgmtime(&tm) else c.timegm(&tm); } break :now c.time(null);
  • @@ -717,9 +753,6 @@ };
    const twilight_angle = self.twilight_angle orelse .daylight; - // This effectful function updates `c.timezone`. - c.tzset(); - return c.runStruct{ .latitude = self.latitude orelse c.DEFAULT_LATITUDE, .longitude = self.longitude orelse c.DEFAULT_LONGITUDE,
  • @@ -743,7 +776,7 @@ .listDays = switch (self.command) {
    .list => |opts| opts.days, else => c.DEFAULT_LIST, }, - .utcBiasHours = @as(f64, @floatFromInt(-c.timezone)) / 60.0 / 60.0, + .utcBiasHours = @as(f64, @floatFromInt(timezone)) / 60.0 / 60.0, }; }