From 6b5d6efe6c9d597c49b3fe57d6c40342b226556f Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Fri, 23 Dec 2016 14:33:04 -0800 Subject: [PATCH] Retire old build farm (something new is coming) and update makefile for linux to not auto-build doc. --- {linux-build-farm => attic/linux-build-farm}/README.md | 0 .../linux-build-farm}/amazon-2016.03/x64/Dockerfile | 0 {linux-build-farm => attic/linux-build-farm}/build.sh | 0 .../linux-build-farm}/centos-6/x64/Dockerfile | 0 .../linux-build-farm}/centos-6/x86/Dockerfile | 0 .../linux-build-farm}/centos-7/x64/Dockerfile | 0 .../linux-build-farm}/centos-7/x86/Dockerfile | 0 .../linux-build-farm}/debian-jessie/x64/Dockerfile | 0 .../linux-build-farm}/debian-jessie/x86/Dockerfile | 0 .../linux-build-farm}/debian-stretch/x64/Dockerfile | 0 .../linux-build-farm}/debian-stretch/x86/Dockerfile | 0 .../linux-build-farm}/debian-wheezy/x64/Dockerfile | 0 .../linux-build-farm}/debian-wheezy/x86/Dockerfile | 0 .../linux-build-farm}/fedora-22/x64/Dockerfile | 0 .../linux-build-farm}/fedora-22/x86/Dockerfile | 0 .../linux-build-farm}/make-apt-repos.sh | 0 .../linux-build-farm}/make-rpm-repos.sh | 0 .../other/zerotier-containerized/Dockerfile | 0 .../other/zerotier-containerized/main.sh | 0 .../linux-build-farm}/ubuntu-trusty/x64/Dockerfile | 0 .../linux-build-farm}/ubuntu-trusty/x86/Dockerfile | 0 .../linux-build-farm}/ubuntu-wily/x64/Dockerfile | 0 .../linux-build-farm}/ubuntu-wily/x86/Dockerfile | 0 .../linux-build-farm}/ubuntu-xenial/x64/Dockerfile | 0 .../linux-build-farm}/ubuntu-xenial/x86/Dockerfile | 0 make-linux.mk | 8 ++------ 26 files changed, 2 insertions(+), 6 deletions(-) rename {linux-build-farm => attic/linux-build-farm}/README.md (100%) rename {linux-build-farm => attic/linux-build-farm}/amazon-2016.03/x64/Dockerfile (100%) rename {linux-build-farm => attic/linux-build-farm}/build.sh (100%) rename {linux-build-farm => attic/linux-build-farm}/centos-6/x64/Dockerfile (100%) rename {linux-build-farm => attic/linux-build-farm}/centos-6/x86/Dockerfile (100%) rename {linux-build-farm => attic/linux-build-farm}/centos-7/x64/Dockerfile (100%) rename {linux-build-farm => attic/linux-build-farm}/centos-7/x86/Dockerfile (100%) rename {linux-build-farm => attic/linux-build-farm}/debian-jessie/x64/Dockerfile (100%) rename {linux-build-farm => attic/linux-build-farm}/debian-jessie/x86/Dockerfile (100%) rename {linux-build-farm => attic/linux-build-farm}/debian-stretch/x64/Dockerfile (100%) rename {linux-build-farm => attic/linux-build-farm}/debian-stretch/x86/Dockerfile (100%) rename {linux-build-farm => attic/linux-build-farm}/debian-wheezy/x64/Dockerfile (100%) rename {linux-build-farm => attic/linux-build-farm}/debian-wheezy/x86/Dockerfile (100%) rename {linux-build-farm => attic/linux-build-farm}/fedora-22/x64/Dockerfile (100%) rename {linux-build-farm => attic/linux-build-farm}/fedora-22/x86/Dockerfile (100%) rename {linux-build-farm => attic/linux-build-farm}/make-apt-repos.sh (100%) rename {linux-build-farm => attic/linux-build-farm}/make-rpm-repos.sh (100%) rename {linux-build-farm => attic/linux-build-farm}/other/zerotier-containerized/Dockerfile (100%) rename {linux-build-farm => attic/linux-build-farm}/other/zerotier-containerized/main.sh (100%) rename {linux-build-farm => attic/linux-build-farm}/ubuntu-trusty/x64/Dockerfile (100%) rename {linux-build-farm => attic/linux-build-farm}/ubuntu-trusty/x86/Dockerfile (100%) rename {linux-build-farm => attic/linux-build-farm}/ubuntu-wily/x64/Dockerfile (100%) rename {linux-build-farm => attic/linux-build-farm}/ubuntu-wily/x86/Dockerfile (100%) rename {linux-build-farm => attic/linux-build-farm}/ubuntu-xenial/x64/Dockerfile (100%) rename {linux-build-farm => attic/linux-build-farm}/ubuntu-xenial/x86/Dockerfile (100%) diff --git a/linux-build-farm/README.md b/attic/linux-build-farm/README.md similarity index 100% rename from linux-build-farm/README.md rename to attic/linux-build-farm/README.md diff --git a/linux-build-farm/amazon-2016.03/x64/Dockerfile b/attic/linux-build-farm/amazon-2016.03/x64/Dockerfile similarity index 100% rename from linux-build-farm/amazon-2016.03/x64/Dockerfile rename to attic/linux-build-farm/amazon-2016.03/x64/Dockerfile diff --git a/linux-build-farm/build.sh b/attic/linux-build-farm/build.sh similarity index 100% rename from linux-build-farm/build.sh rename to attic/linux-build-farm/build.sh diff --git a/linux-build-farm/centos-6/x64/Dockerfile b/attic/linux-build-farm/centos-6/x64/Dockerfile similarity index 100% rename from linux-build-farm/centos-6/x64/Dockerfile rename to attic/linux-build-farm/centos-6/x64/Dockerfile diff --git a/linux-build-farm/centos-6/x86/Dockerfile b/attic/linux-build-farm/centos-6/x86/Dockerfile similarity index 100% rename from linux-build-farm/centos-6/x86/Dockerfile rename to attic/linux-build-farm/centos-6/x86/Dockerfile diff --git a/linux-build-farm/centos-7/x64/Dockerfile b/attic/linux-build-farm/centos-7/x64/Dockerfile similarity index 100% rename from linux-build-farm/centos-7/x64/Dockerfile rename to attic/linux-build-farm/centos-7/x64/Dockerfile diff --git a/linux-build-farm/centos-7/x86/Dockerfile b/attic/linux-build-farm/centos-7/x86/Dockerfile similarity index 100% rename from linux-build-farm/centos-7/x86/Dockerfile rename to attic/linux-build-farm/centos-7/x86/Dockerfile diff --git a/linux-build-farm/debian-jessie/x64/Dockerfile b/attic/linux-build-farm/debian-jessie/x64/Dockerfile similarity index 100% rename from linux-build-farm/debian-jessie/x64/Dockerfile rename to attic/linux-build-farm/debian-jessie/x64/Dockerfile diff --git a/linux-build-farm/debian-jessie/x86/Dockerfile b/attic/linux-build-farm/debian-jessie/x86/Dockerfile similarity index 100% rename from linux-build-farm/debian-jessie/x86/Dockerfile rename to attic/linux-build-farm/debian-jessie/x86/Dockerfile diff --git a/linux-build-farm/debian-stretch/x64/Dockerfile b/attic/linux-build-farm/debian-stretch/x64/Dockerfile similarity index 100% rename from linux-build-farm/debian-stretch/x64/Dockerfile rename to attic/linux-build-farm/debian-stretch/x64/Dockerfile diff --git a/linux-build-farm/debian-stretch/x86/Dockerfile b/attic/linux-build-farm/debian-stretch/x86/Dockerfile similarity index 100% rename from linux-build-farm/debian-stretch/x86/Dockerfile rename to attic/linux-build-farm/debian-stretch/x86/Dockerfile diff --git a/linux-build-farm/debian-wheezy/x64/Dockerfile b/attic/linux-build-farm/debian-wheezy/x64/Dockerfile similarity index 100% rename from linux-build-farm/debian-wheezy/x64/Dockerfile rename to attic/linux-build-farm/debian-wheezy/x64/Dockerfile diff --git a/linux-build-farm/debian-wheezy/x86/Dockerfile b/attic/linux-build-farm/debian-wheezy/x86/Dockerfile similarity index 100% rename from linux-build-farm/debian-wheezy/x86/Dockerfile rename to attic/linux-build-farm/debian-wheezy/x86/Dockerfile diff --git a/linux-build-farm/fedora-22/x64/Dockerfile b/attic/linux-build-farm/fedora-22/x64/Dockerfile similarity index 100% rename from linux-build-farm/fedora-22/x64/Dockerfile rename to attic/linux-build-farm/fedora-22/x64/Dockerfile diff --git a/linux-build-farm/fedora-22/x86/Dockerfile b/attic/linux-build-farm/fedora-22/x86/Dockerfile similarity index 100% rename from linux-build-farm/fedora-22/x86/Dockerfile rename to attic/linux-build-farm/fedora-22/x86/Dockerfile diff --git a/linux-build-farm/make-apt-repos.sh b/attic/linux-build-farm/make-apt-repos.sh similarity index 100% rename from linux-build-farm/make-apt-repos.sh rename to attic/linux-build-farm/make-apt-repos.sh diff --git a/linux-build-farm/make-rpm-repos.sh b/attic/linux-build-farm/make-rpm-repos.sh similarity index 100% rename from linux-build-farm/make-rpm-repos.sh rename to attic/linux-build-farm/make-rpm-repos.sh diff --git a/linux-build-farm/other/zerotier-containerized/Dockerfile b/attic/linux-build-farm/other/zerotier-containerized/Dockerfile similarity index 100% rename from linux-build-farm/other/zerotier-containerized/Dockerfile rename to attic/linux-build-farm/other/zerotier-containerized/Dockerfile diff --git a/linux-build-farm/other/zerotier-containerized/main.sh b/attic/linux-build-farm/other/zerotier-containerized/main.sh similarity index 100% rename from linux-build-farm/other/zerotier-containerized/main.sh rename to attic/linux-build-farm/other/zerotier-containerized/main.sh diff --git a/linux-build-farm/ubuntu-trusty/x64/Dockerfile b/attic/linux-build-farm/ubuntu-trusty/x64/Dockerfile similarity index 100% rename from linux-build-farm/ubuntu-trusty/x64/Dockerfile rename to attic/linux-build-farm/ubuntu-trusty/x64/Dockerfile diff --git a/linux-build-farm/ubuntu-trusty/x86/Dockerfile b/attic/linux-build-farm/ubuntu-trusty/x86/Dockerfile similarity index 100% rename from linux-build-farm/ubuntu-trusty/x86/Dockerfile rename to attic/linux-build-farm/ubuntu-trusty/x86/Dockerfile diff --git a/linux-build-farm/ubuntu-wily/x64/Dockerfile b/attic/linux-build-farm/ubuntu-wily/x64/Dockerfile similarity index 100% rename from linux-build-farm/ubuntu-wily/x64/Dockerfile rename to attic/linux-build-farm/ubuntu-wily/x64/Dockerfile diff --git a/linux-build-farm/ubuntu-wily/x86/Dockerfile b/attic/linux-build-farm/ubuntu-wily/x86/Dockerfile similarity index 100% rename from linux-build-farm/ubuntu-wily/x86/Dockerfile rename to attic/linux-build-farm/ubuntu-wily/x86/Dockerfile diff --git a/linux-build-farm/ubuntu-xenial/x64/Dockerfile b/attic/linux-build-farm/ubuntu-xenial/x64/Dockerfile similarity index 100% rename from linux-build-farm/ubuntu-xenial/x64/Dockerfile rename to attic/linux-build-farm/ubuntu-xenial/x64/Dockerfile diff --git a/linux-build-farm/ubuntu-xenial/x86/Dockerfile b/attic/linux-build-farm/ubuntu-xenial/x86/Dockerfile similarity index 100% rename from linux-build-farm/ubuntu-xenial/x86/Dockerfile rename to attic/linux-build-farm/ubuntu-xenial/x86/Dockerfile diff --git a/make-linux.mk b/make-linux.mk index ceb97a8a5..ed8ec44bf 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -113,7 +113,7 @@ endif #LDFLAGS= #STRIP=echo -all: one manpages +all: one one: $(OBJS) service/OneService.o one.o osdep/LinuxEthernetTap.o osdep/LinuxDropPrivileges.o $(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-one $(OBJS) service/OneService.o one.o osdep/LinuxEthernetTap.o osdep/LinuxDropPrivileges.o $(LDLIBS) @@ -131,13 +131,9 @@ manpages: FORCE doc: manpages clean: FORCE - rm -rf *.so *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/lz4/*.o ext/json-parser/*.o ext/miniupnpc/*.o ext/libnatpmp/*.o $(OBJS) zerotier-one zerotier-idtool zerotier-cli zerotier-selftest build-* ZeroTierOneInstaller-* *.deb *.rpm .depend doc/*.1 doc/*.2 doc/*.8 debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one + rm -rf *.so *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/lz4/*.o ext/json-parser/*.o ext/miniupnpc/*.o ext/libnatpmp/*.o $(OBJS) zerotier-one zerotier-idtool zerotier-cli zerotier-selftest build-* ZeroTierOneInstaller-* *.deb *.rpm .depend debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one doc/node_modules distclean: clean - rm -rf doc/node_modules - find linux-build-farm -type f -name '*.deb' -print0 | xargs -0 rm -fv - find linux-build-farm -type f -name '*.rpm' -print0 | xargs -0 rm -fv - find linux-build-farm -type f -name 'zt1-src.tar.gz' | xargs rm -fv realclean: distclean