colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-08-25 04:57:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: Make sure we use the built parts of Cappuccino when building parts that is dependent of former.

Browse Source 
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
This commit is contained in:
Martin Carlberg
2021-09-29 09:18:12 +02:00
parent 4a8667e0f3
commit 706166dc5c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common.jake
+3 -3
View File
@@ -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(":");
}