From 48aed25d6d316ae8a74bca333f1106baad61ce37 Mon Sep 17 00:00:00 2001 From: Conrad Pankoff Date: Sat, 26 Jan 2019 09:59:12 +1100 Subject: [PATCH] make sure wd builds in an isolated environment --- .gitignore | 2 ++ Makefile | 14 ++++++++++---- .../extensions/cmark-gfm-extensions_export.h | 2 ++ vendor/cmark-gfm/src/cmark-gfm_export.h | 2 ++ vendor/cmark-gfm/src/cmark-gfm_version.h | 2 ++ 5 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 vendor/cmark-gfm/extensions/cmark-gfm-extensions_export.h create mode 100644 vendor/cmark-gfm/src/cmark-gfm_export.h create mode 100644 vendor/cmark-gfm/src/cmark-gfm_version.h diff --git a/.gitignore b/.gitignore index be84022..57033f6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ /wd /gdb.txt /gdb.log +/release +/wd_static diff --git a/Makefile b/Makefile index eb88d60..da21f7e 100644 --- a/Makefile +++ b/Makefile @@ -3,21 +3,21 @@ prefix?=/usr/local wd_cflags:=-std=c99 -Wall -Wextra -pedantic -I. $(CFLAGS) wd_dynamic_libs:=-lcmark-gfm -lcmark-gfm-extensions -lduktape -ltermbox -luriparser wd_static_libs:=vendor/cmark-gfm/extensions/cmark-gfm-extensions.a vendor/cmark-gfm/src/cmark-gfm.a vendor/duktape/src/duktape.a vendor/termbox/src/termbox.a vendor/uriparser/src/uriparser.a -wd_ldlibs:=-lcurl -lm $(LDLIBS) +wd_ldlibs:=-lcurl -lm -lssl -lcrypto -lssh2 -lz $(LDLIBS) wd_objects:=$(patsubst %.c,%.o,$(wildcard *.c)) wd_vendor_deps:= wd_static_flag:= ifdef wd_vendor wd_ldlibs:=$(wd_static_libs) $(wd_ldlibs) - wd_cflags:=-Ivendor/termbox/src -Ivendor/cmark-gfm/src -Ivendor/duktape/src -Ivendor/uriparser/include $(wd_cflags) + wd_cflags:=-Ivendor/termbox/src -Ivendor/cmark-gfm/src -Ivendor/cmark-gfm/extensions -Ivendor/duktape/src -Ivendor/uriparser/include $(wd_cflags) wd_vendor_deps:=$(wd_static_libs) else wd_ldlibs:=$(wd_dynamic_libs) $(wd_ldlibs) endif ifdef wd_static - wd_static_flag:=-static + wd_static_flag:=-static endif all: wd @@ -31,9 +31,15 @@ $(wd_objects): %.o: %.c $(wd_vendor_deps): $(MAKE) -C vendor +wd_static: + docker run --rm -v $$PWD:/wd alpine:3.6 sh -c 'apk add --update build-base curl-dev libressl-dev libssh2-dev && cd /wd && make wd_vendor=1 wd_static=1 && mv wd wd_static' + +release: wd_static + curl --silent --output $@ --upload-file $< https://transfer.sh/wd + install: wd install -D -v -m 755 wd $(DESTDIR)$(prefix)/bin/wd clean: - rm -f wd $(wd_objects) $(wd_vendor_deps) + rm -f wd wd_static release $(wd_objects) $(wd_vendor_deps) $(MAKE) -C vendor clean diff --git a/vendor/cmark-gfm/extensions/cmark-gfm-extensions_export.h b/vendor/cmark-gfm/extensions/cmark-gfm-extensions_export.h new file mode 100644 index 0000000..5533301 --- /dev/null +++ b/vendor/cmark-gfm/extensions/cmark-gfm-extensions_export.h @@ -0,0 +1,2 @@ +#define CMARK_GFM_EXTENSIONS_EXPORT +#define CMARK_GFM_EXTENSIONS_NO_EXPORT diff --git a/vendor/cmark-gfm/src/cmark-gfm_export.h b/vendor/cmark-gfm/src/cmark-gfm_export.h new file mode 100644 index 0000000..f0c6edc --- /dev/null +++ b/vendor/cmark-gfm/src/cmark-gfm_export.h @@ -0,0 +1,2 @@ +#define CMARK_GFM_EXPORT +#define CMARK_GFM_NO_EXPORT \ No newline at end of file diff --git a/vendor/cmark-gfm/src/cmark-gfm_version.h b/vendor/cmark-gfm/src/cmark-gfm_version.h new file mode 100644 index 0000000..bad8a9e --- /dev/null +++ b/vendor/cmark-gfm/src/cmark-gfm_version.h @@ -0,0 +1,2 @@ +#define CMARK_GFM_VERSION ((0 << 24) | (28 << 16) | (3 << 8) | 19) +#define CMARK_GFM_VERSION_STRING "0.28.3.gfm.19"