Use latest makexpi

2015-12-10 18:19:47 +09:00 · 2015-12-10 18:19:47 +09:00 · d06d5b5668
commit d06d5b5668
parent 17526f7940
5 changed files with 16 additions and 7 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,3 +1,6 @@
 [submodule "buildscript"]
 	path = buildscript
 	url = https://github.com/piroor/makexpi.git
+[submodule "makexpi"]
+	path = makexpi
+	url = https://github.com/piroor/makexpi.git
--- a/16
+++ b/16
@ -1,11 +1,17 @@
 PACKAGE_NAME = treestyletab

+.PHONY: all xpi signed clean
+
 all: xpi

-xpi: buildscript/makexpi.sh
-	cp buildscript/makexpi.sh ./
-	./makexpi.sh -n $(PACKAGE_NAME) -o
-	rm ./makexpi.sh
+xpi: makexpi/makexpi.sh
+	makexpi/makexpi.sh -n $(PACKAGE_NAME) -o

-buildscript/makexpi.sh:
+makexpi/makexpi.sh:
 	git submodule update --init
+
+signed: xpi
+	makexpi/sign_xpi.sh -k $(JWT_KEY) -s $(JWT_SECRET) -p ./$(PACKAGE_NAME)_noupdate.xpi
+
+clean:
+	rm $(PACKAGE_NAME).xpi $(PACKAGE_NAME)_noupdate.xpi sha1hash.txt
--- a/1
+++ b/1
@ -1 +0,0 @@
-Subproject commit 950375c3414066db2ff48e45cf681c79e1085d90
--- a/make.sh
+++ b/make.sh
@ -1,6 +1,6 @@
 #!/bin/sh

-cp buildscript/makexpi.sh ./
+cp makexpi/makexpi.sh ./
 ./makexpi.sh -n treestyletab -o
 rm ./makexpi.sh

--- a/1
+++ b/1
@ -0,0 +1 @@
+Subproject commit 5be67b8e7286e5f90efade2b3186e7683c3f9afe
				`@ -1 +0,0 @@`
				`Subproject commit 950375c3414066db2ff48e45cf681c79e1085d90`
				`@ -0,0 +1 @@`
				`Subproject commit 5be67b8e7286e5f90efade2b3186e7683c3f9afe`