From 730b2dd87466ac43dcd29df0ee4b08229e8f8979 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alfred=20W=C3=A4rns=C3=A4ter?=
 <alfred.warnsater+dev@gmail.com>
Date: Fri, 6 Aug 2021 10:36:04 +0200
Subject: [PATCH] removed glob dependancy

---
 AppKit/Themes/BlendKit/Jakefile | 5 ++---
 Jake/bundletask.js              | 5 ++---
 Tools/capp/Generate.j           | 6 ++----
 Tools/nib2cib/Jakefile          | 8 ++------
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/AppKit/Themes/BlendKit/Jakefile b/AppKit/Themes/BlendKit/Jakefile
index 6a0ba184a..2a496f69f 100644
--- a/AppKit/Themes/BlendKit/Jakefile
+++ b/AppKit/Themes/BlendKit/Jakefile
@@ -2,7 +2,6 @@
 require("../../../common.jake");
 
 const path = require("path");
-const glob = require("glob"); // FIXME: probably unnecessary to use an external library for this, maybe built into FileList?
 
 var framework = require("../../../Jake/frameworktask.js").framework;
 var BundleTask = require("../../../Jake/bundletask.js").BundleTask;
@@ -17,8 +16,8 @@ blendKitTask = framework ("BlendKit", function(blendKitTask)
     blendKitTask.setAuthor("280 North, Inc.");
     blendKitTask.setEmail("feedback @nospam@ 280north.com");
     blendKitTask.setSummary("BlendKit classes for Cappuccino");
-    blendKitTask.setSources(glob.sync("*.j"));
-    blendKitTask.setResources(glob.sync("Resources/*"));
+    blendKitTask.setSources(new FileList("*.j"));
+    blendKitTask.setResources(new FileList("Resources/*"));
     blendKitTask.setLicense(BundleTask.License.LGPL_v2_1);
     blendKitTask.setFlattensSources(true); // FIXME: how do we non flatten?
 
diff --git a/Jake/bundletask.js b/Jake/bundletask.js
index da6a7eae1..86e67d0d1 100644
--- a/Jake/bundletask.js
+++ b/Jake/bundletask.js
@@ -26,7 +26,6 @@ const path = require("path");
 
 // NPM modules
 const fs = require("fs-extra");
-const glob = require("glob");
 const ObjectiveJ = require("objj-runtime");
 const term = require("objj-runtime").term;
 
@@ -493,11 +492,11 @@ BundleTask.prototype.defineResourceTasks = function()
     {
         if (fs.lstatSync(aResourcePath).isDirectory())
         {
-            resources = resources.concat(aResourcePath, glob.sync(aResourcePath + "/**"));
+            resources = resources.concat(aResourcePath, (new FileList(aResourcePath + "/**")).toArray());
         }        else
             resources.push(aResourcePath);
     });
-    // TODO: too lazy to look this up, assuming it returns the array without duplicates
+    // TODO: assuming it returns the array without duplicates
     // resources = UTIL.unique(resources);
     resources = [... new Set(resources)];
     if (resources.length <= 0)
diff --git a/Tools/capp/Generate.j b/Tools/capp/Generate.j
index 07b0a2e7d..dabcd79d5 100644
--- a/Tools/capp/Generate.j
+++ b/Tools/capp/Generate.j
@@ -35,9 +35,7 @@ var OBJJ = require("objj-runtime"),
 var fs = require("fs-extra");
 var node_path = require("path");
 var child_process = require("child_process");
-var glob = require("glob");
-
-
+var jake = require("objj-jake");
 // FIXME: removing command line options for now
 
 /* parser.usage("DESTINATION_DIRECTORY");
@@ -181,7 +179,7 @@ function gen(/*va_args*/)
         // FIXME???
         fs.copySync(sourceTemplate, destinationProject, { recursive: true });
 
-        var files = glob.sync(node_path.join(destinationProject, "**", "*")),
+        var files = (new jake.FileList(node_path.join(destinationProject, "**", "*"))).toArray(),
             count = files.length,
             name = node_path.basename(destinationProject),
             orgIdentifier = [configuration valueForKey:@"organization.identifier"] || "";
diff --git a/Tools/nib2cib/Jakefile b/Tools/nib2cib/Jakefile
index 5c21f29f5..8a2681647 100644
--- a/Tools/nib2cib/Jakefile
+++ b/Tools/nib2cib/Jakefile
@@ -1,10 +1,6 @@
-
 require("../../common.jake");
 
-// var FILE = require("file");
-
 const path = require("path");
-const glob = require("glob");
 
 var app = require("../../Jake/applicationtask.js").app;
 var BundleTask = require("../../Jake/bundletask.js").BundleTask;
@@ -21,8 +17,8 @@ app ("nib2cib", function(nib2cibTask)
     nib2cibTask.setEmail("feedback @nospam@ 280north.com");
     nib2cibTask.setSummary("nib2cib converts Cocoa nib and xibs to Cappuccino cibs");
     
-    nib2cibTask.setSources(glob.sync("**/*.j"));
-    nib2cibTask.setResources(glob.sync("Resources/*"));
+    nib2cibTask.setSources(new FileList("**/*.j"));
+    nib2cibTask.setResources(new FileList("Resources/*"));
     nib2cibTask.setEnvironments(require("../../Jake/environment.js").CommonJS);
     nib2cibTask.setFlattensSources(true);