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 --- Changelog | 5 +++++ Makefile | 10 ++++++++- install.rdf | 39 ---------------------------------- install.rdf.template | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 73 insertions(+), 40 deletions(-) create mode 100644 Changelog mode change 100644 => 100755 Makefile delete mode 100644 install.rdf create mode 100644 install.rdf.template diff --git a/Changelog b/Changelog new file mode 100644 index 0000000..820d3e4 --- /dev/null +++ b/Changelog @@ -0,0 +1,5 @@ +xul-ext-bitmask (0.0.1); upstream; + + * first release. + + -- drebs Fri, 11 Oct 2013 12:49:30 -0300 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 diff --git a/install.rdf b/install.rdf deleted file mode 100644 index 3da4a74..0000000 --- a/install.rdf +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - bitmask-thunderbird@leap.se - Bitmask Thunderbird Extension - 0.0.1 - LEAP developers - - - - {3550f703-e582-4d05-9a08-453d09bdfdc6} - 24.0 - 24.0.* - - - - - diff --git a/install.rdf.template b/install.rdf.template new file mode 100644 index 0000000..378b212 --- /dev/null +++ b/install.rdf.template @@ -0,0 +1,59 @@ + + + + + + + + bitmask-thunderbird@leap.se + Bitmask Thunderbird Extension + __VERSION__ + LEAP developers + + + + {3550f703-e582-4d05-9a08-453d09bdfdc6} + 24.0 + 24.0.* + + + + + + en-US + Bitmask + Configure Bitmask encrypted mail accounts. + + The LEAP Encryption Access Project + + + + es-ES + Bitmask + Configura cuentas Bitmask de correo cifrado. + + El projecto LEAP, Encryption Access Project + + + + + -- cgit v1.2.3