Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 3DC4C429E32 for ; Mon, 4 Jul 2011 05:04:00 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -2.3 X-Spam-Level: X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UUfNc3Vlab3H for ; Mon, 4 Jul 2011 05:03:59 -0700 (PDT) Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 23700429E2B for ; Mon, 4 Jul 2011 05:03:57 -0700 (PDT) Received: from zancas.localnet (fctnnbsc30w-142167177149.pppoe-dynamic.High-Speed.nb.bellaliant.net [142.167.177.149]) (authenticated bits=0) by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id p64C3s6j027963 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Mon, 4 Jul 2011 09:03:54 -0300 Received: from bremner by zancas.localnet with local (Exim 4.76) (envelope-from ) id 1QdhsX-0008Mk-Pm; Mon, 04 Jul 2011 09:03:53 -0300 From: david@tethera.net To: notmuch@notmuchmail.org Subject: [PATCH 2/6] build-system: remove calls to git-buildpackage and dput in release target. Date: Mon, 4 Jul 2011 09:03:37 -0300 Message-Id: <1309781021-32062-3-git-send-email-david@tethera.net> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1309781021-32062-1-git-send-email-david@tethera.net> References: <1309781021-32062-1-git-send-email-david@tethera.net> Cc: David Bremner X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jul 2011 12:04:00 -0000 From: David Bremner The removed code had the following issues: - It depends on the users git-buildpackage configuration to put the results in the correct place, so is fragile. - The tar file is overwritten in the next step, so copying it is not useful. - We should build the final version of the debian package in a chroot, using e.g. pbuilder or sbuild. I added a call to "make clean", so that we are sure the code is completely rebuilt before testing. --- Makefile.local | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/Makefile.local b/Makefile.local index 41feeb3..dea813c 100644 --- a/Makefile.local +++ b/Makefile.local @@ -87,18 +87,13 @@ dist: $(TAR_FILE) .PHONY: release release: verify-source-tree-and-version $(MAKE) VERSION=$(VERSION) verify-newer + $(MAKE) VERSION=$(VERSION) clean $(MAKE) VERSION=$(VERSION) test - rm -rf ./debian-build - git-buildpackage - cp debian-build/notmuch_$(VERSION).tar.gz notmuch-$(VERSION).tar.gz $(MAKE) VERSION=$(VERSION) $(GPG_FILE) scp $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR) ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(PACKAGE)-$(VERSION)" mkdir -p releases mv $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) releases - (cd debian-build; dput *.changes) - mv debian-build/* releases - rmdir debian-build git tag -s -m "$(PACKAGE) $(VERSION) release" $(VERSION) git push origin $(VERSION) $(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce -- 1.7.5.4