You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2014/03/27 15:22:36 UTC

[27/34] js commit: moving license writing to other module

moving license writing to other module


Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/ec5e4900
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/ec5e4900
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/ec5e4900

Branch: refs/heads/browserify
Commit: ec5e490039f90cc09bd04b4f086a363f586efaa4
Parents: 75860dd
Author: Anis Kadri <an...@apache.org>
Authored: Fri Mar 14 16:41:44 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Thu Mar 27 15:20:22 2014 +0100

----------------------------------------------------------------------
 tasks/lib/packager-browserify.js  | 24 ++++++++----------------
 tasks/lib/write-license-header.js | 16 ++++++++++++++++
 2 files changed, 24 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-js/blob/ec5e4900/tasks/lib/packager-browserify.js
----------------------------------------------------------------------
diff --git a/tasks/lib/packager-browserify.js b/tasks/lib/packager-browserify.js
index 07d7774..ecc3f5f 100644
--- a/tasks/lib/packager-browserify.js
+++ b/tasks/lib/packager-browserify.js
@@ -16,13 +16,12 @@
  * specific language governing permissions and lim
  * under the License.
  */
-var fs              = require('fs');
-var path            = require('path');
-var util            = require('util');
-var bundle          = require('./bundle-browserify');
-var computeCommitId = require('./compute-commit-id');
-var licensePath     = path.join(__dirname, '..', 'templates', 'LICENSE-for-js-file.txt');
-var require_tr   = require('./require-tr');
+var fs                 = require('fs');
+var path               = require('path');
+var util               = require('util');
+var bundle             = require('./bundle-browserify');
+var computeCommitId    = require('./compute-commit-id');
+var writeLicenseHeader = require('./write-license-header');
 
 
 module.exports = function generate(platform, useWindowsLineEndings, done) {
@@ -49,17 +48,10 @@ module.exports = function generate(platform, useWindowsLineEndings, done) {
         outReleaseFile = path.join('pkg', 'cordova.' + platform + '.js');
         outReleaseFileStream = fs.createWriteStream(outReleaseFile);
         
-        // some poppycock 
-        var licenseText = util.format("/*\n *%s\n */\n", fs.readFileSync(licensePath, 'utf8').replace(/\n/g, "\n *"));
+        // write license header
+        writeLicenseHeader(outReleaseFileStream, platform, commitId);
 
-        outReleaseFileStream.write("// Platform: " + platform + "\n", 'utf8');
-        outReleaseFileStream.write("// "  + commitId + "\n", 'utf8');
-        outReleaseFileStream.write(licenseText, 'utf8');
-        outReleaseFileStream.write("var CORDOVA_JS_BUILD_LABEL = '"  + commitId + "';\n", 'utf8');
-        outReleaseFileStream.write("var define = {moduleMap: []};\n", 'utf8');
-        
         releaseBundle = libraryRelease.bundle();
-        //console.log(libraryRelease.deps());
 
         releaseBundle.pipe(outReleaseFileStream);
 

http://git-wip-us.apache.org/repos/asf/cordova-js/blob/ec5e4900/tasks/lib/write-license-header.js
----------------------------------------------------------------------
diff --git a/tasks/lib/write-license-header.js b/tasks/lib/write-license-header.js
new file mode 100644
index 0000000..8b33cbd
--- /dev/null
+++ b/tasks/lib/write-license-header.js
@@ -0,0 +1,16 @@
+var path        = require('path');
+var util        = require('util');
+var fs          = require('fs');
+var licensePath = path.join(__dirname, '..', 'templates', 'LICENSE-for-js-file.txt');
+
+module.exports = function(outStream, platform, commitId) {
+  // some poppycock 
+  var licenseText = util.format("/*\n *%s\n */\n", fs.readFileSync(licensePath, 'utf8').replace(/\n/g, "\n *"));
+
+  outStream.write("// Platform: " + platform + "\n", 'utf8');
+  outStream.write("// "  + commitId + "\n", 'utf8');
+  outStream.write(licenseText, 'utf8');
+  outStream.write("var CORDOVA_JS_BUILD_LABEL = '"  + commitId + "';\n", 'utf8');
+  outStream.write("var define = {moduleMap: []};\n", 'utf8');
+
+}