Skip to content

Commit 524dcda

Browse files
authoredDec 9, 2024
Merge pull request #179 from ItsEeleeya/next-windows
Fixes for Windows, cross-platform copy, system theme...
2 parents 1473e0b + b8ee00f commit 524dcda

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1233
-1062
lines changed
 

‎.github/prebuild.js

+24-32
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { fileURLToPath } from "node:url";
44
import { exec as execCb } from "node:child_process";
55
import { env } from "node:process";
66
import { promisify } from "node:util";
7+
import { createTauriPlatformConfigs } from "../apps/desktop/scripts/prepare";
78

89
const exec = promisify(execCb);
910
const signId = env.APPLE_SIGNING_IDENTITY || "-";
@@ -63,40 +64,31 @@ rustflags = [
6364
throw e;
6465
});
6566

66-
await fs.writeFile(
67-
`${srcTauri}/tauri.macos.conf.json`,
68-
JSON.stringify(
69-
{
70-
bundle: {
71-
macOS: {
72-
frameworks: [path.join(nativeDeps, "Spacedrive.framework")],
73-
},
74-
},
67+
createTauriPlatformConfigs("darwin", {
68+
bundle: {
69+
macOS: {
70+
frameworks: [path.join(nativeDeps, "Spacedrive.framework")],
7571
},
76-
null,
77-
4
78-
)
79-
);
72+
},
73+
});
8074
} else if (os === "windows") {
81-
const binFiles = await fs.readdir(path.join(nativeDeps, "bin"));
82-
83-
await fs.writeFile(
84-
`${srcTauri}/tauri.windows.conf.json`,
85-
JSON.stringify(
86-
{
87-
bundle: {
88-
resources: binFiles.filter(
89-
(f) =>
90-
f.endsWith(".dll") && (f.startsWith("av") || f.startsWith("sw"))
91-
),
92-
},
93-
},
94-
null,
95-
4
96-
)
97-
);
98-
99-
console.log();
75+
// const binFiles = await fs.readdir(path.join(nativeDeps, "bin"));
76+
77+
// await fs.writeFile(
78+
// `${srcTauri}/tauri.windows.conf.json`,
79+
// JSON.stringify(
80+
// {
81+
// bundle: {
82+
// resources: binFiles.filter(
83+
// (f) =>
84+
// f.endsWith(".dll") && (f.startsWith("av") || f.startsWith("sw"))
85+
// ),
86+
// },
87+
// },
88+
// null,
89+
// 4
90+
// )
91+
// );
10092
}
10193
}
10294

0 commit comments

Comments
 (0)