Skip to content

Commit

Permalink
✨ feat: Add patch for tauri.conf.json
Browse files Browse the repository at this point in the history
  • Loading branch information
caoccao committed Aug 25, 2024
1 parent 9e01414 commit 8eb9dcf
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 0 deletions.
19 changes: 19 additions & 0 deletions .github/workflows/windows_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,18 @@ jobs:
cd MediaInfoLib\Project\MSVC2022
msbuild MediaInfoLib.sln -t:rebuild -verbosity:diag -property:Configuration=Release -property:Platform=x64
- name: Copy DLLs
run: |
cd ..
copy /y MediaInfoLib\Project\MSVC2022\x64\Release\MediaInfo.dll BetterMediaInfo\src-tauri\
copy /y ${{ env.SystemRoot }}\System32\msvp140.dll BetterMediaInfo\src-tauri\
copy /y ${{ env.SystemRoot }}\System32\vcruntime140.dll BetterMediaInfo\src-tauri\
copy /y ${{ env.SystemRoot }}\System32\vcruntime140_1.dll BetterMediaInfo\src-tauri\
- name: Patch tauri.conf.json
run: |
git apply < src-tauri\patches\tauri.conf.json.patch
- name: Build Better Media Info
run: |
pnpm install
Expand All @@ -87,3 +99,10 @@ jobs:
name: Better_Media_Info-windows-x86_64-${{ env.BETTER_MEDIA_INFO_VERSION }}-msi
path: |
src-tauri/target/release/bundle/msi/*.msi
- name: Upload the nsis
uses: actions/upload-artifact@v4
with:
name: Better_Media_Info-windows-x86_64-${{ env.BETTER_MEDIA_INFO_VERSION }}-nsis
path: |
src-tauri/target/release/bundle/nsis/*.exe
17 changes: 17 additions & 0 deletions src-tauri/patches/tauri.conf.json.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 8559245..a26699f 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -71,6 +71,12 @@
"icons/icon.icns",
"icons/icon.ico"
],
+ "resources": [
+ "MediaInfo.dll",
+ "msvcp140.dll",
+ "vcruntime140.dll",
+ "vcruntime140_1.dll"
+ ],
"windows": {
"webviewInstallMode": {
"type": "downloadBootstrapper"

0 comments on commit 8eb9dcf

Please sign in to comment.