From 198409a8b516e3a04df2acf55e0ee7e11454b6d6 Mon Sep 17 00:00:00 2001 From: Justus Winter <4winter@informatik.uni-hamburg.de> Date: Mon, 30 Apr 2012 21:55:43 +0200 Subject: [PATCH] [PATCH 4/5] go: update the build system --- d3/18f6d58d0cb0bb101716a0af557c98a2ee52a8 | 178 ++++++++++++++++++++++ 1 file changed, 178 insertions(+) create mode 100644 d3/18f6d58d0cb0bb101716a0af557c98a2ee52a8 diff --git a/d3/18f6d58d0cb0bb101716a0af557c98a2ee52a8 b/d3/18f6d58d0cb0bb101716a0af557c98a2ee52a8 new file mode 100644 index 000000000..fa39a998f --- /dev/null +++ b/d3/18f6d58d0cb0bb101716a0af557c98a2ee52a8 @@ -0,0 +1,178 @@ +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 AEFB2431FAF + for ; Mon, 30 Apr 2012 12:57:10 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + 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 KnjuIgGNuu2a for ; + Mon, 30 Apr 2012 12:57:08 -0700 (PDT) +Received: from mail.cryptobitch.de (cryptobitch.de [88.198.7.68]) + (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 1E254429E49 + for ; Mon, 30 Apr 2012 12:56:47 -0700 (PDT) +Received: from mail.jade-hamburg.de (mail.jade-hamburg.de [85.183.11.228]) + (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) + (No client certificate requested) + by mail.cryptobitch.de (Postfix) with ESMTPSA id 853E9584BA3 + for ; Mon, 30 Apr 2012 21:56:45 +0200 (CEST) +Received: by mail.jade-hamburg.de (Postfix, from userid 401) + id 07EBADF2A2; Mon, 30 Apr 2012 21:56:45 +0200 (CEST) +Received: from thinkbox.jade-hamburg.de (unknown [10.1.1.153]) + (using TLSv1 with cipher AES256-SHA (256/256 bits)) + (No client certificate requested) (Authenticated sender: teythoon) + by mail.jade-hamburg.de (Postfix) with ESMTPSA id A6306DF2A5; + Mon, 30 Apr 2012 21:55:53 +0200 (CEST) +Received: from teythoon by thinkbox.jade-hamburg.de with local (Exim 4.77) + (envelope-from ) + id 1SOwhM-0003ys-8E; Mon, 30 Apr 2012 21:55:52 +0200 +From: Justus Winter <4winter@informatik.uni-hamburg.de> +To: notmuch@notmuchmail.org +Subject: [PATCH 4/5] go: update the build system +Date: Mon, 30 Apr 2012 21:55:43 +0200 +Message-Id: + <1335815744-15258-4-git-send-email-4winter@informatik.uni-hamburg.de> +X-Mailer: git-send-email 1.7.10 +In-Reply-To: + <1335815744-15258-1-git-send-email-4winter@informatik.uni-hamburg.de> +References: <20120430195420.2528.48612@thinkbox.jade-hamburg.de> + <1335815744-15258-1-git-send-email-4winter@informatik.uni-hamburg.de> +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, 30 Apr 2012 19:57:11 -0000 + +Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de> +--- + bindings/go/Makefile | 51 ++++++++++++++++++++++++++------------------- + bindings/go/cmds/Makefile | 11 ---------- + bindings/go/pkg/Makefile | 17 --------------- + 3 files changed, 30 insertions(+), 49 deletions(-) + delete mode 100644 bindings/go/cmds/Makefile + delete mode 100644 bindings/go/pkg/Makefile + +diff --git a/bindings/go/Makefile b/bindings/go/Makefile +index aba2d59..c9a8dba 100644 +--- a/bindings/go/Makefile ++++ b/bindings/go/Makefile +@@ -1,30 +1,39 @@ +-# Copyright 2009 The Go Authors. All rights reserved. +-# Use of this source code is governed by a BSD-style +-# license that can be found in the LICENSE file. ++# Makefile for the go bindings of notmuch + +-include ${GOROOT}/src/Make.inc ++GOPATH ?= $(shell pwd) ++export GOPATH + +-all: install ++GO ?= go ++GOFMT ?= gofmt + +-DIRS=\ +- pkg\ +- cmds\ ++all: notmuch notmuch-addrlookup + ++.PHONY: notmuch ++notmuch: ++ $(GO) install notmuch + +-clean.dirs: $(addsuffix .clean, $(DIRS)) +-install.dirs: $(addsuffix .install, $(DIRS)) +-nuke.dirs: $(addsuffix .nuke, $(DIRS)) +-test.dirs: $(addsuffix .test, $(TEST)) +-bench.dirs: $(addsuffix .bench, $(BENCH)) ++.PHONY: goconfig ++goconfig: ++ if [ ! -d src/github.com/kless/goconfig/config ]; then \ ++ $(GO) get github.com/kless/goconfig/config; \ ++ fi + +-%.clean: +- +cd $* && $(QUOTED_GOBIN)/gomake clean ++.PHONY: notmuch-addrlookup ++notmuch-addrlookup: notmuch goconfig ++ $(GO) install notmuch-addrlookup + +-%.install: +- +cd $* && $(QUOTED_GOBIN)/gomake install ++.PHONY: format ++format: ++ $(GOFMT) -w=true $(GOFMT_OPTS) src/notmuch ++ $(GOFMT) -w=true $(GOFMT_OPTS) src/notmuch-addrlookup + +-clean: clean.dirs ++.PHONY: check-format ++check-format: ++ $(GOFMT) -d=true $(GOFMT_OPTS) src/notmuch ++ $(GOFMT) -d=true $(GOFMT_OPTS) src/notmuch-addrlookup + +-install: install.dirs +- +-#-include ${GOROOT}/src/Make.deps ++.PHONY: clean ++clean: ++ $(GO) clean notmuch ++ $(GO) clean notmuch-addrlookup ++ rm -rf pkg bin +diff --git a/bindings/go/cmds/Makefile b/bindings/go/cmds/Makefile +deleted file mode 100644 +index afbc6d2..0000000 +--- a/bindings/go/cmds/Makefile ++++ /dev/null +@@ -1,11 +0,0 @@ +-# Copyright 2009 The Go Authors. All rights reserved. +-# Use of this source code is governed by a BSD-style +-# license that can be found in the LICENSE file. +- +-include ${GOROOT}/src/Make.inc +- +-TARG=notmuch-addrlookup +-GOFILES=\ +- notmuch-addrlookup.go +- +-include ${GOROOT}/src/Make.cmd +diff --git a/bindings/go/pkg/Makefile b/bindings/go/pkg/Makefile +deleted file mode 100644 +index de89dbc..0000000 +--- a/bindings/go/pkg/Makefile ++++ /dev/null +@@ -1,17 +0,0 @@ +-# Copyright 2009 The Go Authors. All rights reserved. +-# Use of this source code is governed by a BSD-style +-# license that can be found in the LICENSE file. +- +-include $(GOROOT)/src/Make.inc +- +-TARG=notmuch +-CGOFILES=notmuch.go +-CGO_LDFLAGS=-lnotmuch +- +-CLEANFILES+=notmuch_test +- +-include $(GOROOT)/src/Make.pkg +- +-%: install %.go +- $(GC) $*.go +- $(LD) -o $@ $*.$O +-- +1.7.10 + -- 2.26.2