Browse Source

Merge branch 'master' of git://github.com/mozilla/pdf.js.git into jpx6

notmasteryet 13 years ago
parent
commit
b89f544b18
  1. 4
      .gitignore
  2. 5
      Makefile
  3. 1
      test/pdfs/issue1010.pdf.link
  4. 7
      test/test_manifest.json

4
.gitignore vendored

@ -1,7 +1,5 @@
*~ *~
pdf.pdf
intelisa.pdf
openweb_tm-PRINT.pdf
local.mk local.mk
build/ build/
tags

5
Makefile

@ -160,7 +160,10 @@ web: | production extension compiler pages-repo
@cp $(BUILD_TARGET) $(GH_PAGES)/$(BUILD_TARGET) @cp $(BUILD_TARGET) $(GH_PAGES)/$(BUILD_TARGET)
@cp -R web/* $(GH_PAGES)/web @cp -R web/* $(GH_PAGES)/web
@cp web/images/* $(GH_PAGES)/web/images @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; @cp $(GH_PAGES)/web/index.html.template $(GH_PAGES)/index.html;
@mv -f $(GH_PAGES)/web/viewer-production.html $(GH_PAGES)/web/viewer.html; @mv -f $(GH_PAGES)/web/viewer-production.html $(GH_PAGES)/web/viewer.html;
@cd $(GH_PAGES); git add -A; @cd $(GH_PAGES); git add -A;

1
test/pdfs/issue1010.pdf.link

@ -0,0 +1 @@
http://francois.laustriat.free.fr/test/caravan-d.pdf

7
test/test_manifest.json

@ -389,6 +389,13 @@
"link": true, "link": true,
"type": "load" "type": "load"
}, },
{ "id": "issue1010",
"file": "pdfs/issue1010.pdf",
"md5": "f991ef093484a107fe9f59dff18fc155",
"rounds": 1,
"link": true,
"type": "eq"
},
{ "id": "issue1015", { "id": "issue1015",
"file": "pdfs/issue1015.pdf", "file": "pdfs/issue1015.pdf",
"md5": "b61503d1b445742b665212866afb60e2", "md5": "b61503d1b445742b665212866afb60e2",

Loading…
Cancel
Save