Don't generate conda-meta folder by default (#22)

emscripten-forge · Jan 17, 2025 · a24f0ae · a24f0ae
1 parent 0d5bb0b
commit a24f0ae
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/src/dynload/dynload.js b/src/dynload/dynload.js
@@ -82,10 +82,10 @@ export async function loadDynlibsFromPackage(
             await loadDynlib(prefix, path, global, [auditWheelLibDir], readFileMemoized, Module);
         } catch(e) {
             // Not preventing the loop to continue
-            console.error(e);
+            console.error(`Failed to load dynlib ${path}`, e);
         }
     }
-  }
+}
 
 function createDynlibFS(
     prefix,

diff --git a/src/helper.ts b/src/helper.ts
@@ -85,7 +85,8 @@ export async function installCondaPackage(
   url: string,
   FS: any,
   untarjs: IUnpackJSAPI,
-  verbose: boolean
+  verbose = false,
+  generateCondaMeta = false
 ): Promise<TSharedLibs> {
   if (!url) {
     throw new Error(`There is no file in ${url}`);
@@ -121,11 +122,12 @@ export async function installCondaPackage(
       const condaFiles: FilesData = await untarjs.extractData(condaPackage);
       const packageInfoFiles: FilesData =
         await untarjs.extractData(packageInfo);
-      saveCondaMetaFile(packageInfoFiles, newPrefix, FS, verbose);
+      generateCondaMeta &&
+        saveCondaMetaFile(packageInfoFiles, newPrefix, FS, verbose);
       saveFiles(FS, { ...condaFiles, ...packageInfoFiles }, newPrefix);
       installedFiles = condaFiles;
     } else {
-      saveCondaMetaFile(files, newPrefix, FS, verbose);
+      generateCondaMeta && saveCondaMetaFile(files, newPrefix, FS, verbose);
       saveFiles(FS, files, newPrefix);
       installedFiles = files;
     }

diff --git a/src/index.ts b/src/index.ts
@@ -46,6 +46,11 @@ export interface IBootstrapEmpackPackedEnvironmentOptions {
    */
   verbose?: boolean;
 
+  /**
+   * Whether to install conda-meta for packages, default to False
+   */
+  generateCondaMeta?: boolean;
+
   /**
    * The untarjs API. If not provided, one will be initialized.
    */
@@ -61,7 +66,8 @@ export interface IBootstrapEmpackPackedEnvironmentOptions {
 export const bootstrapEmpackPackedEnvironment = async (
   options: IBootstrapEmpackPackedEnvironmentOptions
 ): Promise<TSharedLibsMap> => {
-  const { empackEnvMeta, pkgRootUrl, Module, verbose } = options;
+  const { empackEnvMeta, pkgRootUrl, Module, verbose, generateCondaMeta } =
+    options;
 
   let untarjs: IUnpackJSAPI;
   if (options.untarjs) {
@@ -86,7 +92,8 @@ export const bootstrapEmpackPackedEnvironment = async (
           packageUrl,
           Module.FS,
           untarjs,
-          !!verbose
+          !!verbose,
+          !!generateCondaMeta
         );
       })
     );
@@ -171,7 +178,7 @@ export async function loadShareLibs(
     }
   }
 
-  return Promise.all(sharedLibsLoad);
+  return await Promise.all(sharedLibsLoad);
 }
 
 const waitRunDependencies = (Module: any): Promise<void> => {