Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only depend on version.json where needed.

Browse Source
This commit is contained in:
ccd0 2016-04-12 23:44:57 -07:00
parent d0ede46e65
commit e8a86d893e
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -17,7 +17,7 @@ endif
coffee := $(BIN)coffee -c --no-header
coffee_deps := node_modules/coffee-script/package.json
template := node tools/template.js
template_deps := package.json version.json tools/template.js node_modules/lodash/package.json
template_deps := package.json tools/template.js node_modules/lodash/package.json
cat := node tools/cat.js
cat_deps := tools/cat.js
jshint_deps := .jshintrc node_modules/jshint/package.json
@ -74,7 +74,8 @@ sources_bottom := \
imports_top := \
src/Archive/archives.json \
src/css/custom.css
src/css/custom.css \
version.json
imports_Monitoring := \
src/meta/icon128.png
imports_Miscellaneous := \
@ -176,10 +177,10 @@ testbuilds/crx$1/eventPage.js : tmp/eventPage.js | testbuilds/crx$1
testbuilds/crx$1/icon%.png : src/meta/icon%.png | testbuilds/crx$1
$$(CP)
testbuilds/crx$1/manifest.json : src/meta/manifest.json $(template_deps) | testbuilds/crx$1
testbuilds/crx$1/manifest.json : src/meta/manifest.json version.json $(template_deps) | testbuilds/crx$1
$(template) $$< $$@ type=crx channel=$1
testbuilds/updates$1.xml : src/meta/updates.xml $(template_deps) | testbuilds/crx$1
testbuilds/updates$1.xml : src/meta/updates.xml version.json $(template_deps) | testbuilds/crx$1
$(template) $$< $$@ type=crx channel=$1
testbuilds/$(name)$1.crx.zip : \
@ -190,7 +191,7 @@ testbuilds/$(name)$1.crx.zip : \
testbuilds/$(name)$1.crx : testbuilds/$(name)$1.crx.zip package.json tools/sign.js node_modules/crx/package.json
node tools/sign.js $1
testbuilds/$(name)$1.meta.js : src/meta/metadata.js src/meta/icon48.png $(template_deps) | testbuilds
testbuilds/$(name)$1.meta.js : src/meta/metadata.js src/meta/icon48.png version.json $(template_deps) | testbuilds
$(template) $$< $$@ type=userscript channel=$1
testbuilds/$(name)$1.user.js : src/meta/botproc.js testbuilds/$(name)$1.meta.js LICENSE src/meta/usestrict.js tmp/script-userscript.js $(cat_deps)

2
src/General/Globals.coffee
View File

@ -3,7 +3,7 @@ c = console
d = document
doc = d.documentElement
g =
VERSION: '<%= meta.version %>'
VERSION: '<%= readJSON('version.json').version %>'
NAMESPACE: '<%= meta.name %>.'
boards: {}

2
src/meta/manifest.json
View File

@ -1,6 +1,6 @@
{
"name": "<%= meta.name %>",
"version": "<%= meta.version %>",
"version": "<%= readJSON('version.json').version %>",
"manifest_version": 2,
"description": "<%= description %>",
"icons": {

2
src/meta/metadata.js
View File

@ -1,6 +1,6 @@
// ==UserScript==
// @name <%= meta.name %><%= (channel === '-beta') ? ' beta' : '' %>
// @version <%= meta.version %>
// @version <%= readJSON('version.json').version %>
// @minGMVer <%= meta.min.greasemonkey %>
// @minFFVer <%= meta.min.firefox %>
// @namespace <%= name %>

2
src/meta/updates.xml
View File

@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
<app appid='<%= meta.appid %>'>
<updatecheck codebase='<%= meta.downloads %><%= name %><%= channel %>.crx' version='<%= meta.version %>' />
<updatecheck codebase='<%= meta.downloads %><%= name %><%= channel %>.crx' version='<%= readJSON('version.json').version %>' />
</app>
</gupdate>

3
tools/template.js
View File

@ -166,9 +166,8 @@ obj.assert = function(flagFile, statement) {
return `throw new Error 'Assertion failed: ' + ${constExpression(statement)} unless ${statement}`;
};
// Import variables from package.json and version.json.
// Import variables from package.json.
var pkg = readJSON('package.json');
_.assign(pkg.meta, readJSON('version.json'));
// Take variables from command line.
for (var i = 4; i < process.argv.length; i++) {