Rearrange install patches, no duplicate files

MSP-Greg · Jul 6, 2024 · b0d377e · b0d377e
1 parent 843cb35
commit b0d377e
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 20 deletions.
diff --git a/1_0_build_install_mswin.ps1 b/1_0_build_install_mswin.ps1
@@ -35,7 +35,8 @@ $files = 'C:/Windows/System32/libcrypto-1_1-x64.dll',
 
 Files-Hide $files
 
-Run-Patches @('mswin_patches')
+Run-Patches @('patches_install_all')
+Run-Patches @('patches_install_mswin')
 
 Create-Folders
 

diff --git a/1_0_build_install_msys2_64.ps1 b/1_0_build_install_msys2_64.ps1
@@ -139,7 +139,8 @@ $files = "$d_msys2$env:MINGW_PREFIX/lib/libz.dll.a",
 
 Files-Hide $files
 
-Run-Patches @('msys2_patches')
+Run-Patches @('patches_install_all')
+Run-Patches @('patches_install_msys2')
 
 Create-Folders
 

diff --git a/mswin_patches/_install_lib-mkmf.rb.patch b/mswin_patches/_install_lib-mkmf.rb.patch
diff --git a/msys2_patches/_install_lib-mkmf.rb.patch → ...es_install_all/_install_lib-mkmf.rb.patch b/msys2_patches/_install_lib-mkmf.rb.patch → ...es_install_all/_install_lib-mkmf.rb.patch
diff --git a/mswin_patches/prelude.rb-ssl.patch → patches_install_mswin/prelude.rb-ssl.patch b/mswin_patches/prelude.rb-ssl.patch → patches_install_mswin/prelude.rb-ssl.patch
diff --git a/mswin_patches/win32-setup.mak.patch → patches_install_mswin/win32-setup.mak.patch b/mswin_patches/win32-setup.mak.patch → patches_install_mswin/win32-setup.mak.patch
diff --git a/...ll_directory-as-an-alternative-to-f.patch → ...ll_directory-as-an-alternative-to-f.patch b/...ll_directory-as-an-alternative-to-f.patch → ...ll_directory-as-an-alternative-to-f.patch
diff --git a/...atches/_install_win32-ruby.manifest.patch → ..._msys2/_install_win32-ruby.manifest.patch b/...atches/_install_win32-ruby.manifest.patch → ..._msys2/_install_win32-ruby.manifest.patch