Skip to content
This repository has been archived by the owner on Jan 17, 2023. It is now read-only.

Fix #2314, generate install.rdf from package.json version #2377

Merged
merged 1 commit into from Mar 14, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -19,4 +19,5 @@ cookie-jar.txt
/addon/webextension/build
/addon/webextension/.web-extension-id
/addon/webextension/manifest.json
/addon/install.rdf
/addon/webextension/_locales
5 changes: 4 additions & 1 deletion Makefile
Expand Up @@ -91,7 +91,7 @@ build/%.html: %.html
cp $< $@

.PHONY: addon
addon: npm set_backend set_sentry addon/webextension/manifest.json addon_locales addon/webextension/build/shot.js addon/webextension/build/inlineSelectionCss.js addon/webextension/build/raven.js addon/webextension/build/defaultSentryDsn.js
addon: npm set_backend set_sentry addon/webextension/manifest.json addon/install.rdf addon_locales addon/webextension/build/shot.js addon/webextension/build/inlineSelectionCss.js addon/webextension/build/raven.js addon/webextension/build/defaultSentryDsn.js

EXPORT_MC_LOCATION := $(shell echo $${EXPORT_MC_LOCATION-../gecko})
GIT_EXPORT_DIR := $(EXPORT_MC_LOCATION)/browser/extensions/pageshot
Expand Down Expand Up @@ -131,6 +131,9 @@ signed_xpi: addon
addon_locales:
./bin/build-scripts/pontoon-to-webext.js --dest addon/webextension/_locales

addon/install.rdf: addon/install.rdf.template
./bin/build-scripts/update_manifest $< $@

addon/webextension/manifest.json: addon/webextension/manifest.json.template build/.backend.txt package.json
./bin/build-scripts/update_manifest $< $@

Expand Down
3 changes: 1 addition & 2 deletions addon/install.rdf → addon/install.rdf.template
Expand Up @@ -12,8 +12,7 @@
</Description>
</em:targetApplication>
<em:type>2</em:type>
<!-- FIXME: get version from package.json https://github.com/mozilla-services/pageshot/issues/2314 -->
<em:version>1.0</em:version>
<em:version>__VERSION__</em:version>
<em:bootstrap>true</em:bootstrap>
<em:hasEmbeddedWebExtension>true</em:hasEmbeddedWebExtension>
<em:homepageURL>https://pageshot.net/</em:homepageURL>
Expand Down
3 changes: 2 additions & 1 deletion addon/webextension/manifest.json.template
Expand Up @@ -24,7 +24,8 @@
"19": "icons/pageshot-icon-19.png",
"38": "icons/pageshot-icon-38.png"
},
"default_title": "__MSG_toolbarButtonLabel__"
"default_title": "__MSG_toolbarButtonLabel__",
"browser_style": false
},
"background": {
"scripts": [
Expand Down