From 47d3ddcb320675911ec4e55eb5823ebbceeb3687 Mon Sep 17 00:00:00 2001
From: Patrick J Cherry <patrick@bytemark.co.uk>
Date: Mon, 20 Mar 2017 13:23:50 +0000
Subject: Revert "Strip out debian metadata"

This reverts commit 4d9ca84e57dad6746eb0882b91171ccd69298807.
---
 Makefile | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 52 insertions(+), 6 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 0ccfd8c..2254496 100644
--- a/Makefile
+++ b/Makefile
@@ -15,16 +15,62 @@ man/%.1: bin/%
 
 clean:
 	$(RM) -r man
+	# Theoretically this will clean up the shebang munging done by the openbsd_tarball task below.
+	if [ -e ./setup.rb ] ; then  \
+		ruby ./setup.rb distclean ; \
+		ruby ./setup.rb config    ; \
+		ruby ./setup.rb setup     ; \
+		ruby ./setup.rb clean ; \
+	fi
 	$(RM) -r tmp
+	$(RM) -r OpenBSD
+	$(RM) setup.rb
 	
-# NOP task to keep au happy
-release:
-	true
 
 distclean: clean
+	if [ -e ./setup.rb ] ; then ruby ./setup.rb distclean ; fi
+	$(RM) setup.rb
+	$(RM) -r OpenBSD
 
-test:
-	ruby -Ilib:test:. test/test_mauve.rb
+test: setup.rb
+	ruby ./setup.rb test
 
-.PHONY: all clean test distclean release
+setup.rb: /usr/lib/ruby/1.8/setup.rb
+	ln -sf /usr/lib/ruby/1.8/setup.rb .
+
+OpenBSD: OpenBSD/sha256.asc
+
+OpenBSD/sha256: OpenBSD/ruby-mauvealert.tar.gz OpenBSD/ruby-protobuf.tar.gz
+	#
+	# rejig sha256sum to openbsd sha256
+	# 
+	$(RM) OpenBSD/sha256
+	cd OpenBSD && sha256sum * | sed -e 's/\([^ ]\+\)  \(.*\)$$/SHA256 (\2) = \1/' > sha256
+
+OpenBSD/sha256.asc: OpenBSD/sha256
+	#
+	# Sign it.
+	#
+	gpg --clearsign OpenBSD/sha256
+
+OpenBSD/ruby-mauvealert.tar.gz: all setup.rb
+	mkdir -p tmp/ruby-mauvealert
+	ruby ./setup.rb config ${OPENBSD_SETUP_FLAGS}
+	ruby ./setup.rb setup
+	ruby ./setup.rb install --prefix=tmp/ruby-mauvealert
+	mkdir -p OpenBSD
+	tar -C tmp/ruby-mauvealert -czvf $@ .
+
+OpenBSD/ruby-protobuf.tar.gz:
+	mkdir -p tmp/ruby-protobuf-source
+	git clone https://github.com/macks/ruby-protobuf.git tmp/ruby-protobuf-source
+	cd tmp/ruby-protobuf-source && git checkout -b v0.4.5
+	ln -sf /usr/lib/ruby/1.8/setup.rb tmp/ruby-protobuf-source/
+	cd tmp/ruby-protobuf-source && ruby ./setup.rb config ${OPENBSD_SETUP_FLAGS} 
+	cd tmp/ruby-protobuf-source && ruby ./setup.rb setup
+	cd tmp/ruby-protobuf-source && ruby ./setup.rb install --prefix=../ruby-protobuf
+	mkdir -p OpenBSD
+	tar -C tmp/ruby-protobuf -czvf $@ .
+
+.PHONY: all clean openbsd_tarball test distclean OpenBSD
 
-- 
cgit v1.2.1


From 6d1c6bc1b8421fd4dba63ab55b08599965fd11f7 Mon Sep 17 00:00:00 2001
From: Patrick J Cherry <patrick@bytemark.co.uk>
Date: Thu, 22 Jun 2017 16:23:40 +0100
Subject: Use bundler to make manpages

---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 2254496..d8176f7 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,8 @@ man:
 	mkdir -p man
 
 man/%.1: bin/%
-	ruby -I lib $< --manual | txt2man -t $(notdir $<) -s 1  > $@
+	bundle exec $< --manual | txt2man -t $(notdir $<) -s 1  > $@
+	test -s $@
 
 clean:
 	$(RM) -r man
-- 
cgit v1.2.1


From 89f7cb1762a865d72827a024559018efc247e185 Mon Sep 17 00:00:00 2001
From: Patrick J Cherry <patrick@bytemark.co.uk>
Date: Tue, 1 Aug 2017 11:13:37 +0100
Subject: Removed more cruft. Updated debian/rules to use the Makefile. Updated
 bundle

---
 Makefile | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index d8176f7..a36e32b 100644
--- a/Makefile
+++ b/Makefile
@@ -4,40 +4,33 @@
 ##
 
 OPENBSD_SETUP_FLAGS = --prefix=/usr/local --installdirs=site --ruby-path=/usr/local/bin/ruby18 --mandir=\$$prefix/man/man1 --siteruby=\$$libdir/ruby/site_ruby --siterubyver=\$$siteruby/1.8
+BUNDLER_FLAGS ?= --path=vendor/bundle --jobs=4 --no-deployment
 
-all: man man/mauvesend.1 man/mauveserver.1 man/mauveconsole.1
+all: vendor/bundle man/mauvesend.1 man/mauveserver.1 man/mauveconsole.1 
 
 man:
 	mkdir -p man
 
-man/%.1: bin/%
+man/%.1: bin/% vendor/bundle man
 	bundle exec $< --manual | txt2man -t $(notdir $<) -s 1  > $@
 	test -s $@
 
 clean:
 	$(RM) -r man
-	# Theoretically this will clean up the shebang munging done by the openbsd_tarball task below.
-	if [ -e ./setup.rb ] ; then  \
-		ruby ./setup.rb distclean ; \
-		ruby ./setup.rb config    ; \
-		ruby ./setup.rb setup     ; \
-		ruby ./setup.rb clean ; \
-	fi
 	$(RM) -r tmp
-	$(RM) -r OpenBSD
-	$(RM) setup.rb
 	
-
 distclean: clean
-	if [ -e ./setup.rb ] ; then ruby ./setup.rb distclean ; fi
-	$(RM) setup.rb
 	$(RM) -r OpenBSD
+	$(RM) -r vendor/bundle
+
+vendor/bundle: Gemfile
+	@bundle install $(BUNDLER_FLAGS)
 
-test: setup.rb
-	ruby ./setup.rb test
+Gemfile.lock: Gemfile
+	@bundle update
 
-setup.rb: /usr/lib/ruby/1.8/setup.rb
-	ln -sf /usr/lib/ruby/1.8/setup.rb .
+test: vendor/bundle
+	@bundle exec rake test
 
 OpenBSD: OpenBSD/sha256.asc
 
-- 
cgit v1.2.1