Skip to content

Commit

Permalink
Merge pull request #179 from ItsEeleeya/next-windows
Browse files Browse the repository at this point in the history
Fixes for Windows, cross-platform copy, system theme...
  • Loading branch information
Brendonovich authored Dec 9, 2024
2 parents 1473e0b + b8ee00f commit 524dcda
Show file tree
Hide file tree
Showing 47 changed files with 1,233 additions and 1,062 deletions.
56 changes: 24 additions & 32 deletions .github/prebuild.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { fileURLToPath } from "node:url";
import { exec as execCb } from "node:child_process";
import { env } from "node:process";
import { promisify } from "node:util";
import { createTauriPlatformConfigs } from "../apps/desktop/scripts/prepare";

const exec = promisify(execCb);
const signId = env.APPLE_SIGNING_IDENTITY || "-";
Expand Down Expand Up @@ -63,40 +64,31 @@ rustflags = [
throw e;
});

await fs.writeFile(
`${srcTauri}/tauri.macos.conf.json`,
JSON.stringify(
{
bundle: {
macOS: {
frameworks: [path.join(nativeDeps, "Spacedrive.framework")],
},
},
createTauriPlatformConfigs("darwin", {
bundle: {
macOS: {
frameworks: [path.join(nativeDeps, "Spacedrive.framework")],
},
null,
4
)
);
},
});
} else if (os === "windows") {
const binFiles = await fs.readdir(path.join(nativeDeps, "bin"));

await fs.writeFile(
`${srcTauri}/tauri.windows.conf.json`,
JSON.stringify(
{
bundle: {
resources: binFiles.filter(
(f) =>
f.endsWith(".dll") && (f.startsWith("av") || f.startsWith("sw"))
),
},
},
null,
4
)
);

console.log();
// const binFiles = await fs.readdir(path.join(nativeDeps, "bin"));

// await fs.writeFile(
// `${srcTauri}/tauri.windows.conf.json`,
// JSON.stringify(
// {
// bundle: {
// resources: binFiles.filter(
// (f) =>
// f.endsWith(".dll") && (f.startsWith("av") || f.startsWith("sw"))
// ),
// },
// },
// null,
// 4
// )
// );
}
}

Expand Down
Loading

1 comment on commit 524dcda

@vercel
Copy link

@vercel vercel bot commented on 524dcda Dec 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.