Merge branch 'release_6.0.0' into req-file-cleanup

SasView · Apr 19, 2024 · 32e8642 · 32e8642
2 parents a0db0e9 + 8bf5873
commit 32e8642
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -195,14 +195,8 @@ jobs:
       ### Build the installer (if enabled)
 
       - name: Install utilities to build installer
-        if: ${{ matrix.installer && startsWith(matrix.os, 'windows') }}
-        run: |
-          python -m pip install pyinstaller==5.13.2
-
-      - name: Install utilities to build installer
-        if: ${{ matrix.installer && !startsWith(matrix.os, 'windows') }}
         run: |
-          python -m pip install pyinstaller==6.3.0
+          python -m pip install pyinstaller
 
       - name: Build sasview with pyinstaller
         if: ${{ matrix.installer }}

diff --git a/installers/installer.iss b/installers/installer.iss
@@ -26,7 +26,7 @@ UsedUserAreasWarning=no
 LicenseFile=license.txt
 ArchitecturesInstallIn64BitMode=x64
 OutputBaseFilename=setupSasView
-SetupIconFile=dist\sasview\images\ball.ico
+SetupIconFile=dist\sasview\_internal\images\ball.ico
 
 
 ; Uncomment the following line to run in non administrative install mode (install for current user only.)
@@ -56,7 +56,8 @@ end;
 [Files]
 Source: "dist\sasview\sasview.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "dist\sasview\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "dist\sasview\plugin_models\*"; DestDir: "{%USERPROFILE}\.sasview\plugin_models"
+Source: "dist\sasview\_internal\plugin_models\*"; DestDir: "{%USERPROFILE}\.sasview\plugin_models"
+Source: "dist\sasview\_internal\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 
 [Icons]
 Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon