Fix Windows 32bit package contents

story-apps · Feb 6, 2022 · 3d846bf · 3d846bf
1 parent 01f93a4
commit 3d846bf
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/build_starc_app.yml b/.github/workflows/build_starc_app.yml
@@ -111,7 +111,7 @@ jobs:
         run: |
           cd build/windows
           ./make-exe_64.sh ${{env.APP_VERSION}}
-          
+
       - name: Sign app executables
         uses: skymatic/code-sign-action@v1
         with:
@@ -127,7 +127,7 @@ jobs:
         with:
           arguments: "/V3"
           script-file: "build/windows/starc_64.nsi"
-          
+
       - name: Sign installer
         uses: skymatic/code-sign-action@v1
         with:
@@ -200,7 +200,7 @@ jobs:
         run: |
           cd build/windows
           ./make-exe_32.sh ${{env.APP_VERSION}}
-          
+
       - name: Sign app executables
         uses: skymatic/code-sign-action@v1
         with:
@@ -216,7 +216,7 @@ jobs:
         with:
           arguments: "/V3"
           script-file: "build/windows/starc_32.nsi"
-          
+
       - name: Sign installer
         uses: skymatic/code-sign-action@v1
         with:
@@ -239,7 +239,7 @@ jobs:
           path: |
             build/windows/starc-setup-32.exe
             build/windows/starc-32.zip
-            
+
   build_mac:
     name: Build Mac OS X version
     runs-on: macos-11

diff --git a/build/windows/make-exe_32.sh b/build/windows/make-exe_32.sh
@@ -7,6 +7,8 @@
 # Rename result file to choosing version and architecture
 #
 
+ls "$VCToolsRedistDir/x86/"
+2
 #
 # $1 - application version
 #
@@ -64,8 +66,7 @@ cp $Qt5_Dir/plugins/sqldrivers/qsqlite.dll $EXE_APP_DIR/sqldrivers/
 cp /c/Program\ Files\ \(x86\)/OpenSSL-Win32/*.dll $EXE_APP_DIR
 #
 # Copy msvc lib
-#                                               
-cp /c/Windows/System32/msvcp140.dll $EXE_APP_DIR    
-cp /c/Windows/System32/msvcp140_1.dll $EXE_APP_DIR
-cp /c/Windows/System32/vcruntime140.dll $EXE_APP_DIR   
-cp /c/Windows/System32/vcruntime140_1.dll $EXE_APP_DIR
+#
+cp "$VCToolsRedistDir/x86/Microsoft.VC142.CRT/msvcp140.dll" $EXE_APP_DIR
+cp "$VCToolsRedistDir/x86/Microsoft.VC142.CRT/msvcp140_1.dll" $EXE_APP_DIR
+cp "$VCToolsRedistDir/x86/Microsoft.VC142.CRT/vcruntime140.dll" $EXE_APP_DIR
diff --git a/build/windows/make-exe_64.sh b/build/windows/make-exe_64.sh
@@ -65,7 +65,6 @@ cp /c/Program\ Files/OpenSSL-Win64/*.dll $EXE_APP_DIR
 #
 # Copy msvc lib
 #
-cp /c/Windows/System32/msvcp140.dll $EXE_APP_DIR
-cp /c/Windows/System32/msvcp140_1.dll $EXE_APP_DIR
-cp /c/Windows/System32/vcruntime140.dll $EXE_APP_DIR
-cp /c/Windows/System32/vcruntime140_1.dll $EXE_APP_DIR
+cp "$VCToolsRedistDir/x64/Microsoft.VC142.CRT/msvcp140.dll" $EXE_APP_DIR
+cp "$VCToolsRedistDir/x64/Microsoft.VC142.CRT/msvcp140_1.dll" $EXE_APP_DIR
+cp "$VCToolsRedistDir/x64/Microsoft.VC142.CRT/vcruntime140.dll" $EXE_APP_DIR