switch to github homepage

diff --git a/Makefile.am b/Makefile.am
index e8a7ffdd718bb908bffa9d47b4741987859401ee..0178fbb8193e3bb91ba2b062d9021cb61bd7fd8f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -111,15 +111,20 @@ check-doc-dist:
        ! man --warnings ./*.1 2>&1 | grep ': warning'
 
 release:
-       @if test -z "$(USER)" || test -z "$(KEYID)"; then \
+       @if test -z "$(KEYID)"; then \
                echo "Try this instead:"; \
-               echo "  make release USER=[GOOGLEUSERNAME] KEYID=[PGPKEYID]"; \
+               echo "  make release KEYID=[PGPKEYID]"; \
                echo "For example:"; \
-               echo "  make release USER=simonyubico@gmail.com KEYID=2117364A"; \
+               echo "  make release KEYID=2117364A"; \
                exit 1; \
        fi
        @head -3 $(srcdir)/NEWS | grep -q "Version $(VERSION) .released `date -I`" || \
                (echo 'error: You need to update date/version in $(srcdir)/NEWS, see doc/MakeRelease.wiki.'; exit 1)
+       @if test ! -d $(YUBICO_GITHUB_REPO); then \
+               echo "yubico.github.com repo not found!"; \
+               echo "Make sure that YUBICO_GITHUB_REPO is set"; \
+               exit 1; \
+       fi
        rm -f $(srcdir)/ChangeLog
        make check-doc-dist ChangeLog distcheck
        gpg --detach-sign --default-key $(KEYID) $(PACKAGE)-$(VERSION).tar.gz
@@ -127,11 +132,4 @@ release:
        cd $(srcdir) && git push
        cd $(srcdir) && git tag -u $(KEYID)! -m $(VERSION) v$(VERSION)
        cd $(srcdir) && git push --tags
-       mkdir -p ../releases/$(PACKAGE)/ && \
-               cp -v $(PACKAGE)-$(VERSION).tar.gz* ../releases/$(PACKAGE)/
-       googlecode_upload.py -s "OpenPGP signature for $(PACKAGE) $(VERSION)." \
-        -p $(PROJECT) -u $(USER) $(PACKAGE)-$(VERSION).tar.gz.sig \
-        -l OpSys-All
-       googlecode_upload.py -s "$(PACKAGE) $(VERSION)" \
-        -p $(PROJECT) -u $(USER) $(PACKAGE)-$(VERSION).tar.gz \
-        -l OpSys-All,Type-Source
+       $(YUBICO_GITHUB_REPO)/publish $(PROJECT) $(VERSION) $(PACKAGE)-$(VERSION).tar.gz*

diff --git a/ykpers4mac.mk b/ykpers4mac.mk
index 8a0c2863ce69209e1b4ce1990d0f31df1483bc65..b0a8ba1b2f11181a2019b92a7923bf831df9b384 100644 (file)
--- a/ykpers4mac.mk
+++ b/ykpers4mac.mk
@@ -36,11 +36,11 @@ all: usage ykpers4mac
 
 .PHONY: usage
 usage:
-       @if test -z "$(USER)" || test -z "$(VERSION)" || test -z "$(PGPKEYID)"; then \
+       @if test test -z "$(VERSION)" || test -z "$(PGPKEYID)"; then \
                echo "Try this instead:"; \
-               echo "  make USER=[GOOGLEUSERNAME] PGPKEYID=[PGPKEYID] VERSION=[VERSION]"; \
+               echo "  make PGPKEYID=[PGPKEYID] VERSION=[VERSION]"; \
                echo "For example:"; \
-               echo "  make USER=simonyubico@gmail.com PGPKEYID=2117364A VERSION=1.6.0"; \
+               echo "  make PGPKEYID=2117364A VERSION=1.6.0"; \
                exit 1; \
        fi
 
@@ -89,14 +89,12 @@ ykpers4mac:
        zip -r ../../ykpers-$(VERSION)-mac.zip *
 
 upload-ykpers4mac:
+       @if test ! -d $(YUBICO_GITHUB_REPO); then \
+               echo "yubico.github.com repo not found!"; \
+               echo "Make sure that YUBICO_GITHUB_REPO is set"; \
+               exit 1; \
+       fi
        gpg --detach-sign --default-key $(PGPKEYID) \
                $(PACKAGE)-$(VERSION)-mac.zip
        gpg --verify $(PACKAGE)-$(VERSION)-mac.zip.sig
-       googlecode_upload.py \
-        -s "OpenPGP signature for $(PACKAGE)-$(VERSION)-mac.zip." \
-        -p $(PROJECT) -u $(USER) $(PACKAGE)-$(VERSION)-mac.zip.sig \
-        -l OpSys-OSX
-       googlecode_upload.py \
-        -s "OS-X binaries of $(PACKAGE) $(VERSION)" \
-        -p $(PROJECT) -u $(USER) $(PACKAGE)-$(VERSION)-mac.zip \
-        -l OpSys-OSX,Type-Executable
+       $(YUBICO_GITHUB_REPO)/publish $(PROJECT) $(VERSION) $(PACKAGE)-$(VERSION)-mac.zip*

diff --git a/ykpers4win.mk b/ykpers4win.mk
index d09dfca555a1192d8d21ed2716649c251348306a..1ebc5b26247f4c1ec81055361d840090833e9af5 100644 (file)
--- a/ykpers4win.mk
+++ b/ykpers4win.mk
@@ -35,11 +35,11 @@ all: usage ykpers4win32 ykpers4win64
 
 .PHONY: usage
 usage:
-       @if test -z "$(USER)" || test -z "$(VERSION)" || test -z "$(PGPKEYID)"; then \
+       @if test test -z "$(VERSION)" || test -z "$(PGPKEYID)"; then \
                echo "Try this instead:"; \
-               echo "  make USER=[GOOGLEUSERNAME] PGPKEYID=[PGPKEYID] VERSION=[VERSION]"; \
+               echo "  make PGPKEYID=[PGPKEYID] VERSION=[VERSION]"; \
                echo "For example:"; \
-               echo "  make USER=simonyubico@gmail.com PGPKEYID=2117364A VERSION=1.6.0"; \
+               echo "  make PGPKEYID=2117364A VERSION=1.6.0"; \
                exit 1; \
        fi
 
@@ -83,17 +83,15 @@ ykpers4win32mingw32:
        $(MAKE) -f ykpers4win.mk ykpers4win ARCH=32 HOST=i586-mingw32msvc CHECK=check CC=i586-mingw32msvc-gcc CFLAGS=-I/usr/i586-mingw32msvc/include/ddk/
 
 upload-ykpers4win:
+       @if test ! -d $(YUBICO_GITHUB_REPO); then \
+               echo "yubico.github.com repo not found!"; \
+               echo "Make sure that YUBICO_GITHUB_REPO is set"; \
+               exit 1; \
+       fi
        gpg --detach-sign --default-key $(PGPKEYID) \
                $(PACKAGE)-$(VERSION)-win$(BITS).zip
        gpg --verify $(PACKAGE)-$(VERSION)-win$(BITS).zip.sig
-       googlecode_upload.py \
-        -s "OpenPGP signature for $(PACKAGE)-$(VERSION)-win$(BITS).zip." \
-        -p $(PROJECT) -u $(USER) $(PACKAGE)-$(VERSION)-win$(BITS).zip.sig \
-        -l OpSys-Windows
-       googlecode_upload.py \
-        -s "Windows $(BITS)-bit binaries of $(PACKAGE) $(VERSION)" \
-        -p $(PROJECT) -u $(USER) $(PACKAGE)-$(VERSION)-win$(BITS).zip \
-        -l OpSys-Windows,Type-Executable
+       $(YUBICO_GITHUB_REPO)/publish $(PROJECT) $(VERSION) $(PACKAGE)-$(VERSION)-mac.zip*
 
 upload-ykpers4win32:
        $(MAKE) -f ykpers4win.mk upload-ykpers4win BITS=32