From 093e9c249911362bedb559eab4aee4db95fab8d7 Mon Sep 17 00:00:00 2001 From: dave caruso Date: Fri, 29 Mar 2024 15:20:13 -0700 Subject: [PATCH] ci: does this fix the windows build (#9715) * does this fix the windows build * [autofix.ci] apply automated fixes * a * enable tar oop --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> --- scripts/build-libarchive.ps1 | 2 +- src/bun.js/bindings/GeneratedJS2Native.zig | 34 +++++++++++----------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/scripts/build-libarchive.ps1 b/scripts/build-libarchive.ps1 index 68c01585e9..9d6c1a145f 100644 --- a/scripts/build-libarchive.ps1 +++ b/scripts/build-libarchive.ps1 @@ -5,7 +5,7 @@ Push-Location (Join-Path $BUN_DEPS_DIR 'libarchive') try { Set-Location (mkdir -Force build) - Run cmake @CMAKE_FLAGS -DBUILD_SHARED_LIBS=OFF -DENABLE_TEST=OFF -DENABLE_INSTALL=OFF -DENABLE_WERROR=0 .. + Run cmake @CMAKE_FLAGS -DBUILD_SHARED_LIBS=OFF -DENABLE_TEST=OFF -DENABLE_INSTALL=OFF -DENABLE_WERROR=0 -DENABLE_ICONV=0 -DENABLE_LibGCC=0 -DENABLE_LZMA=0 -DENABLE_LZ4=0 -DENABLE_LIBXML2=0 -DENABLE_LIBB2=0 -DENABLE_OPENSSL=0 -DENABLE_CAT=0 .. Run cmake --build . --clean-first --config Release Copy-Item libarchive\archive_static.lib $BUN_DEPS_OUT_DIR\archive.lib diff --git a/src/bun.js/bindings/GeneratedJS2Native.zig b/src/bun.js/bindings/GeneratedJS2Native.zig index 73cb06092d..d94554fbf1 100644 --- a/src/bun.js/bindings/GeneratedJS2Native.zig +++ b/src/bun.js/bindings/GeneratedJS2Native.zig @@ -1,36 +1,36 @@ //! This file is generated by src/codegen/js2native-generator.ts based on seen calls to the $zig() JS macro const JSC = @import("root").bun.JSC; export fn JS2Zig__createBinding_workaround(global: u64) callconv(.C) JSC.JSValue { - return @import("../node/node_fs_binding.zig").createBinding(@ptrFromInt(global)); + return @import("../node/node_fs_binding.zig").createBinding(@ptrFromInt(global)); } export fn JS2Zig__createNodeHttp_Binding_workaround(global: u64) callconv(.C) JSC.JSValue { - return @import("../api/bun/h2_frame_parser.zig").createNodeHttp2Binding(@ptrFromInt(global)); + return @import("../api/bun/h2_frame_parser.zig").createNodeHttp2Binding(@ptrFromInt(global)); } export fn JS2Zig__OS_create_workaround(global: u64) callconv(.C) JSC.JSValue { - return @import("../node/node_os.zig").OS.create(@ptrFromInt(global)); + return @import("../node/node_os.zig").OS.create(@ptrFromInt(global)); } export fn JS2Zig__String_jsGetStringWidth(global: *JSC.JSGlobalObject, call_frame: *JSC.CallFrame) callconv(.C) JSC.JSValue { - return @import("../../string.zig").String.jsGetStringWidth(global, call_frame); + return @import("../../string.zig").String.jsGetStringWidth(global, call_frame); } export fn JS2Zig__parseArgs(global: *JSC.JSGlobalObject, call_frame: *JSC.CallFrame) callconv(.C) JSC.JSValue { - return @import("../node/util/parse_args.zig").parseArgs(global, call_frame); + return @import("../node/util/parse_args.zig").parseArgs(global, call_frame); } export fn JS2Zig__QuickAndDirtyJavaScriptSyntaxHighlighter_jsFunctionSyntaxHighlight(global: *JSC.JSGlobalObject, call_frame: *JSC.CallFrame) callconv(.C) JSC.JSValue { - return @import("../../fmt.zig").QuickAndDirtyJavaScriptSyntaxHighlighter.jsFunctionSyntaxHighlight(global, call_frame); + return @import("../../fmt.zig").QuickAndDirtyJavaScriptSyntaxHighlighter.jsFunctionSyntaxHighlight(global, call_frame); } export fn JS2Zig__TestingAPIs_shellLex(global: *JSC.JSGlobalObject, call_frame: *JSC.CallFrame) callconv(.C) JSC.JSValue { - return @import("../../shell/shell.zig").TestingAPIs.shellLex(global, call_frame); + return @import("../../shell/shell.zig").TestingAPIs.shellLex(global, call_frame); } export fn JS2Zig__TestingAPIs_shellParse(global: *JSC.JSGlobalObject, call_frame: *JSC.CallFrame) callconv(.C) JSC.JSValue { - return @import("../../shell/shell.zig").TestingAPIs.shellParse(global, call_frame); + return @import("../../shell/shell.zig").TestingAPIs.shellParse(global, call_frame); } comptime { - _ = &JS2Zig__createBinding_workaround; - _ = &JS2Zig__createNodeHttp_Binding_workaround; - _ = &JS2Zig__OS_create_workaround; - _ = &JS2Zig__String_jsGetStringWidth; - _ = &JS2Zig__parseArgs; - _ = &JS2Zig__QuickAndDirtyJavaScriptSyntaxHighlighter_jsFunctionSyntaxHighlight; - _ = &JS2Zig__TestingAPIs_shellLex; - _ = &JS2Zig__TestingAPIs_shellParse; -} \ No newline at end of file + _ = &JS2Zig__createBinding_workaround; + _ = &JS2Zig__createNodeHttp_Binding_workaround; + _ = &JS2Zig__OS_create_workaround; + _ = &JS2Zig__String_jsGetStringWidth; + _ = &JS2Zig__parseArgs; + _ = &JS2Zig__QuickAndDirtyJavaScriptSyntaxHighlighter_jsFunctionSyntaxHighlight; + _ = &JS2Zig__TestingAPIs_shellLex; + _ = &JS2Zig__TestingAPIs_shellParse; +}