fix: Include swiftshader directory when creating installer for Electron 10+

spec/fixtures/app/vk_swiftshader_icd.json

@@ -0,0 +1 @@
+{"file_format_version": "1.0.0", "ICD": {"library_path": ".\\vk_swiftshader.dll", "api_version": "1.0.5"}}

spec/installer-spec.ts

@@ -3,6 +3,7 @@ import path from 'path';
 import { createTempDir } from '../src/temp-utils';
 import fs from 'fs-extra';
 import { createWindowsInstaller } from '../src';
+import spawn from '../src/spawn-promise';
 
 const log = require('debug')('electron-windows-installer:spec');
 
@@ -29,7 +30,9 @@ test('creates a nuget package and installer', async (t): Promise<void> => {
   log(`Verifying assertions on ${outputDirectory}`);
   log(JSON.stringify(await fs.readdir(outputDirectory)));
 
-  t.true(await fs.pathExists(path.join(outputDirectory, 'myapp-1.0.0-full.nupkg')));
+  const nupkgPath = path.join(outputDirectory, 'myapp-1.0.0-full.nupkg');
+
+  t.true(await fs.pathExists(nupkgPath));
   t.true(await fs.pathExists(path.join(outputDirectory, 'MyAppSetup.exe')));
 
   if (process.platform === 'win32') {
@@ -38,4 +41,19 @@ test('creates a nuget package and installer', async (t): Promise<void> => {
 
   log('Verifying Update.exe');
   t.true(await fs.pathExists(path.join(appDirectory, 'Squirrel.exe')));
+
+  log('Verifying contents of .nupkg');
+  const sevenZipPath = path.join(__dirname, '..', 'vendor', '7z.exe');
+  let cmd = sevenZipPath;
+  const args = ['l', nupkgPath];
+
+  if (process.platform !== 'win32') {
+    args.unshift(cmd);
+    const wineExe = process.arch === 'x64' ? 'wine64' : 'wine';
+    cmd = wineExe;
+  }
+
+  const packageContents = await spawn(cmd, args);
+  t.true(packageContents.includes('lib\\net45\\vk_swiftshader_icd.json'));
+  t.true(packageContents.includes('lib\\net45\\swiftshader\\libEGL.dll'));
 });

src/index.ts

@@ -103,10 +103,23 @@ export async function createWindowsInstaller(options: Options): Promise<void> {
   metadata.version = convertVersion(metadata.version as string);
   metadata.copyright = metadata.copyright ||
     `Copyright © ${new Date().getFullYear()} ${metadata.authors || metadata.owners}`;
+  metadata.additionalFiles = metadata.additionalFiles || [];
+
+  if (await fs.pathExists(path.join(appDirectory, 'swiftshader'))) {
+    metadata.additionalFiles.push({ src: 'swiftshader\\**', target: 'lib\\net45\\swiftshader' });
+  }
+
+  if (await fs.pathExists(path.join(appDirectory, 'vk_swiftshader_icd.json'))) {
+    metadata.additionalFiles.push({ src: 'vk_swiftshader_icd.json', target: 'lib\\net45' });
+  }
 
   let templateData = await fs.readFile(path.join(__dirname, '..', 'template.nuspectemplate'), 'utf8');
   if (path.sep === '/') {
     templateData = templateData.replace(/\\/g, '/');
+    for (const f of metadata.additionalFiles) {
+      f.src = f.src.replace(/\\/g, '/');
+      f.target = f.target.replace(/\\/g, '/');
+    }
   }
   const nuspecContent = template(templateData)(metadata);
 

src/options.ts

@@ -133,6 +133,11 @@ export interface PersonMetadata {
   url?: string;
 }
 
+export interface AdditionalFile {
+  src: string;
+  target: string;
+}
+
 export interface Metadata {
   name?: string;
   productName?: string;
@@ -143,4 +148,5 @@ export interface Metadata {
   owners?: string | PersonMetadata[];
   description?: string;
   iconUrl?: string;
+  additionalFiles?: AdditionalFile[];
 }

template.nuspectemplate

@@ -23,5 +23,8 @@
     <file src="Squirrel.exe" target="lib\net45\squirrel.exe" />
     <file src="LICENSE" target="lib\net45\LICENSE" />
     <file src="<%- exe %>" target="lib\net45\<%- exe %>" />
+    <% additionalFiles.forEach(function(f) { %>
+    <file src="<%- f.src %>" target="<%- f.target %>" />
+    <% }); %>
   </files>
 </package>