From e8a86d893e67bde054d383fbbca6ad2bf66f92e5 Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Tue, 12 Apr 2016 23:44:57 -0700
Subject: [PATCH] Only depend on version.json where needed.

---
 Makefile                   | 11 ++++++-----
 src/General/Globals.coffee |  2 +-
 src/meta/manifest.json     |  2 +-
 src/meta/metadata.js       |  2 +-
 src/meta/updates.xml       |  2 +-
 tools/template.js          |  3 +--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 4ce6c7f51..9cbdc589b 100644
--- a/Makefile
+++ b/Makefile
@@ -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)
diff --git a/src/General/Globals.coffee b/src/General/Globals.coffee
index 43cd70ca4..fb1f6fc34 100644
--- a/src/General/Globals.coffee
+++ b/src/General/Globals.coffee
@@ -3,7 +3,7 @@ c    = console
 d    = document
 doc  = d.documentElement
 g    =
-  VERSION:   '<%= meta.version %>'
+  VERSION:   '<%= readJSON('version.json').version %>'
   NAMESPACE: '<%= meta.name %>.'
   boards:    {}
 
diff --git a/src/meta/manifest.json b/src/meta/manifest.json
index 2939ad7e0..da850c350 100644
--- a/src/meta/manifest.json
+++ b/src/meta/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "<%= meta.name %>",
-  "version": "<%= meta.version %>",
+  "version": "<%= readJSON('version.json').version %>",
   "manifest_version": 2,
   "description": "<%= description %>",
   "icons": {
diff --git a/src/meta/metadata.js b/src/meta/metadata.js
index 9794e3de9..34a2d80fe 100644
--- a/src/meta/metadata.js
+++ b/src/meta/metadata.js
@@ -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 %>
diff --git a/src/meta/updates.xml b/src/meta/updates.xml
index 10d5f3847..ea6aebcc7 100644
--- a/src/meta/updates.xml
+++ b/src/meta/updates.xml
@@ -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>
 
diff --git a/tools/template.js b/tools/template.js
index 49792f7d9..587f9f14c 100644
--- a/tools/template.js
+++ b/tools/template.js
@@ -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++) {