diff options
| author | Grant Limberg <[email protected]> | 2019-11-21 15:12:37 -0800 |
|---|---|---|
| committer | Grant Limberg <[email protected]> | 2019-11-21 15:12:37 -0800 |
| commit | a993ddc54dd9b301ea3ec8199a82f1346d0c0291 (patch) | |
| tree | 68f2c033ad1f942bc818c1f396dbdde2a5d9d21e /make-mac.mk | |
| parent | bad95d7c675f04aa10773d46901d65342382c03c (diff) | |
| parent | 54e25084feb1d5994650d3e104c56e8de48ce3f9 (diff) | |
Merge branch 'refs/heads/master' into dev
Diffstat (limited to 'make-mac.mk')
| -rw-r--r-- | make-mac.mk | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/make-mac.mk b/make-mac.mk index 1fe2d7a4..1f101ff2 100644 --- a/make-mac.mk +++ b/make-mac.mk @@ -18,14 +18,18 @@ ZT_VERSION_MINOR=$(shell cat version.h | grep -F VERSION_MINOR | cut -d ' ' -f 3 ZT_VERSION_REV=$(shell cat version.h | grep -F VERSION_REVISION | cut -d ' ' -f 3) ZT_VERSION_BUILD=$(shell cat version.h | grep -F VERSION_BUILD | cut -d ' ' -f 3) +# for central controller builds +TIMESTAMP=$(shell date +"%Y%m%d%H%M") + DEFS+=-DZT_BUILD_PLATFORM=$(ZT_BUILD_PLATFORM) -DZT_BUILD_ARCHITECTURE=$(ZT_BUILD_ARCHITECTURE) include objects.mk ONE_OBJS+=osdep/MacEthernetTap.o osdep/MacKextEthernetTap.o ext/http-parser/http_parser.o ifeq ($(ZT_CONTROLLER),1) - LIBS+=-lpq -lrabbitmq + LIBS+=-L/usr/local/opt/libpq/lib -lpq -Lext/librabbitmq/macos/lib -lrabbitmq DEFS+=-DZT_CONTROLLER_USE_LIBPQ -DZT_CONTROLLER + INCLUDES+=-Iext/librabbitmq/macos/include -I/usr/local/opt/libpq/include endif # Official releases are signed with our Apple cert and apply software updates by default @@ -145,6 +149,9 @@ official: FORCE make ZT_OFFICIAL_RELEASE=1 macui make ZT_OFFICIAL_RELEASE=1 mac-dist-pkg +central-controller-docker: FORCE + docker build -t docker.zerotier.com/zerotier-central/ztcentral-controller:${TIMESTAMP} -f ext/central-controller-docker/Dockerfile --build-arg git_branch=$(shell git name-rev --name-only HEAD) . + clean: rm -rf MacEthernetTapAgent *.dSYM build-* *.a *.pkg *.dmg *.o node/*.o controller/*.o service/*.o osdep/*.o ext/http-parser/*.o $(CORE_OBJS) $(ONE_OBJS) zerotier-one zerotier-idtool zerotier-selftest zerotier-cli zerotier doc/node_modules macui/build zt1_update_$(ZT_BUILD_PLATFORM)_$(ZT_BUILD_ARCHITECTURE)_* |