mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-05-23 13:52:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Remove remaining build references to zip command

Browse source
This commit is contained in:
Justine Tunney 2021-07-03 08:37:15 -07:00
parent d6873f637f
commit e6b22f1f65
3 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
test/libc/release/test.mk
View file

@ -7,8 +7,9 @@ o/$(MODE)/test/libc/release/cosmopolitan.zip: \
o/$(MODE)/libc/crt/crt.o \ o/$(MODE)/libc/crt/crt.o \
o/$(MODE)/ape/ape.o \ o/$(MODE)/ape/ape.o \
o/$(MODE)/ape/ape-no-modify-self.o \ o/$(MODE)/ape/ape-no-modify-self.o \
o/$(MODE)/cosmopolitan.a o/$(MODE)/cosmopolitan.a \
@$(COMPILE) -AZIP -T$@ zip -qj $@ $^ o/$(MODE)/host/third_party/infozip/zip.com
@$(COMPILE) -AZIP -T$@ o/$(MODE)/host/third_party/infozip/zip.com -qj $@ o/cosmopolitan.h o/$(MODE)/ape/ape.lds o/$(MODE)/libc/crt/crt.o o/$(MODE)/ape/ape.o o/$(MODE)/ape/ape-no-modify-self.o o/$(MODE)/cosmopolitan.a
o/$(MODE)/test/libc/release/smoke.com: \ o/$(MODE)/test/libc/release/smoke.com: \
o/$(MODE)/test/libc/release/smoke.com.dbg o/$(MODE)/test/libc/release/smoke.com.dbg

12
tool/net/net.mk
View file

