From f4ea55034452fc509ed34523288c437e3bc87101 Mon Sep 17 00:00:00 2001 From: Kalervo Kujala Date: Wed, 11 Jan 2012 22:05:36 +0200 Subject: [PATCH 1/4] Clean up .gitignore and add tags to it. --- .gitignore | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index bb045de3e..e0aa2f5f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,4 @@ -*~ -pdf.pdf -intelisa.pdf -openweb_tm-PRINT.pdf local.mk build/ +tags From a817416ddbd70d229de5fd46b47279bfac87a85c Mon Sep 17 00:00:00 2001 From: notmasteryet Date: Wed, 11 Jan 2012 22:19:21 -0600 Subject: [PATCH 2/4] Ref test for #1010 --- test/pdfs/issue1010.pdf.link | 1 + test/test_manifest.json | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 test/pdfs/issue1010.pdf.link diff --git a/test/pdfs/issue1010.pdf.link b/test/pdfs/issue1010.pdf.link new file mode 100644 index 000000000..3527b797e --- /dev/null +++ b/test/pdfs/issue1010.pdf.link @@ -0,0 +1 @@ +http://francois.laustriat.free.fr/test/caravan-d.pdf diff --git a/test/test_manifest.json b/test/test_manifest.json index 8598e4bc8..39586ef3c 100644 --- a/test/test_manifest.json +++ b/test/test_manifest.json @@ -389,6 +389,13 @@ "link": true, "type": "load" }, + { "id": "issue1010", + "file": "pdfs/issue1010.pdf", + "md5": "f991ef093484a107fe9f59dff18fc155", + "rounds": 1, + "link": true, + "type": "eq" + }, { "id": "issue1015", "file": "pdfs/issue1015.pdf", "md5": "b61503d1b445742b665212866afb60e2", From d986ef0979c9c9bb968fbd463dc050dbe1401917 Mon Sep 17 00:00:00 2001 From: Brendan Dahl Date: Thu, 12 Jan 2012 09:17:30 -0800 Subject: [PATCH 3/4] Copy AMO extension to web --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 107551d6a..e9c2cc370 100644 --- a/Makefile +++ b/Makefile @@ -160,7 +160,10 @@ web: | production extension compiler pages-repo @cp $(BUILD_TARGET) $(GH_PAGES)/$(BUILD_TARGET) @cp -R web/* $(GH_PAGES)/web @cp web/images/* $(GH_PAGES)/web/images - @cp $(FIREFOX_BUILD_DIR)/$(FIREFOX_EXTENSION_NAME) $(FIREFOX_BUILD_DIR)/update.rdf $(GH_PAGES)/$(EXTENSION_SRC)/firefox/ + @cp $(FIREFOX_BUILD_DIR)/$(FIREFOX_EXTENSION_NAME) \ + $(FIREFOX_BUILD_DIR)/$(FIREFOX_AMO_EXTENSION_NAME) \ + $(FIREFOX_BUILD_DIR)/update.rdf \ + $(GH_PAGES)/$(EXTENSION_SRC)/firefox/ @cp $(GH_PAGES)/web/index.html.template $(GH_PAGES)/index.html; @mv -f $(GH_PAGES)/web/viewer-production.html $(GH_PAGES)/web/viewer.html; @cd $(GH_PAGES); git add -A; From 9114af51a1a95abe5689b9957348be5e73fda50f Mon Sep 17 00:00:00 2001 From: Kalervo Kujala Date: Thu, 12 Jan 2012 20:52:26 +0200 Subject: [PATCH 4/4] Revert *~ .gitignore change. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e0aa2f5f2..9b20a7778 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +*~ local.mk build/ tags