From c42280657a322b0daac8352ae35c90f2df58dc1c Mon Sep 17 00:00:00 2001 From: drebs Date: Sat, 12 Oct 2013 07:50:23 -0300 Subject: Enable detached ascii sig for SHA256SUMS. --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7d23b14..19eef87 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ $(TARGET): clean cp -r $(PREFIX)/{$(FILES_TO_PACKAGE)} $(TEMPDIR)/ (cd $(TEMPDIR) && zip -r $(TARGET) ./) rm -rf $(TEMPDIR) - (cd build/ && sha512sum $(PKGNAME) > SHA512SUMS && gpg --default-key $(DEFAULTKEY) --sign SHA512SUMS) + (cd build/ && sha512sum $(PKGNAME) > SHA512SUMS && gpg -a --default-key $(DEFAULTKEY) --detach-sign SHA512SUMS) signed: clean mkdir -p $(TEMPDIR) @@ -51,12 +51,13 @@ signed: clean signtool -d $(CERTDIR) -k $(CERTNAME) $(TEMPDIR)/ (cd $(TEMPDIR) && zip $(TARGET) ./$(RSA_FILE) && zip -r -D $(TARGET) ./ -x ./$(RSA_FILE)) rm -rf $(TEMPDIR) - (cd build/ && sha512sum $(PKGNAME) > SHA512SUMS && gpg --default-key $(DEFAULTKEY) --sign SHA512SUMS) + (cd build/ && sha512sum $(PKGNAME) > SHA512SUMS && gpg -a --default-key $(DEFAULTKEY) --detach-sign SHA512SUMS) clean: rm -f $(TARGET) build/* upload: - scp build/* downloads.leap.se:~/public/thunderbird_extension/ + ssh downloads.leap.se rm -rf /var/www/leap-downloads/public/thunderbird_extension/* + scp build/* downloads.leap.se:/var/www/leap-downloads/public/thunderbird_extension/ .PHONY: all clean signed -- cgit v1.2.3 From c66cae355c80acd0f5f3fbdbf3d440d0c283536c Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 11 Oct 2013 13:26:03 -0300 Subject: modify makefile to use template --- Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) mode change 100644 => 100755 Makefile (limited to 'Makefile') diff --git a/Makefile b/Makefile old mode 100644 new mode 100755 index 19eef87..9e2a530 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ RSA_FILE := META-INF/zigbert.rsa # the following variables are updated automatically COMMIT := $(shell git --no-pager log -1 --format=format:%h) -VERSION := $(shell grep \ $(PREFIX)/install.rdf | sed -e s/[^\>]\\\+\>// -e s/\<[^\>]\\\+\>//) +VERSION = $(shell head -n1 Changelog | sed -e 's/^.*(//' -e 's/).*$$//') PKGNAME := $(EXTNAME)-$(VERSION)-$(COMMIT).xpi TARGET := $(CURDIR)/build/$(PKGNAME) TEMPDIR := $(shell mktemp -d -u) @@ -33,6 +33,7 @@ endif endif endif + # main rule all: clean $(TARGET) @@ -55,9 +56,16 @@ signed: clean clean: rm -f $(TARGET) build/* + rm -f install.rdf upload: ssh downloads.leap.se rm -rf /var/www/leap-downloads/public/thunderbird_extension/* scp build/* downloads.leap.se:/var/www/leap-downloads/public/thunderbird_extension/ +debian-package: + git buildpackage -us -uc + +install.rdf: install.rdf.template Changelog + sed 's/__VERSION__/$(VERSION)/' < $< > $@ + .PHONY: all clean signed -- cgit v1.2.3 From b5f91e386b337afb674f583d7f31afd9a065052d Mon Sep 17 00:00:00 2001 From: drebs Date: Thu, 31 Oct 2013 13:15:45 -0200 Subject: Fix makefile and install.rdf template. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9e2a530..6b63456 100755 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ all: clean $(TARGET) # main target: .xpi file -$(TARGET): clean +$(TARGET): clean install.rdf mkdir -p $(TEMPDIR) cp -r $(PREFIX)/{$(FILES_TO_PACKAGE)} $(TEMPDIR)/ (cd $(TEMPDIR) && zip -r $(TARGET) ./) @@ -66,6 +66,6 @@ debian-package: git buildpackage -us -uc install.rdf: install.rdf.template Changelog - sed 's/__VERSION__/$(VERSION)/' < $< > $@ + sed 's/__VERSION__/$(VERSION)/' < $< > $@ .PHONY: all clean signed -- cgit v1.2.3 From 18578e925108d6af5c5de320fbe1fcec8a3748c6 Mon Sep 17 00:00:00 2001 From: drebs Date: Mon, 4 Nov 2013 15:33:54 -0200 Subject: Fix items from mozilla review. Closes #4374. --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 6b63456..fb59643 100755 --- a/Makefile +++ b/Makefile @@ -41,14 +41,18 @@ all: clean $(TARGET) $(TARGET): clean install.rdf mkdir -p $(TEMPDIR) + mkdir -p `dirname $@` cp -r $(PREFIX)/{$(FILES_TO_PACKAGE)} $(TEMPDIR)/ + rm -rf $(TEMPDIR)/.gitignore (cd $(TEMPDIR) && zip -r $(TARGET) ./) rm -rf $(TEMPDIR) (cd build/ && sha512sum $(PKGNAME) > SHA512SUMS && gpg -a --default-key $(DEFAULTKEY) --detach-sign SHA512SUMS) signed: clean mkdir -p $(TEMPDIR) + mkdir -p `dirname $@` cp -r $(PREFIX)/{$(FILES_TO_PACKAGE)} $(TEMPDIR)/ + rm -rf $(TEMPDIR)/.gitignore signtool -d $(CERTDIR) -k $(CERTNAME) $(TEMPDIR)/ (cd $(TEMPDIR) && zip $(TARGET) ./$(RSA_FILE) && zip -r -D $(TARGET) ./ -x ./$(RSA_FILE)) rm -rf $(TEMPDIR) -- cgit v1.2.3