Merge pull request #372 from adobe/jasonsanjose/jenkins

Specify downloads folder path to allow Jenkins to cache CEF and Node downloads

Author: ingorichter

Gruntfile.js

@@ -41,40 +41,41 @@ module.exports = function (grunt) {
     grunt.initConfig({
         "pkg":              grunt.file.readJSON("package.json"),
         "config-json":      staging + "/www/config.json",
+        "downloads":        grunt.option("downloads") || "downloads",
         "curl-dir": {
             /* linux */
             "cef-linux32": {
-                "dest"      : "downloads/",
+                "dest"      : "<%= downloads %>",
                 "src"       : "http://dev.brackets.io/cef/cef_binary_<%= cef.version %>_linux32_release.zip"
             },
             "cef-linux64": {
-                "dest"      : "downloads/",
+                "dest"      : "<%= downloads %>",
                 "src"       : "http://dev.brackets.io/cef/cef_binary_<%= cef.version %>_linux64_release.zip"
             },
             "node-linux32": {
-                "dest"      : "downloads/",
+                "dest"      : "<%= downloads %>",
                 "src"       : "http://nodejs.org/dist/v<%= node.version %>/node-v<%= node.version %>-linux-x86.tar.gz"
             },
             "node-linux64": {
-                "dest"      : "downloads/",
+                "dest"      : "<%= downloads %>",
                 "src"       : "http://nodejs.org/dist/v<%= node.version %>/node-v<%= node.version %>-linux-x64.tar.gz"
             },
             /* mac */
             "cef-mac": {
-                "dest"      : "downloads/",
+                "dest"      : "<%= downloads %>",
                 "src"       : "http://dev.brackets.io/cef/cef_binary_<%= cef.version %>_macosx.zip"
             },
             "node-mac": {
-                "dest"      : "downloads/",
+                "dest"      : "<%= downloads %>",
                 "src"       : "http://nodejs.org/dist/v<%= node.version %>/node-v<%= node.version %>-darwin-x86.tar.gz"
             },
             /* win */
             "cef-win": {
-                "dest"      : "downloads/",
+                "dest"      : "<%= downloads %>",
                 "src"       : "http://dev.brackets.io/cef/cef_binary_<%= cef.version %>_windows.zip"
             },
             "node-win": {
-                "dest"      : "downloads/",
+                "dest"      : "<%= downloads %>",
                 "src"       : ["http://nodejs.org/dist/v<%= node.version %>/node.exe",
                                "http://nodejs.org/dist/npm/npm-<%= npm.version %>.zip"]
             }

package.json

@@ -26,6 +26,6 @@
     "scripts": {
         "preinstall": "bash -c 'mv appshell.gyp .appshell.gyp'",
         "install": "",
-        "postinstall": "bash -c 'mv .appshell.gyp appshell.gyp; grunt'"
+        "postinstall": "bash -c 'mv .appshell.gyp appshell.gyp;'"
     }
 }

tasks/setup.js

@@ -28,6 +28,7 @@ module.exports = function (grunt) {
     var common          = require("./common")(grunt),
         fs              = require("fs"),
         child_process   = require("child_process"),
+        path            = require("path"),
         q               = require("q"),
         /* win only (lib), mac only (Resources, tools) */
         CEF_MAPPING     = {
@@ -70,8 +71,8 @@ module.exports = function (grunt) {
     grunt.registerTask("cef", "Download and setup CEF", function () {
         var config      = "cef-" + platform + common.arch(),
             zipSrc      = grunt.config("curl-dir." + config + ".src"),
-            zipName     = zipSrc.substr(zipSrc.lastIndexOf("/") + 1),
-            zipDest     = grunt.config("curl-dir." + config + ".dest") + zipName,
+            zipName     = path.basename(zipSrc),
+            zipDest     = path.resolve(process.cwd(), path.join(grunt.config("curl-dir." + config + ".dest"), zipName)),
             txtName;
 
         // extract zip file name and set config property
@@ -140,22 +141,29 @@ module.exports = function (grunt) {
         unzipPromise = unzip(zipDest, "deps");
 
         // remove .zip ext
-        zipName = zipName.substr(0, zipName.lastIndexOf("."));
+        zipName = path.basename(zipName, ".zip");
 
         unzipPromise.then(function () {
             // rename version stamped name to cef
             return rename("deps/" + zipName, "deps/cef");
         }).then(function () {
+            var memo = path.resolve(process.cwd(), "deps/cef/" + zipName + ".txt"),
+                permissionsPromise,
+                defer = q.defer();
+            
             if (platform === "mac") {
                 // FIXME figure out how to use fs.chmod to only do additive mode u+x
-                return exec("chmod u+x deps/cef/tools/*");
+                permissionsPromise = exec("chmod u+x deps/cef/tools/*");
+            } else {
+                permissionsPromise = q.resolve();
             }
 
-            // write empty file with zip file 
-            grunt.file.write("deps/cef/" + zipName + ".txt", "");
-            
-            // return a resolved promise
-            return q.resolve();
+            return permissionsPromise.then(function () {
+                // write empty file with zip file 
+                grunt.file.write(memo, "");
+                
+                return q.resolve();
+            });
         }).then(function () {
             done();
         }, function (err) {
@@ -208,7 +216,7 @@ module.exports = function (grunt) {
         // curl-dir:node-win32 defines multiple downloads, account for this array
         nodeSrc.forEach(function (value, index) {
             nodeSrc[index] = value.substr(value.lastIndexOf("/") + 1);
-            nodeDest[index] = dest + nodeSrc[index];
+            nodeDest[index] = path.join(dest, nodeSrc[index]);
 
             missingDest = missingDest || !grunt.file.exists(nodeDest[index]);
         });