Skip to content

Commit e8effdc

Browse files
Peter-SimpsonPeter-Simpson
committed
Fix bugs introduced when adding support for Windows ARM64.
1 parent 5b633e9 commit e8effdc

2 files changed

Lines changed: 34 additions & 28 deletions

File tree

‎Setup/ConformU.iss‎

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ AppSupportURL={#MyAppSupportURL}
4040
AppUpdatesURL={#MyAppUpdatesURL}
4141
AppVerName={#MyAppName}
4242
AppVersion={#MyAppVersion}
43-
ArchitecturesInstallIn64BitMode=x64
43+
ArchitecturesInstallIn64BitMode=x64 arm64
4444
Compression=lzma2/max
4545
DefaultDirName={autopf}\ASCOM\ConformU
4646
DefaultGroupName=ASCOMConformUniversal
@@ -96,23 +96,29 @@ Name: "turkish"; MessagesFile: "compiler:Languages\Turkish.isl"
9696
Name: "ukrainian"; MessagesFile: "compiler:Languages\Ukrainian.isl"
9797

9898
[Files]
99-
; 64bit OS - Install the 64bit app
100-
Source: "..\publish\ConformU64\*.exe"; DestDir: "{app}"; Flags: ignoreversion signonce; Check: Is64BitInstallMode
101-
Source: "..\publish\ConformU64\*.dll"; DestDir: "{app}"; Flags: ignoreversion signonce; Check: Is64BitInstallMode
102-
Source: "..\publish\ConformU64\*"; DestDir: "{app}"; Flags: ignoreversion; Excludes:"*.exe,*.dll"; Check: Is64BitInstallMode
103-
Source: "..\publish\ConformU64\wwwroot\*"; DestDir: "{app}\wwwroot"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: Is64BitInstallMode
104-
105-
; 64bit OS - Install the 32bit app
106-
Source: "..\publish\ConformU86\*.exe"; DestDir: "{app}\32bit"; Flags: ignoreversion signonce; Check: Is64BitInstallMode
107-
Source: "..\publish\ConformU86\*.dll"; DestDir: "{app}\32bit"; Flags: ignoreversion signonce; Check: Is64BitInstallMode
108-
Source: "..\publish\ConformU86\*"; DestDir: "{app}\32bit"; Flags: ignoreversion; Excludes:"*.exe,*.dll"; Check: Is64BitInstallMode
109-
Source: "..\publish\ConformU86\wwwroot\*"; DestDir: "{app}\32bit\wwwroot"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: Is64BitInstallMode
110-
111-
; 32bit OS - Install the 32bit app
112-
Source: "..\publish\ConformU86\*.exe"; DestDir: "{app}"; Flags: ignoreversion signonce; Check: not Is64BitInstallMode
113-
Source: "..\publish\ConformU86\*.dll"; DestDir: "{app}"; Flags: ignoreversion signonce; Check: not Is64BitInstallMode
114-
Source: "..\publish\ConformU86\*"; DestDir: "{app}"; Flags: ignoreversion; Excludes:"*.exe,*.dll"; Check: not Is64BitInstallMode
115-
Source: "..\publish\ConformU86\wwwroot\*"; DestDir: "{app}\wwwroot"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: not Is64BitInstallMode
99+
; ARM 64bit OS - Install the 64bit app
100+
Source: "..\publish\ConformUArm64\*.exe"; DestDir: "{app}"; Flags: ignoreversion signonce; Check: Is64BitInstallMode and IsARM64
101+
Source: "..\publish\ConformUArm64\*.dll"; DestDir: "{app}"; Flags: ignoreversion signonce; Check: Is64BitInstallMode and IsARM64
102+
Source: "..\publish\ConformUArm64\*"; DestDir: "{app}"; Flags: ignoreversion; Excludes:"*.exe,*.dll"; Check: Is64BitInstallMode and IsARM64
103+
Source: "..\publish\ConformUArm64\wwwroot\*"; DestDir: "{app}\wwwroot"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: Is64BitInstallMode and IsARM64
104+
105+
; Intel 64bit OS - Install the 64bit app
106+
Source: "..\publish\ConformUx64\*.exe"; DestDir: "{app}"; Flags: ignoreversion signonce; Check: Is64BitInstallMode and IsX64
107+
Source: "..\publish\ConformUx64\*.dll"; DestDir: "{app}"; Flags: ignoreversion signonce; Check: Is64BitInstallMode and IsX64
108+
Source: "..\publish\ConformUx64\*"; DestDir: "{app}"; Flags: ignoreversion; Excludes:"*.exe,*.dll"; Check: Is64BitInstallMode and IsX64
109+
Source: "..\publish\ConformUx64\wwwroot\*"; DestDir: "{app}\wwwroot"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: Is64BitInstallMode and IsX64
110+
111+
; Intel 64bit OS - Install the 32bit app
112+
Source: "..\publish\ConformUx86\*.exe"; DestDir: "{app}\32bit"; Flags: ignoreversion signonce; Check: Is64BitInstallMode
113+
Source: "..\publish\ConformUx86\*.dll"; DestDir: "{app}\32bit"; Flags: ignoreversion signonce; Check: Is64BitInstallMode
114+
Source: "..\publish\ConformUx86\*"; DestDir: "{app}\32bit"; Flags: ignoreversion; Excludes:"*.exe,*.dll"; Check: Is64BitInstallMode
115+
Source: "..\publish\ConformUx86\wwwroot\*"; DestDir: "{app}\32bit\wwwroot"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: Is64BitInstallMode
116+
117+
; Intel 32bit OS - Install the 32bit app
118+
Source: "..\publish\ConformUx86\*.exe"; DestDir: "{app}"; Flags: ignoreversion signonce; Check: IsX86 and not Is64BitInstallMode
119+
Source: "..\publish\ConformUx86\*.dll"; DestDir: "{app}"; Flags: ignoreversion signonce; Check: IsX86 and not Is64BitInstallMode
120+
Source: "..\publish\ConformUx86\*"; DestDir: "{app}"; Flags: ignoreversion; Excludes:"*.exe,*.dll"; Check: IsX86 and not Is64BitInstallMode
121+
Source: "..\publish\ConformUx86\wwwroot\*"; DestDir: "{app}\wwwroot"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: IsX86 and not Is64BitInstallMode
116122

117123
[Icons]
118124
Name: "{autoprograms}\ASCOM Conform Universal"; Filename: "{app}\{#MyAppExeName}"; IconFilename: "{app}\ASCOM.ico"

‎publish.cmd‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,43 +14,43 @@ MSBuild ConformU.sln /p:Configuration=Debug /p:Platform="Any CPU" /t:Rebuild
1414
echo *** Completed Build
1515

1616
echo *** Publishing MacOS Intel silicon
17-
dotnet publish -c Debug -p:Platform="Any CPU" -r osx-x64 --framework net8.0 --self-contained true /p:PublishTrimmed=false -p:PublishSingleFile=true -p:PublishReadyToRunShowWarnings=true
18-
bsdtar -cJf publish/conformu.macos-x64.tar.xz -C ConformU\bin\Debug\net 8.0\osx-x64\publish\ *
17+
dotnet publish -c Debug -p:Platform="Any CPU" -r osx-x64 --framework net8.0 --self-contained true /p:PublishTrimmed=false -p:PublishSingleFile=true -p:PublishReadyToRunShowWarnings=true
18+
bsdtar -cJf publish/conformu.macos-x64.tar.xz -C ConformU\bin\Debug\net8.0\osx-x64\publish\ *
1919
echo *** Completed MacOS Intel silicon
2020

2121
echo *** Publishing MacOS Apple silicon
2222
dotnet publish -c Debug -p:Platform="Any CPU" -r osx-arm64 --framework net8.0 --self-contained true /p:PublishTrimmed=false -p:PublishSingleFile=true
23-
bsdtar -cJf publish/conformu.macos-arm64.tar.xz -C ConformU\bin\Debug\net 8.0\osx-arm64\publish\ *
23+
bsdtar -cJf publish/conformu.macos-arm64.tar.xz -C ConformU\bin\Debug\net8.0\osx-arm64\publish\ *
2424
echo *** Completed MacOS Apple silicon
2525

2626
echo *** Publishing Linux ARM32
2727
dotnet publish -c Debug /p:Platform="Any CPU" -r linux-arm --framework net8.0 --self-contained true /p:PublishTrimmed=false /p:PublishSingleFile=true
28-
bsdtar -cJf publish/conformu.linux-arm32.needsexec.tar.xz -C ConformU\bin\Debug\net 8.0\linux-arm\publish\ *
28+
bsdtar -cJf publish/conformu.linux-arm32.needsexec.tar.xz -C ConformU\bin\Debug\net8.0\linux-arm\publish\ *
2929
echo *** Completed Linux ARM32
3030

3131
echo *** Publishing Linux ARM64
3232
dotnet publish -c Debug /p:Platform="Any CPU" -r linux-arm64 --framework net8.0 --self-contained true /p:PublishTrimmed=false /p:PublishSingleFile=true
33-
bsdtar -cJf publish/conformu.linux-arm64.needsexec.tar.xz -C ConformU\bin\Debug\net 8.0\linux-arm64\publish\ *
33+
bsdtar -cJf publish/conformu.linux-arm64.needsexec.tar.xz -C ConformU\bin\Debug\net8.0\linux-arm64\publish\ *
3434
echo *** Completed Linux ARM64
3535

3636
echo *** Publishing Linux X64
3737
dotnet publish -c Debug /p:Platform="Any CPU" -r linux-x64 --framework net8.0 --self-contained true /p:PublishTrimmed=false /p:PublishSingleFile=true
38-
bsdtar -cJf publish/conformu.linux-x64.needsexec.tar.xz -C ConformU\bin\Debug\net 8.0\linux-x64\publish\ *
38+
bsdtar -cJf publish/conformu.linux-x64.needsexec.tar.xz -C ConformU\bin\Debug\net8.0\linux-x64\publish\ *
3939
echo *** Completed Linux X64
4040

4141
echo *** Publishing Windows ARM 64bit
42-
dotnet publish ConformU/ConformU.csproj -c Debug /p:Platform="Any CPU" -r win-arm64 --framework net8.0-windows --self-contained true /p:PublishTrimmed=false /p:PublishSingleFile=true -o ./publish/ConformU64/
42+
dotnet publish ConformU/ConformU.csproj -c Debug /p:Platform="Any CPU" -r win-arm64 --framework net8.0-windows --self-contained true /p:PublishTrimmed=false /p:PublishSingleFile=true -o ./publish/ConformUArm64/
4343
echo *** Completed 64bit publish
4444

4545
echo *** Publishing Windows Intel 64bit
46-
dotnet publish ConformU/ConformU.csproj -c Debug /p:Platform="Any CPU" -r win-x64 --framework net8.0-windows --self-contained true /p:PublishTrimmed=false /p:PublishSingleFile=true -o ./publish/ConformU64/
46+
dotnet publish ConformU/ConformU.csproj -c Debug /p:Platform="Any CPU" -r win-x64 --framework net8.0-windows --self-contained true /p:PublishTrimmed=false /p:PublishSingleFile=true -o ./publish/ConformUx64/
4747
echo *** Completed 64bit publish
4848

4949
echo *** Publishing Windows Intel 32bit
50-
dotnet publish ConformU/ConformU.csproj -c Debug /p:Platform="Any CPU" -r win-x86 --framework net8.0-windows --self-contained true /p:PublishTrimmed=false /p:PublishSingleFile=true -o ./publish/ConformU86/
50+
dotnet publish ConformU/ConformU.csproj -c Debug /p:Platform="Any CPU" -r win-x86 --framework net8.0-windows --self-contained true /p:PublishTrimmed=false /p:PublishSingleFile=true -o ./publish/ConformUx86/
5151
echo *** Completed 32bit publish
5252

53-
editbin /LARGEADDRESSAWARE ./publish/ConformU86/Conformu.exe
53+
editbin /LARGEADDRESSAWARE ./publish/ConformUx86/Conformu.exe
5454
echo *** Completed setting large address aware flag on 32bit EXE
5555

5656
echo *** Creating Windows installer

0 commit comments

Comments
 (0)