Skip to content

Commit 1e095fe

Browse files
krichprollschkrichprollsch
committed
zig fmt build.zig
1 parent 96b10f4 commit 1e095fe

File tree

1 file changed

+162
-174
lines changed

1 file changed

+162
-174
lines changed

‎build.zig‎

Lines changed: 162 additions & 174 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ fn common(b: *Build, opts: *Build.Step.Options, step: *Build.Step.Compile) !void
163163
v8_mod.addOptions("default_exports", v8_opts);
164164
mod.addImport("v8", v8_mod);
165165

166-
167166
const release_dir = if (mod.optimize.? == .Debug) "debug" else "release";
168167
const os = switch (target.result.os.tag) {
169168
.linux => "linux",
@@ -452,30 +451,27 @@ fn buildZlib(b: *Build, m: *Build.Module) !void {
452451
const root = "vendor/zlib/";
453452
zlib.installHeader(b.path(root ++ "zlib.h"), "zlib.h");
454453
zlib.installHeader(b.path(root ++ "zconf.h"), "zconf.h");
455-
zlib.addCSourceFiles(.{
456-
.flags = &.{
457-
"-DHAVE_SYS_TYPES_H",
458-
"-DHAVE_STDINT_H",
459-
"-DHAVE_STDDEF_H",
460-
},
461-
.files = &.{
462-
root ++ "adler32.c",
463-
root ++ "compress.c",
464-
root ++ "crc32.c",
465-
root ++ "deflate.c",
466-
root ++ "gzclose.c",
467-
root ++ "gzlib.c",
468-
root ++ "gzread.c",
469-
root ++ "gzwrite.c",
470-
root ++ "inflate.c",
471-
root ++ "infback.c",
472-
root ++ "inftrees.c",
473-
root ++ "inffast.c",
474-
root ++ "trees.c",
475-
root ++ "uncompr.c",
476-
root ++ "zutil.c",
477-
}
478-
});
454+
zlib.addCSourceFiles(.{ .flags = &.{
455+
"-DHAVE_SYS_TYPES_H",
456+
"-DHAVE_STDINT_H",
457+
"-DHAVE_STDDEF_H",
458+
}, .files = &.{
459+
root ++ "adler32.c",
460+
root ++ "compress.c",
461+
root ++ "crc32.c",
462+
root ++ "deflate.c",
463+
root ++ "gzclose.c",
464+
root ++ "gzlib.c",
465+
root ++ "gzread.c",
466+
root ++ "gzwrite.c",
467+
root ++ "inflate.c",
468+
root ++ "infback.c",
469+
root ++ "inftrees.c",
470+
root ++ "inffast.c",
471+
root ++ "trees.c",
472+
root ++ "uncompr.c",
473+
root ++ "zutil.c",
474+
} });
479475
}
480476

481477
fn buildMbedtls(b: *Build, m: *Build.Module) !void {
@@ -488,118 +484,114 @@ fn buildMbedtls(b: *Build, m: *Build.Module) !void {
488484
mbedtls.addIncludePath(b.path(root ++ "include"));
489485
mbedtls.addIncludePath(b.path(root ++ "library"));
490486

491-
mbedtls.addCSourceFiles(.{
492-
.flags = &.{
493-
},
494-
.files = &.{
495-
root ++ "library/aes.c",
496-
root ++ "library/aesni.c",
497-
root ++ "library/aesce.c",
498-
root ++ "library/aria.c",
499-
root ++ "library/asn1parse.c",
500-
root ++ "library/asn1write.c",
501-
root ++ "library/base64.c",
502-
root ++ "library/bignum.c",
503-
root ++ "library/bignum_core.c",
504-
root ++ "library/bignum_mod.c",
505-
root ++ "library/bignum_mod_raw.c",
506-
root ++ "library/camellia.c",
507-
root ++ "library/ccm.c",
508-
root ++ "library/chacha20.c",
509-
root ++ "library/chachapoly.c",
510-
root ++ "library/cipher.c",
511-
root ++ "library/cipher_wrap.c",
512-
root ++ "library/constant_time.c",
513-
root ++ "library/cmac.c",
514-
root ++ "library/ctr_drbg.c",
515-
root ++ "library/des.c",
516-
root ++ "library/dhm.c",
517-
root ++ "library/ecdh.c",
518-
root ++ "library/ecdsa.c",
519-
root ++ "library/ecjpake.c",
520-
root ++ "library/ecp.c",
521-
root ++ "library/ecp_curves.c",
522-
root ++ "library/entropy.c",
523-
root ++ "library/entropy_poll.c",
524-
root ++ "library/error.c",
525-
root ++ "library/gcm.c",
526-
root ++ "library/hkdf.c",
527-
root ++ "library/hmac_drbg.c",
528-
root ++ "library/lmots.c",
529-
root ++ "library/lms.c",
530-
root ++ "library/md.c",
531-
root ++ "library/md5.c",
532-
root ++ "library/memory_buffer_alloc.c",
533-
root ++ "library/nist_kw.c",
534-
root ++ "library/oid.c",
535-
root ++ "library/padlock.c",
536-
root ++ "library/pem.c",
537-
root ++ "library/pk.c",
538-
root ++ "library/pk_ecc.c",
539-
root ++ "library/pk_wrap.c",
540-
root ++ "library/pkcs12.c",
541-
root ++ "library/pkcs5.c",
542-
root ++ "library/pkparse.c",
543-
root ++ "library/pkwrite.c",
544-
root ++ "library/platform.c",
545-
root ++ "library/platform_util.c",
546-
root ++ "library/poly1305.c",
547-
root ++ "library/psa_crypto.c",
548-
root ++ "library/psa_crypto_aead.c",
549-
root ++ "library/psa_crypto_cipher.c",
550-
root ++ "library/psa_crypto_client.c",
551-
root ++ "library/psa_crypto_ffdh.c",
552-
root ++ "library/psa_crypto_driver_wrappers_no_static.c",
553-
root ++ "library/psa_crypto_ecp.c",
554-
root ++ "library/psa_crypto_hash.c",
555-
root ++ "library/psa_crypto_mac.c",
556-
root ++ "library/psa_crypto_pake.c",
557-
root ++ "library/psa_crypto_rsa.c",
558-
root ++ "library/psa_crypto_se.c",
559-
root ++ "library/psa_crypto_slot_management.c",
560-
root ++ "library/psa_crypto_storage.c",
561-
root ++ "library/psa_its_file.c",
562-
root ++ "library/psa_util.c",
563-
root ++ "library/ripemd160.c",
564-
root ++ "library/rsa.c",
565-
root ++ "library/rsa_alt_helpers.c",
566-
root ++ "library/sha1.c",
567-
root ++ "library/sha3.c",
568-
root ++ "library/sha256.c",
569-
root ++ "library/sha512.c",
570-
root ++ "library/threading.c",
571-
root ++ "library/timing.c",
572-
root ++ "library/version.c",
573-
root ++ "library/version_features.c",
574-
root ++ "library/pkcs7.c",
575-
root ++ "library/x509.c",
576-
root ++ "library/x509_create.c",
577-
root ++ "library/x509_crl.c",
578-
root ++ "library/x509_crt.c",
579-
root ++ "library/x509_csr.c",
580-
root ++ "library/x509write.c",
581-
root ++ "library/x509write_crt.c",
582-
root ++ "library/x509write_csr.c",
583-
root ++ "library/debug.c",
584-
root ++ "library/mps_reader.c",
585-
root ++ "library/mps_trace.c",
586-
root ++ "library/net_sockets.c",
587-
root ++ "library/ssl_cache.c",
588-
root ++ "library/ssl_ciphersuites.c",
589-
root ++ "library/ssl_client.c",
590-
root ++ "library/ssl_cookie.c",
591-
root ++ "library/ssl_debug_helpers_generated.c",
592-
root ++ "library/ssl_msg.c",
593-
root ++ "library/ssl_ticket.c",
594-
root ++ "library/ssl_tls.c",
595-
root ++ "library/ssl_tls12_client.c",
596-
root ++ "library/ssl_tls12_server.c",
597-
root ++ "library/ssl_tls13_keys.c",
598-
root ++ "library/ssl_tls13_server.c",
599-
root ++ "library/ssl_tls13_client.c",
600-
root ++ "library/ssl_tls13_generic.c",
601-
}
602-
});
487+
mbedtls.addCSourceFiles(.{ .flags = &.{}, .files = &.{
488+
root ++ "library/aes.c",
489+
root ++ "library/aesni.c",
490+
root ++ "library/aesce.c",
491+
root ++ "library/aria.c",
492+
root ++ "library/asn1parse.c",
493+
root ++ "library/asn1write.c",
494+
root ++ "library/base64.c",
495+
root ++ "library/bignum.c",
496+
root ++ "library/bignum_core.c",
497+
root ++ "library/bignum_mod.c",
498+
root ++ "library/bignum_mod_raw.c",
499+
root ++ "library/camellia.c",
500+
root ++ "library/ccm.c",
501+
root ++ "library/chacha20.c",
502+
root ++ "library/chachapoly.c",
503+
root ++ "library/cipher.c",
504+
root ++ "library/cipher_wrap.c",
505+
root ++ "library/constant_time.c",
506+
root ++ "library/cmac.c",
507+
root ++ "library/ctr_drbg.c",
508+
root ++ "library/des.c",
509+
root ++ "library/dhm.c",
510+
root ++ "library/ecdh.c",
511+
root ++ "library/ecdsa.c",
512+
root ++ "library/ecjpake.c",
513+
root ++ "library/ecp.c",
514+
root ++ "library/ecp_curves.c",
515+
root ++ "library/entropy.c",
516+
root ++ "library/entropy_poll.c",
517+
root ++ "library/error.c",
518+
root ++ "library/gcm.c",
519+
root ++ "library/hkdf.c",
520+
root ++ "library/hmac_drbg.c",
521+
root ++ "library/lmots.c",
522+
root ++ "library/lms.c",
523+
root ++ "library/md.c",
524+
root ++ "library/md5.c",
525+
root ++ "library/memory_buffer_alloc.c",
526+
root ++ "library/nist_kw.c",
527+
root ++ "library/oid.c",
528+
root ++ "library/padlock.c",
529+
root ++ "library/pem.c",
530+
root ++ "library/pk.c",
531+
root ++ "library/pk_ecc.c",
532+
root ++ "library/pk_wrap.c",
533+
root ++ "library/pkcs12.c",
534+
root ++ "library/pkcs5.c",
535+
root ++ "library/pkparse.c",
536+
root ++ "library/pkwrite.c",
537+
root ++ "library/platform.c",
538+
root ++ "library/platform_util.c",
539+
root ++ "library/poly1305.c",
540+
root ++ "library/psa_crypto.c",
541+
root ++ "library/psa_crypto_aead.c",
542+
root ++ "library/psa_crypto_cipher.c",
543+
root ++ "library/psa_crypto_client.c",
544+
root ++ "library/psa_crypto_ffdh.c",
545+
root ++ "library/psa_crypto_driver_wrappers_no_static.c",
546+
root ++ "library/psa_crypto_ecp.c",
547+
root ++ "library/psa_crypto_hash.c",
548+
root ++ "library/psa_crypto_mac.c",
549+
root ++ "library/psa_crypto_pake.c",
550+
root ++ "library/psa_crypto_rsa.c",
551+
root ++ "library/psa_crypto_se.c",
552+
root ++ "library/psa_crypto_slot_management.c",
553+
root ++ "library/psa_crypto_storage.c",
554+
root ++ "library/psa_its_file.c",
555+
root ++ "library/psa_util.c",
556+
root ++ "library/ripemd160.c",
557+
root ++ "library/rsa.c",
558+
root ++ "library/rsa_alt_helpers.c",
559+
root ++ "library/sha1.c",
560+
root ++ "library/sha3.c",
561+
root ++ "library/sha256.c",
562+
root ++ "library/sha512.c",
563+
root ++ "library/threading.c",
564+
root ++ "library/timing.c",
565+
root ++ "library/version.c",
566+
root ++ "library/version_features.c",
567+
root ++ "library/pkcs7.c",
568+
root ++ "library/x509.c",
569+
root ++ "library/x509_create.c",
570+
root ++ "library/x509_crl.c",
571+
root ++ "library/x509_crt.c",
572+
root ++ "library/x509_csr.c",
573+
root ++ "library/x509write.c",
574+
root ++ "library/x509write_crt.c",
575+
root ++ "library/x509write_csr.c",
576+
root ++ "library/debug.c",
577+
root ++ "library/mps_reader.c",
578+
root ++ "library/mps_trace.c",
579+
root ++ "library/net_sockets.c",
580+
root ++ "library/ssl_cache.c",
581+
root ++ "library/ssl_ciphersuites.c",
582+
root ++ "library/ssl_client.c",
583+
root ++ "library/ssl_cookie.c",
584+
root ++ "library/ssl_debug_helpers_generated.c",
585+
root ++ "library/ssl_msg.c",
586+
root ++ "library/ssl_ticket.c",
587+
root ++ "library/ssl_tls.c",
588+
root ++ "library/ssl_tls12_client.c",
589+
root ++ "library/ssl_tls12_server.c",
590+
root ++ "library/ssl_tls13_keys.c",
591+
root ++ "library/ssl_tls13_server.c",
592+
root ++ "library/ssl_tls13_client.c",
593+
root ++ "library/ssl_tls13_generic.c",
594+
} });
603595
}
604596

605597
fn buildNghttp2(b: *Build, m: *Build.Module) !void {
@@ -611,41 +603,38 @@ fn buildNghttp2(b: *Build, m: *Build.Module) !void {
611603
const root = "vendor/nghttp2/";
612604
nghttp2.addIncludePath(b.path(root ++ "lib"));
613605
nghttp2.addIncludePath(b.path(root ++ "lib/includes"));
614-
nghttp2.addCSourceFiles(.{
615-
.flags = &.{
616-
"-DNGHTTP2_STATICLIB",
617-
"-DHAVE_NETINET_IN",
618-
"-DHAVE_TIME_H",
619-
},
620-
.files = &.{
621-
root ++ "lib/sfparse.c",
622-
root ++ "lib/nghttp2_alpn.c",
623-
root ++ "lib/nghttp2_buf.c",
624-
root ++ "lib/nghttp2_callbacks.c",
625-
root ++ "lib/nghttp2_debug.c",
626-
root ++ "lib/nghttp2_extpri.c",
627-
root ++ "lib/nghttp2_frame.c",
628-
root ++ "lib/nghttp2_hd.c",
629-
root ++ "lib/nghttp2_hd_huffman.c",
630-
root ++ "lib/nghttp2_hd_huffman_data.c",
631-
root ++ "lib/nghttp2_helper.c",
632-
root ++ "lib/nghttp2_http.c",
633-
root ++ "lib/nghttp2_map.c",
634-
root ++ "lib/nghttp2_mem.c",
635-
root ++ "lib/nghttp2_option.c",
636-
root ++ "lib/nghttp2_outbound_item.c",
637-
root ++ "lib/nghttp2_pq.c",
638-
root ++ "lib/nghttp2_priority_spec.c",
639-
root ++ "lib/nghttp2_queue.c",
640-
root ++ "lib/nghttp2_rcbuf.c",
641-
root ++ "lib/nghttp2_session.c",
642-
root ++ "lib/nghttp2_stream.c",
643-
root ++ "lib/nghttp2_submit.c",
644-
root ++ "lib/nghttp2_version.c",
645-
root ++ "lib/nghttp2_ratelim.c",
646-
root ++ "lib/nghttp2_time.c",
647-
}
648-
});
606+
nghttp2.addCSourceFiles(.{ .flags = &.{
607+
"-DNGHTTP2_STATICLIB",
608+
"-DHAVE_NETINET_IN",
609+
"-DHAVE_TIME_H",
610+
}, .files = &.{
611+
root ++ "lib/sfparse.c",
612+
root ++ "lib/nghttp2_alpn.c",
613+
root ++ "lib/nghttp2_buf.c",
614+
root ++ "lib/nghttp2_callbacks.c",
615+
root ++ "lib/nghttp2_debug.c",
616+
root ++ "lib/nghttp2_extpri.c",
617+
root ++ "lib/nghttp2_frame.c",
618+
root ++ "lib/nghttp2_hd.c",
619+
root ++ "lib/nghttp2_hd_huffman.c",
620+
root ++ "lib/nghttp2_hd_huffman_data.c",
621+
root ++ "lib/nghttp2_helper.c",
622+
root ++ "lib/nghttp2_http.c",
623+
root ++ "lib/nghttp2_map.c",
624+
root ++ "lib/nghttp2_mem.c",
625+
root ++ "lib/nghttp2_option.c",
626+
root ++ "lib/nghttp2_outbound_item.c",
627+
root ++ "lib/nghttp2_pq.c",
628+
root ++ "lib/nghttp2_priority_spec.c",
629+
root ++ "lib/nghttp2_queue.c",
630+
root ++ "lib/nghttp2_rcbuf.c",
631+
root ++ "lib/nghttp2_session.c",
632+
root ++ "lib/nghttp2_stream.c",
633+
root ++ "lib/nghttp2_submit.c",
634+
root ++ "lib/nghttp2_version.c",
635+
root ++ "lib/nghttp2_ratelim.c",
636+
root ++ "lib/nghttp2_time.c",
637+
} });
649638
}
650639

651640
fn buildCurl(b: *Build, m: *Build.Module) !void {
@@ -659,8 +648,7 @@ fn buildCurl(b: *Build, m: *Build.Module) !void {
659648
curl.addIncludePath(b.path(root ++ "lib"));
660649
curl.addIncludePath(b.path(root ++ "include"));
661650
curl.addCSourceFiles(.{
662-
.flags = &.{
663-
},
651+
.flags = &.{},
664652
.files = &.{
665653
root ++ "lib/altsvc.c",
666654
root ++ "lib/amigaos.c",

0 commit comments

Comments
 (0)