From 706166dc5c88ac7818fafdd2b7ff705e29fa7781 Mon Sep 17 00:00:00 2001 From: Martin Carlberg Date: Wed, 29 Sep 2021 09:18:12 +0200 Subject: [PATCH] Fixed: Make sure we use the built parts of Cappuccino when building parts that is dependent of former. This is done by passing the environment variable 'OBJJ_OPT' when spawning a new jake task. The content of OBJJ_OPT will be parsed as arguments when starting an Objective-J tool --- common.jake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common.jake b/common.jake index 31b1d8aca..a4dda9fe6 100644 --- a/common.jake +++ b/common.jake @@ -102,13 +102,13 @@ function additionalPackages() var packages = []; // load built objective-j if exists, otherwise unbuilt - if (!fs.existsSync(path.join(builtObjectiveJPackage, "package.json"))) { + if (fs.existsSync(path.join(builtObjectiveJPackage, "package.json"))) { //if (!packageInCatalog(builtObjectiveJPackage)) packages.push(builtObjectiveJPackage); } // load built cappuccino if it exists - if (!fs.existsSync(path.join(builtCappuccinoPackage, "package.json"))) { + if (fs.existsSync(path.join(builtCappuccinoPackage, "package.json"))) { //if (!packageInCatalog(builtCappuccinoPackage)) packages.push(builtCappuccinoPackage); } @@ -142,7 +142,7 @@ serializedENV = function() if (packages.length) { - envNew["NARWHALOPT"] = packages.map(function(p) { return "-p " + utilsFile.enquote(p); }).join(" "); + envNew["OBJJ_OPT"] = packages.map(function(p) { return "-I " + utilsFile.enquote(p); }).join(" "); envNew["PATH"] = packages.map(function(p) { return path.join(p, "bin"); }).concat(process.env["PATH"]).join(":"); }