added tests to keytrans add and revoke user ID functionality

[monkeysphere.git] / Makefile

diff --git a/Makefile b/Makefile
index 07e8fb972825f1cc36246f127d217ac3fd3a06f0..7db62e4f3d0fda22d62cfb2a27182d6a136aeb3a 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,9 @@ tarball: clean
        mkdir -p monkeysphere-$(MONKEYSPHERE_VERSION)/doc
        ln -s ../../website/getting-started-user.mdwn ../../website/getting-started-admin.mdwn ../../doc/TODO ../../doc/MonkeySpec monkeysphere-$(MONKEYSPHERE_VERSION)/doc
        ln -s ../COPYING ../etc ../Makefile ../man ../src ../tests monkeysphere-$(MONKEYSPHERE_VERSION)
-       echo $(MONKEYSPHERE_VERSION) > monkeysphere-$(MONKEYSPHERE_VERSION)/VERSION
+       echo Monkeysphere $(MONKEYSPHERE_VERSION) > monkeysphere-$(MONKEYSPHERE_VERSION)/VERSION
+       echo -n "git revision " >> monkeysphere-$(MONKEYSPHERE_VERSION)/VERSION
+       git rev-parse HEAD >> monkeysphere-$(MONKEYSPHERE_VERSION)/VERSION
        tar -ch --exclude='*~' monkeysphere-$(MONKEYSPHERE_VERSION) | gzip -n > monkeysphere_$(MONKEYSPHERE_VERSION).orig.tar.gz
        rm -rf monkeysphere-$(MONKEYSPHERE_VERSION)
 
@@ -37,6 +39,9 @@ debian-package: tarball
 freebsd-distinfo: 
        ./utils/build-freebsd-distinfo
 
+macports-portfile:
+       ./utils/build-macports-portfile
+
 clean:
        # clean up old monkeysphere packages lying around as well.
        rm -f monkeysphere_*
@@ -52,6 +57,7 @@ install: all installman
        install src/monkeysphere $(DESTDIR)$(PREFIX)/bin
        install src/monkeysphere-host src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin
        install -m 0644 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere
+       install -m 0644 src/share/defaultenv $(DESTDIR)$(PREFIX)/share/monkeysphere
        install -m 0755 src/share/keytrans $(DESTDIR)$(PREFIX)/share/monkeysphere
        ln -s ../share/monkeysphere/keytrans $(DESTDIR)$(PREFIX)/bin/pem2openpgp
        ln -s ../share/monkeysphere/keytrans $(DESTDIR)$(PREFIX)/bin/openpgp2ssh
@@ -77,6 +83,7 @@ releasenote:
        ./utils/build-releasenote
 
 test:
-       ./tests/basic
+       MONKEYSPHERE_TEST_NO_EXAMINE=true ./tests/keytrans
+       MONKEYSPHERE_TEST_NO_EXAMINE=true ./tests/basic
 
 .PHONY: all tarball debian-package freebsd-distinfo clean install installman releasenote test