@ -89,6 +89,7 @@ o/$(MODE)/tool/net/redbean.com.dbg: \
o/$(MODE)/tool/net/redbean.com: \ o/$(MODE)/tool/net/redbean.com: \
o/$(MODE)/tool/net/redbean.com.dbg \ o/$(MODE)/tool/net/redbean.com.dbg \
o/$(MODE)/host/third_party/infozip/zip.com \
tool/net/net.mk \ tool/net/net.mk \
tool/net/.help.txt \ tool/net/.help.txt \
tool/net/.init.lua \ tool/net/.init.lua \
@ -96,7 +97,7 @@ o/$(MODE)/tool/net/redbean.com: \
tool/net/redbean.png tool/net/redbean.png
@$(COMPILE) -AOBJCOPY -T$@ $(OBJCOPY) -S -O binary $< $@ @$(COMPILE) -AOBJCOPY -T$@ $(OBJCOPY) -S -O binary $< $@
@$(COMPILE) -ADD -T$@ dd if=$@ of=o/$(MODE)/tool/net/.ape bs=64 count=11 conv=notrunc 2>/dev/null @$(COMPILE) -ADD -T$@ dd if=$@ of=o/$(MODE)/tool/net/.ape bs=64 count=11 conv=notrunc 2>/dev/null
@$(COMPILE) -AZIP -T$@ zip -qj $@ o/$(MODE)/tool/net/.ape tool/net/.help.txt tool/net/.init.lua tool/net/favicon.ico tool/net/redbean.png @$(COMPILE) -AZIP -T$@ o/$(MODE)/host/third_party/infozip/zip.com -qj $@ o/$(MODE)/tool/net/.ape tool/net/.help.txt tool/net/.init.lua tool/net/favicon.ico tool/net/redbean.png
# REDBEAN-DEMO.COM # REDBEAN-DEMO.COM
# #
@ -161,12 +162,13 @@ o/$(MODE)/tool/net/redbean-demo.com: \
o/$(MODE)/tool/net/redbean-static.com: \ o/$(MODE)/tool/net/redbean-static.com: \
o/$(MODE)/tool/net/redbean-static.com.dbg \ o/$(MODE)/tool/net/redbean-static.com.dbg \
o/$(MODE)/host/third_party/infozip/zip.com \
tool/net/favicon.ico \ tool/net/favicon.ico \
tool/net/redbean.png tool/net/redbean.png
@$(COMPILE) -AOBJCOPY -T$@ $(OBJCOPY) -S -O binary $< $@ @$(COMPILE) -AOBJCOPY -T$@ $(OBJCOPY) -S -O binary $< $@
@$(COMPILE) -AMKDIR -T$@ mkdir -p o/$(MODE)/tool/net/.redbean-static @$(COMPILE) -AMKDIR -T$@ mkdir -p o/$(MODE)/tool/net/.redbean-static
@$(COMPILE) -ADD -T$@ dd if=$@ of=o/$(MODE)/tool/net/.redbean-static/.ape bs=64 count=11 conv=notrunc 2>/dev/null @$(COMPILE) -ADD -T$@ dd if=$@ of=o/$(MODE)/tool/net/.redbean-static/.ape bs=64 count=11 conv=notrunc 2>/dev/null
@$(COMPILE) -AZIP -T$@ zip -qj $@ o/$(MODE)/tool/net/.redbean-static/.ape tool/net/favicon.ico tool/net/redbean.png @$(COMPILE) -AZIP -T$@ o/$(MODE)/host/third_party/infozip/zip.com -qj $@ o/$(MODE)/tool/net/.redbean-static/.ape tool/net/favicon.ico tool/net/redbean.png
o/$(MODE)/tool/net/redbean-static.com.dbg: \ o/$(MODE)/tool/net/redbean-static.com.dbg: \
$(TOOL_NET_DEPS) \ $(TOOL_NET_DEPS) \
@ -187,12 +189,13 @@ o/$(MODE)/tool/net/redbean-static.o: tool/net/redbean.c
o/$(MODE)/tool/net/redbean-unsecure.com: \ o/$(MODE)/tool/net/redbean-unsecure.com: \
o/$(MODE)/tool/net/redbean-unsecure.com.dbg \ o/$(MODE)/tool/net/redbean-unsecure.com.dbg \
o/$(MODE)/host/third_party/infozip/zip.com \
tool/net/favicon.ico \ tool/net/favicon.ico \
tool/net/redbean.png tool/net/redbean.png
@$(COMPILE) -AOBJCOPY -T$@ $(OBJCOPY) -S -O binary $< $@ @$(COMPILE) -AOBJCOPY -T$@ $(OBJCOPY) -S -O binary $< $@
@$(COMPILE) -AMKDIR -T$@ mkdir -p o/$(MODE)/tool/net/.redbean-unsecure @$(COMPILE) -AMKDIR -T$@ mkdir -p o/$(MODE)/tool/net/.redbean-unsecure
@$(COMPILE) -ADD -T$@ dd if=$@ of=o/$(MODE)/tool/net/.redbean-unsecure/.ape bs=64 count=11 conv=notrunc 2>/dev/null @$(COMPILE) -ADD -T$@ dd if=$@ of=o/$(MODE)/tool/net/.redbean-unsecure/.ape bs=64 count=11 conv=notrunc 2>/dev/null
@$(COMPILE) -AZIP -T$@ zip -qj $@ o/$(MODE)/tool/net/.redbean-unsecure/.ape tool/net/favicon.ico tool/net/redbean.png @$(COMPILE) -AZIP -T$@ o/$(MODE)/host/third_party/infozip/zip.com -qj $@ o/$(MODE)/tool/net/.redbean-unsecure/.ape tool/net/favicon.ico tool/net/redbean.png
o/$(MODE)/tool/net/redbean-unsecure.com.dbg: \ o/$(MODE)/tool/net/redbean-unsecure.com.dbg: \
$(TOOL_NET_DEPS) \ $(TOOL_NET_DEPS) \
@ -214,12 +217,13 @@ o/$(MODE)/tool/net/redbean-unsecure.o: tool/net/redbean.c
o/$(MODE)/tool/net/redbean-original.com: \ o/$(MODE)/tool/net/redbean-original.com: \
o/$(MODE)/tool/net/redbean-original.com.dbg \ o/$(MODE)/tool/net/redbean-original.com.dbg \
o/$(MODE)/host/third_party/infozip/zip.com \
tool/net/favicon.ico \ tool/net/favicon.ico \
tool/net/redbean.png tool/net/redbean.png
@$(COMPILE) -AOBJCOPY -T$@ $(OBJCOPY) -S -O binary $< $@ @$(COMPILE) -AOBJCOPY -T$@ $(OBJCOPY) -S -O binary $< $@
@$(COMPILE) -AMKDIR -T$@ mkdir -p o/$(MODE)/tool/net/.redbean-original @$(COMPILE) -AMKDIR -T$@ mkdir -p o/$(MODE)/tool/net/.redbean-original
@$(COMPILE) -ADD -T$@ dd if=$@ of=o/$(MODE)/tool/net/.redbean-original/.ape bs=64 count=11 conv=notrunc 2>/dev/null @$(COMPILE) -ADD -T$@ dd if=$@ of=o/$(MODE)/tool/net/.redbean-original/.ape bs=64 count=11 conv=notrunc 2>/dev/null
@$(COMPILE) -AZIP -T$@ zip -qj $@ o/$(MODE)/tool/net/.redbean-original/.ape tool/net/favicon.ico tool/net/redbean.png @$(COMPILE) -AZIP -T$@ o/$(MODE)/host/third_party/infozip/zip.com -qj $@ o/$(MODE)/tool/net/.redbean-original/.ape tool/net/favicon.ico tool/net/redbean.png
o/$(MODE)/tool/net/redbean-original.com.dbg: \ o/$(MODE)/tool/net/redbean-original.com.dbg: \
$(TOOL_NET_DEPS) \ $(TOOL_NET_DEPS) \

2
tool/net/redbean.c
View file

@ -1689,7 +1689,7 @@ static void LoadCertificates(void) {
" -addext extendedKeyUsage=serverAuth"); " -addext extendedKeyUsage=serverAuth");
VERBOSEF("could not find CA key signing key pair with" VERBOSEF("could not find CA key signing key pair with"
" -addext keyUsage=keyCertSign"); " -addext keyUsage=keyCertSign");
WARNF("generating self-signed ssl certificates"); LOGFd("generating self-signed ssl certificates");
} }
#ifdef MBEDTLS_ECP_C #ifdef MBEDTLS_ECP_C
ecp = GenerateEcpCertificate(ksk); ecp = GenerateEcpCertificate(ksk);