From 783159ee44f3c531272d31fffb98c892ec6a4fa7 Mon Sep 17 00:00:00 2001 From: Tom Robinson Date: Tue, 2 Mar 2010 11:46:22 -0800 Subject: [PATCH 1/7] Enquote NARWHALOPT package paths to fix building in directories with spaces. --- common.jake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.jake b/common.jake index affbdc969..237273d35 100644 --- a/common.jake +++ b/common.jake @@ -162,7 +162,7 @@ serializedENV = function() // pseudo-HACK: add NARWHALOPT with packages we should ensure are loaded var packages = additionalPackages(); if (packages.length) { - envNew["NARWHALOPT"] = packages.map(function(p) { return "-p " + p; }).join(" "); + envNew["NARWHALOPT"] = packages.map(function(p) { return "-p " + OS.enquote(p); }).join(" "); envNew["PATH"] = packages.map(function(p) { return FILE.join(p, "bin"); }).concat(SYSTEM.env["PATH"]).join(":"); } From db8a277960d3fa2e9119a667a10979e5034cab4e Mon Sep 17 00:00:00 2001 From: Tom Robinson Date: Tue, 2 Mar 2010 16:38:24 -0800 Subject: [PATCH 2/7] Revert "Enquote NARWHALOPT package paths to fix building in directories with spaces." This reverts commit 783159ee44f3c531272d31fffb98c892ec6a4fa7. --- common.jake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.jake b/common.jake index 237273d35..affbdc969 100644 --- a/common.jake +++ b/common.jake @@ -162,7 +162,7 @@ serializedENV = function() // pseudo-HACK: add NARWHALOPT with packages we should ensure are loaded var packages = additionalPackages(); if (packages.length) { - envNew["NARWHALOPT"] = packages.map(function(p) { return "-p " + OS.enquote(p); }).join(" "); + envNew["NARWHALOPT"] = packages.map(function(p) { return "-p " + p; }).join(" "); envNew["PATH"] = packages.map(function(p) { return FILE.join(p, "bin"); }).concat(SYSTEM.env["PATH"]).join(":"); } From cb939baca05a0acea74223f42b88b5ddd28917f9 Mon Sep 17 00:00:00 2001 From: Tom Robinson Date: Tue, 2 Mar 2010 17:33:39 -0800 Subject: [PATCH 3/7] Revert "Revert "Enquote NARWHALOPT package paths to fix building in directories with spaces."" This reverts commit db8a277960d3fa2e9119a667a10979e5034cab4e. --- common.jake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.jake b/common.jake index affbdc969..237273d35 100644 --- a/common.jake +++ b/common.jake @@ -162,7 +162,7 @@ serializedENV = function() // pseudo-HACK: add NARWHALOPT with packages we should ensure are loaded var packages = additionalPackages(); if (packages.length) { - envNew["NARWHALOPT"] = packages.map(function(p) { return "-p " + p; }).join(" "); + envNew["NARWHALOPT"] = packages.map(function(p) { return "-p " + OS.enquote(p); }).join(" "); envNew["PATH"] = packages.map(function(p) { return FILE.join(p, "bin"); }).concat(SYSTEM.env["PATH"]).join(":"); } From 7a486db45f52b8f2ea7445857d1da495bd304e10 Mon Sep 17 00:00:00 2001 From: Francisco Ryan Tolmasky I Date: Wed, 3 Mar 2010 01:35:02 -0800 Subject: [PATCH 4/7] Update to reverted jake version. Reviewed by me. --- common.jake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.jake b/common.jake index 237273d35..40f619403 100644 --- a/common.jake +++ b/common.jake @@ -48,7 +48,7 @@ function ensurePackageUpToDate(packageName, requiredVersion, options) } // UPDATE THESE TO PICK UP CORRESPONDING CHANGES IN DEPENDENCIES -ensurePackageUpToDate("jake", "0.1.3"); +ensurePackageUpToDate("jake", "0.1.4"); ensurePackageUpToDate("browserjs", "0.1.1"); ensurePackageUpToDate("shrinksafe", "0.2"); ensurePackageUpToDate("narwhal", "0.2.1", { From 45b8f83cdd2bbeb45f62bbf34ca1e8234c9e2776 Mon Sep 17 00:00:00 2001 From: Francisco Ryan Tolmasky I Date: Wed, 3 Mar 2010 01:41:13 -0800 Subject: [PATCH 5/7] Revert "Revert "Revert "Enquote NARWHALOPT package paths to fix building in directories with spaces.""" This reverts commit cb939baca05a0acea74223f42b88b5ddd28917f9. --- common.jake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.jake b/common.jake index 40f619403..a18a645d1 100644 --- a/common.jake +++ b/common.jake @@ -162,7 +162,7 @@ serializedENV = function() // pseudo-HACK: add NARWHALOPT with packages we should ensure are loaded var packages = additionalPackages(); if (packages.length) { - envNew["NARWHALOPT"] = packages.map(function(p) { return "-p " + OS.enquote(p); }).join(" "); + envNew["NARWHALOPT"] = packages.map(function(p) { return "-p " + p; }).join(" "); envNew["PATH"] = packages.map(function(p) { return FILE.join(p, "bin"); }).concat(SYSTEM.env["PATH"]).join(":"); } From 3da2d3718b130c26d56355c33bdead383549580a Mon Sep 17 00:00:00 2001 From: Tom Robinson Date: Wed, 3 Mar 2010 09:02:57 -0800 Subject: [PATCH 6/7] Bump required Narwhal version to 0.2.2 --- common.jake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.jake b/common.jake index a18a645d1..6ef6d0eed 100644 --- a/common.jake +++ b/common.jake @@ -51,7 +51,7 @@ function ensurePackageUpToDate(packageName, requiredVersion, options) ensurePackageUpToDate("jake", "0.1.4"); ensurePackageUpToDate("browserjs", "0.1.1"); ensurePackageUpToDate("shrinksafe", "0.2"); -ensurePackageUpToDate("narwhal", "0.2.1", { +ensurePackageUpToDate("narwhal", "0.2.2", { noupdate : true, message : "Update Narwhal to 0.2.1 by running bootstrap.sh, or pulling the latest from git (see: http://github.com/280north/narwhal)." }); From b0d62a86085ae11b69bdd50403133ac94b1608c7 Mon Sep 17 00:00:00 2001 From: Tom Robinson Date: Wed, 3 Mar 2010 09:08:02 -0800 Subject: [PATCH 7/7] Add option to automatically upgrade packages for CI server, etc. --- Tools/Scripts/ci.sh | 1 + common.jake | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Tools/Scripts/ci.sh b/Tools/Scripts/ci.sh index 4bc798a70..1500cc2fa 100755 --- a/Tools/Scripts/ci.sh +++ b/Tools/Scripts/ci.sh @@ -3,6 +3,7 @@ project_home="$(dirname "$PWD")" export PATH="$HOME/narwhal/bin:$PATH" +export CAPP_AUTO_UPGRADE="yes" export CAPP_BUILD=$project_home/build_incremental time jake test diff --git a/common.jake b/common.jake index 6ef6d0eed..c9416635c 100644 --- a/common.jake +++ b/common.jake @@ -32,7 +32,7 @@ function ensurePackageUpToDate(packageName, requiredVersion, options) if (!options.noupdate) { print("Update? yes or no:"); - if (system.stdin.readLine() !== "yes\n") + if (!SYSTEM.env["CAPP_AUTO_UPGRADE"] && system.stdin.readLine() !== "yes\n") { print("Jake aborted."); OS.exit(1);