From 2e890580fc3f0c02b5611c14111ff3079df70d55 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Wed, 8 Jun 2016 10:13:31 -0700 Subject: Stop shipping pre-build man pages since it violates Debian arcane rule #134931e+26 and add manpages build target. --- debian/changelog | 5 +++++ debian/compat | 1 + debian/control | 18 ++++++++++++++++++ debian/copyright | 0 debian/format | 1 + debian/rules | 3 +++ doc/README.md | 2 +- doc/build.sh | 11 ++++++++--- make-linux.mk | 10 ++++++++-- 9 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/format create mode 100644 debian/rules diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 00000000..668dbbfd --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +zerotier-one (1.1.5) UNRELEASED; urgency=medium + + * Initial release. (Closes: #XXXXXX) + + -- root Wed, 08 Jun 2016 10:05:01 -0700 diff --git a/debian/compat b/debian/compat new file mode 100644 index 00000000..f11c82a4 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 \ No newline at end of file diff --git a/debian/control b/debian/control new file mode 100644 index 00000000..61c179e9 --- /dev/null +++ b/debian/control @@ -0,0 +1,18 @@ +Source: zerotier-one +Maintainer: Adam Ierymenko +Section: net +Priority: optional +Standards-Version: 3.9.2 +Build-Depends: debhelper (>= 9), nodejs (>= 0.10.0), libhttp-parser-dev (>= 2.1), liblz4-dev, npm (>= 1.4.0) +Vcs-Git: git://github.com/zerotier/ZeroTierOne +Vcs-Browser: https://github.com/zerotier/ZeroTierOne +Homepage: https://www.zerotier.com/ + +Package: zerotier-one +Architecture: any +Depends: +Description: ZeroTier network virtualization service + ZeroTier One lets you join ZeroTier virtual networks and + have them appear as tun/tap ports on your system. See + https://www.zerotier.com/ for instructions and + documentation. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 00000000..e69de29b diff --git a/debian/format b/debian/format new file mode 100644 index 00000000..46ebe026 --- /dev/null +++ b/debian/format @@ -0,0 +1 @@ +3.0 (quilt) \ No newline at end of file diff --git a/debian/rules b/debian/rules new file mode 100644 index 00000000..cbe925d7 --- /dev/null +++ b/debian/rules @@ -0,0 +1,3 @@ +#!/usr/bin/make -f +%: + dh $@ diff --git a/doc/README.md b/doc/README.md index 2b87217d..c82b5492 100644 --- a/doc/README.md +++ b/doc/README.md @@ -1,4 +1,4 @@ Manual Pages and Other Documentation ===== -To build the Linux/Unix manual pages type "./build.sh." You'll need NodeJS since if it's not here already the build script will pull [marked-man](https://github.com/kapouer/marked-man), which is a MarkDown to ROFF/man converter. We pre-build and ship the compiled man pages, so running build.sh is not essential unless the source MarkDown files have changed. +Use "./build.sh" to build the manual pages. You'll need NodeJS and npm installed. diff --git a/doc/build.sh b/doc/build.sh index 06d95212..f77808c6 100755 --- a/doc/build.sh +++ b/doc/build.sh @@ -14,8 +14,13 @@ fi rm -f *.1 *.8 -node_modules/marked-man/bin/marked-man zerotier-cli.1.md >zerotier-cli.1 -node_modules/marked-man/bin/marked-man zerotier-idtool.1.md >zerotier-idtool.1 -node_modules/marked-man/bin/marked-man zerotier-one.8.md >zerotier-one.8 +NODE=/usr/bin/node +if [ -e /usr/bin/nodejs ]; then + NODE=/usr/bin/nodejs +fi + +$NODE node_modules/marked-man/bin/marked-man zerotier-cli.1.md >zerotier-cli.1 +$NODE node_modules/marked-man/bin/marked-man zerotier-idtool.1.md >zerotier-idtool.1 +$NODE node_modules/marked-man/bin/marked-man zerotier-one.8.md >zerotier-one.8 exit 0 diff --git a/make-linux.mk b/make-linux.mk index 8a7f3b14..1803a08a 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -114,7 +114,7 @@ endif #LDFLAGS= #STRIP=echo -all: one +all: one manpages one: $(OBJS) service/OneService.o one.o osdep/LinuxEthernetTap.o $(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-one $(OBJS) service/OneService.o one.o osdep/LinuxEthernetTap.o $(LDLIBS) @@ -138,11 +138,17 @@ selftest: $(OBJS) selftest.o $(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-selftest selftest.o $(OBJS) $(LDLIBS) $(STRIP) zerotier-selftest +manpages: FORCE + cd doc ; ./build.sh + clean: FORCE - rm -rf *.so *.o netcon/*.a 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 zerotier-netcon-service build-* ZeroTierOneInstaller-* *.deb *.rpm .depend netcon/.depend doc/node_modules + rm -rf *.so *.o netcon/*.a 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 zerotier-netcon-service build-* ZeroTierOneInstaller-* *.deb *.rpm .depend netcon/.depend doc/*.1 doc/*.2 doc/*.8 find netcon -type f \( -name '*.o' -o -name '*.so' -o -name '*.1.0' -o -name 'zerotier-one' -o -name 'zerotier-cli' -o -name 'zerotier-netcon-service' \) -delete find netcon/docker-test -name "zerotier-intercept" -type f -delete +distclean: clean + rm -rf doc/node_modules + debug: FORCE make ZT_DEBUG=1 one make ZT_DEBUG=1 selftest -- cgit v1.2.3