Compare commits

..

No commits in common. "99daf922fd1b56ab69b18d504c7f3383febcccf0" and "ff13f5e621c5194bff5f4d5f74729a4b615dd767" have entirely different histories.

2 changed files with 5 additions and 13 deletions

View File

@ -26,12 +26,9 @@ pub fn nats_c_lib(
lib.linkLibC(); lib.linkLibC();
lib.addCSourceFiles(&common_sources, &cflags); lib.addCSourceFiles(&common_sources, &cflags);
lib.addIncludePath(.{ .path = nats_src_prefix ++ "include" }); lib.addIncludePath(.{ .path = nats_src_prefix ++ "include" });
// if building with streaming support (protocol.pb-c.c includes // if building with streaming support
// <protobuf-c/protobuf-c.h>, unfortunately) // lib.addIncludePath(.{ .path = nats_src_prefix ++ "stan" });
lib.addIncludePath(.{ .path = "deps" }); // lib.addCSourceFiles(&streaming_sources, &cflags);
lib.addIncludePath(.{ .path = nats_src_prefix ++ "stan" });
lib.addCSourceFiles(&streaming_sources, &cflags);
lib.addCSourceFiles(&protobuf_c_sources, &cflags);
const ssl_dep = b.dependency("libressl", .{ const ssl_dep = b.dependency("libressl", .{
.target = options.target, .target = options.target,
@ -65,7 +62,6 @@ pub fn nats_c_lib(
lib.defineCMacro("NATS_HAS_TLS", null); lib.defineCMacro("NATS_HAS_TLS", null);
lib.defineCMacro("NATS_USE_OPENSSL_1_1", null); lib.defineCMacro("NATS_USE_OPENSSL_1_1", null);
lib.defineCMacro("NATS_FORCE_HOST_VERIFICATION", null); lib.defineCMacro("NATS_FORCE_HOST_VERIFICATION", null);
lib.defineCMacro("NATS_HAS_STREAMING", null);
lib.defineCMacro("_REENTRANT", null); lib.defineCMacro("_REENTRANT", null);
inline for (install_headers) |header| { inline for (install_headers) |header| {
@ -145,7 +141,3 @@ const streaming_sources = [_][]const u8{
nats_src_prefix ++ "stan/sopts.c", nats_src_prefix ++ "stan/sopts.c",
nats_src_prefix ++ "stan/sub.c", nats_src_prefix ++ "stan/sub.c",
}; };
const protobuf_c_sources = [_][]const u8{
"deps/protobuf-c/protobuf-c.c",
};

View File

@ -9,8 +9,8 @@ test "version" {
const version = nats.getVersion(); const version = nats.getVersion();
const vernum = nats.getVersionNumber(); const vernum = nats.getVersionNumber();
try std.testing.expectEqualStrings("3.7.0", version); try std.testing.expectEqualStrings("3.6.1", version);
try std.testing.expectEqual(@as(u32, 0x03_07_00), vernum); try std.testing.expectEqual(@as(u32, 0x03_06_01), vernum);
try std.testing.expect(nats.checkCompatibility()); try std.testing.expect(nats.checkCompatibility());
} }