colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-14 22:51:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into URL

Browse Source
This commit is contained in:
Francisco Ryan Tolmasky I
2010-03-03 11:40:08 -08:00
parent 4bd6aca0c0 b30f10ca46
commit b4fa971007
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/Scripts/ci.sh
+1
View File
@@ -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
common.jake
+4 -4
View File
@@ -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);
@@ -48,10 +48,10 @@ function ensurePackageUpToDate(packageName, requiredVersion, options)
}
// UPDATE THESE TO PICK UP CORRESPONDING CHANGES IN DEPENDENCIES
ensurePackageUpToDate("jake", "0.1.4");
ensurePackageUpToDate("jake", "0.1.5");
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)."
});
@@ -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(":");
}