Look for libraries in Libraries as well as Prelude directory

Open source bsc keeps core libraries in "Libraries" instead of "Prelude", so look in both places. This commit still assumes BLUESPECDIR is points to the bsc installation. This commit fixes a second part of issue #157.
cambridgehackers · Mar 3, 2020 · b23d069 · b23d069
1 parent f976042
commit b23d069
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/scripts/bsvdependencies.py b/scripts/bsvdependencies.py
@@ -32,7 +32,7 @@ def getBsvPackages(bluespecdir):
     the packages in the prelude library of this distribution.
     """
     pkgs = []
-    for f in glob.glob('%s/Prelude/*.bo' % bluespecdir):
+    for f in glob.glob('%s/Prelude/*.bo' % bluespecdir) + glob.glob('%s/Libraries/*.bo' % bluespecdir):
         pkgs.append(os.path.splitext(os.path.basename(f))[0])
     return pkgs
 

diff --git a/scripts/packagesource.py b/scripts/packagesource.py
@@ -33,7 +33,7 @@ def getBsvPackages(bluespecdir):
     the packages in the prelude library of this distribution.
     """
     pkgs = []
-    for f in glob.glob('%s/Prelude/*.bo' % bluespecdir):
+    for f in glob.glob('%s/Prelude/*.bo' % bluespecdir) + glob.glob('%s/Libraries/*.bo' % bluespecdir):
         pkgs.append(os.path.splitext(os.path.basename(f))[0])
     return pkgs