From cc98cf21a785c87924c25f3bcaec058d96c9a48d Mon Sep 17 00:00:00 2001
From: Shane Tomlinson <stomlinson@mozilla.com>
Date: Wed, 1 Feb 2012 14:24:39 +0000
Subject: [PATCH] Update the build script to no longer overwrite
shared/templates.js
* create_templates looks for the BUILD_DIR env variable and places templates there.
* compress sets the BUILD_DIR env variable for create_templates.
close #1021
---
scripts/compress.sh | 3 +--
scripts/create_templates.js | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/scripts/compress.sh b/scripts/compress.sh
index eacb37f92..aca48a179 100755
--- a/scripts/compress.sh
+++ b/scripts/compress.sh
@@ -53,8 +53,7 @@ echo ''
## resources/templates.js and included into the minified bundle.
cd dialog/views
-../../../../scripts/create_templates.js
-cp templates.js $BUILD_PATH/templates.js
+`BUILD_DIR=$BUILD_PATH ../../../../scripts/create_templates.js`
cd ../..
# produce the dialog js
diff --git a/scripts/create_templates.js b/scripts/create_templates.js
index 433f6c39c..8d084ad68 100755
--- a/scripts/create_templates.js
+++ b/scripts/create_templates.js
@@ -7,7 +7,7 @@
const fs = require("fs");
var dir = process.env.TEMPLATE_DIR || process.cwd();
-console.log(dir);
+var output_dir = process.env.BUILD_DIR || dir;
var templates = {};
@@ -23,6 +23,6 @@ fs.readdir(dir, function(err, fileNames) {
var templateData = "BrowserID.Templates =" + JSON.stringify(templates) + ";";
- fs.writeFileSync(dir + "/templates.js", templateData, "utf8");
+ fs.writeFileSync(output_dir + "/templates.js", templateData, "utf8");
});
--
GitLab