Skip to content

Commit 4ed60c8

Browse files
urban233urban233
committed
Refactor Inno Setup scripts for x86 architecture and update background image paths
1 parent 75b8a77 commit 4ed60c8

File tree

5 files changed

+61
-4
lines changed

5 files changed

+61
-4
lines changed

‎.github/workflows/build_app.yaml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,18 @@ jobs:
6464

6565
- name: Compile .iss file
6666
run: |
67-
iscc os_specific/windows/inno_setup/setup.iss
67+
iscc os_specific/windows/inno_setup/setup_${{ matrix.win_arch }}.iss
68+
69+
- name: Create portable installation
70+
run: |
71+
Compress-Archive -Path ./dist/exe.win-amd64-3.11/* -DestinationPath ./os_specific/dist/PyMOL_Open_source_v3.1.0a0_${{ matrix.win_arch }}_portable.zip
72+
shell: powershell
6873

6974
- name: Upload artifact
7075
uses: actions/upload-artifact@v4
7176
with:
7277
name: Open-Source-PyMOL-Windows-${{ matrix.win_arch }}-Setup
73-
path: ./dist/*.exe
78+
path: ./os_specific/dist/*
7479
# --- end
7580

7681
# ----- macOS build section
@@ -110,7 +115,7 @@ jobs:
110115
with:
111116
dmg_name: 'Open-Source-PyMOL'
112117
src_dir: 'dist/Open-Source-PyMOL-3.1.0a0.app'
113-
bg_filepath: 'os_specific/macos/dmg_bg.png'
118+
bg_filepath: 'os_specific/macos/dmg/bg.png'
114119

115120
- name: Upload artifact
116121
uses: actions/upload-artifact@v4

os_specific/macos/dmg_bg.png renamed to os_specific/macos/dmg/bg.png

File renamed without changes.

os_specific/macos/bg.svg renamed to os_specific/macos/dmg/bg.svg

File renamed without changes.

‎os_specific/windows/inno_setup/setup_x64.iss‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
; Script generated by the Inno Script Studio Wizard.
2+
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
3+
4+
[Setup]
5+
; NOTE: The value of AppId uniquely identifies this application.
6+
; Do not use the same AppId value in installers for other applications.
7+
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
8+
WizardImageFile=compiler:WizClassicImage.bmp
9+
;WizardImageFile=customInnoSetupImage.bmp
10+
AppName=PyMOL-open-source
11+
AppVersion=3.1.0a0
12+
AppCopyright=Hannah Kullik, Schrodinger LLC
13+
AppId={{192F52C3-D86D-4735-9929-C7DF593CB534}
14+
DefaultDirName={userappdata}\PyMOL-Open-Source
15+
AppPublisher=Hannah Kullik
16+
VersionInfoProductName=PyMOL-open-source
17+
MinVersion=10.0.19045
18+
OutputDir=..\..\dist
19+
OutputBaseFilename=PyMOL_Open_source_v3.1.0a0_WINx64_setup
20+
; VersionInfoCopyright=GNU GPL-3.0
21+
DisableDirPage=True
22+
DisableProgramGroupPage=True
23+
DisableReadyPage=True
24+
ArchitecturesInstallIn64BitMode=x64os
25+
WizardStyle=modern
26+
UninstallDisplayName=PyMOL-open-source
27+
UninstallDisplayIcon={app}\assets\logo.ico
28+
LicenseFile=LICENSE.txt
29+
; This is necessary if the setup will exceed 2 GB
30+
DiskSpanning=no
31+
PrivilegesRequired=none
32+
33+
[Languages]
34+
Name: "english"; MessagesFile: "compiler:Default.isl"
35+
36+
[Dirs]
37+
Name: "{app}"
38+
Name: "{app}\assets"
39+
Name: "{app}\bin"
40+
41+
[Files]
42+
Source: "..\..\..\inno-build-release\inno-assets\logo.ico"; DestDir: "{app}\assets"; Flags: ignoreversion recursesubdirs createallsubdirs;
43+
Source: "..\..\..\inno-build-release\inno-sources\*"; DestDir: "{app}\bin"; Flags: ignoreversion recursesubdirs createallsubdirs;
44+
45+
[Icons]
46+
Name: "{commondesktop}\Open-Source PyMOL"; Filename: "{app}\bin\Open-Source-PyMOL.exe"; IconFilename: "{app}\assets\logo.ico"
47+
Name: "{commonstartmenu}\Open-Source PyMOL"; Filename: "{app}\bin\Open-Source-PyMOL.exe"; IconFilename: "{app}\assets\logo.ico"
48+
49+
[Run]
50+
Filename: "{app}\bin\VC_redist.x64.exe"; Parameters: "/quiet /norestart"; Flags: runhidden waituntilterminated
51+
52+
[UninstallDelete]
53+
Type: filesandordirs; Name: "{app}"

os_specific/windows/inno_setup/setup.iss renamed to os_specific/windows/inno_setup/setup_x86.iss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ OutputBaseFilename=PyMOL_Open_source_v3.1.0a0_WINx64_setup
2121
DisableDirPage=True
2222
DisableProgramGroupPage=True
2323
DisableReadyPage=True
24-
ArchitecturesInstallIn64BitMode=x64
2524
WizardStyle=modern
2625
UninstallDisplayName=PyMOL-open-source
2726
UninstallDisplayIcon={app}\assets\logo.ico

0 commit comments

Comments
 (0)