Skip to content

Commit 68f38ab

Browse files
irodushkairodushka
authored
Merge pull request #256 from FirebirdSQL/feature_arm64_win
Feature arm64 win
2 parents cca4a4d + 814960f commit 68f38ab

File tree

6 files changed

+319
-67
lines changed

6 files changed

+319
-67
lines changed

‎.github/workflows/msbuild_arm64.yaml

Lines changed: 11 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -35,32 +35,17 @@ jobs:
3535
with:
3636
msbuild-architecture: arm64
3737

38-
#- name: Install html-help-workshop, sed, innosetup
39-
# run: |
40-
# choco install html-help-workshop
41-
# choco install sed
42-
# choco install innosetup
38+
- name: Install html-help-workshop, sed, innosetup
39+
run: |
40+
choco install html-help-workshop
41+
choco install sed
42+
choco install innosetup
4343
4444
- name: Restore NuGet packages
4545
working-directory: ${{env.GITHUB_WORKSPACE}}
4646
run: nuget restore ${{env.SOLUTION_FILE_PATH}}
4747

48-
- name: Stub
49-
working-directory: ${{env.GITHUB_WORKSPACE}}
50-
run: |
51-
#cd "C:\Program Files (x86)\"
52-
#dir
53-
#env
54-
cd "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\"
55-
dir
56-
57-
#- name: Build win32
58-
# working-directory: ${{env.GITHUB_WORKSPACE}}
59-
# # Add additional options to the MSBuild command line here (like platform or verbosity level).
60-
# # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
61-
# run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:Platform=Win32 ${{env.SOLUTION_FILE_PATH}}
62-
63-
- name: Build x64
48+
- name: Build
6449
working-directory: ${{env.GITHUB_WORKSPACE}}
6550
# Add additional options to the MSBuild command line here (like platform or verbosity level).
6651
# See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
@@ -71,8 +56,7 @@ jobs:
7156
run: |
7257
cd Install\Win32
7358
dir
74-
./MakePackage.bat
75-
./MakePackage.bat WIN32
59+
./MakePackage.bat ARM64
7660
7761
- name: VirusTotal Scan
7862
uses: crazy-max/ghaction-virustotal@v4
@@ -81,8 +65,7 @@ jobs:
8165
#vt_api_key: ${{ secrets.VT_API_KEY }}
8266
vt_api_key: effc35cbb3eb35975d5cf74eee8b75a1a1b12b6af0d66ed2a65cba48becaecc0
8367
files: |
84-
./Install/Win32/install_image/*_Win32.exe
85-
./Install/Win32/install_image/*_x64.exe
68+
./Install/Win32/install_image/*_ARM64.exe
8669
8770
- name: Upload artefacts
8871
run: |
@@ -97,18 +80,11 @@ jobs:
9780
- uses: actions/upload-artifact@v4
9881
id: upload_step2
9982
with:
100-
name: Win32Installer
101-
path: ./Install/Win32/install_image/*_Win32.exe
102-
103-
- uses: actions/upload-artifact@v4
104-
id: upload_step3
105-
with:
106-
name: x64Installer
107-
path: ./Install/Win32/install_image/*_x64.exe
83+
name: ARM64Installer
84+
path: ./Install/Win32/install_image/*_ARM64.exe
10885

10986
- name: Upload results
11087
run: |
11188
echo 'VirusTotalScan: Artifact ID is ${{ steps.upload_step1.outputs.artifact-id }}, URL is ${{ steps.upload_step1.outputs.artifact-url }}'
112-
echo 'Win32Installer: Artifact ID is ${{ steps.upload_step2.outputs.artifact-id }}, URL is ${{ steps.upload_step2.outputs.artifact-url }}'
113-
echo 'x64Installer: Artifact ID is ${{ steps.upload_step3.outputs.artifact-id }}, URL is ${{ steps.upload_step3.outputs.artifact-url }}'
89+
echo 'ARM64Installer: Artifact ID is ${{ steps.upload_step2.outputs.artifact-id }}, URL is ${{ steps.upload_step2.outputs.artifact-url }}'
11490

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
Builds/*/Win32/
22
Builds/*/x64/
3+
Builds/*/ARM/
4+
Builds/*/ARM64/
35
Builds/*/.vs/
46
Install/Win32/install_image/
57
*.suo
@@ -8,3 +10,4 @@ Install/Win32/install_image/
810
*.chm
911
build_*.log
1012
OdbcJdbcSetup_*.iss
13+
.vs/*

‎Builds/MsVc2022.win/OdbcFb.sln

Lines changed: 36 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,36 @@
1-
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio Version 17
3-
VisualStudioVersion = 17.6.33815.320
4-
MinimumVisualStudioVersion = 10.0.40219.1
5-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdbcFb", "OdbcFb.vcxproj", "{C6127398-654D-4196-B8C1-5BB32D75D7FD}"
6-
EndProject
7-
Global
8-
GlobalSection(SolutionConfigurationPlatforms) = preSolution
9-
Debug|Win32 = Debug|Win32
10-
Debug|x64 = Debug|x64
11-
Release|Win32 = Release|Win32
12-
Release|x64 = Release|x64
13-
EndGlobalSection
14-
GlobalSection(ProjectConfigurationPlatforms) = postSolution
15-
{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Debug|Win32.ActiveCfg = Debug|Win32
16-
{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Debug|Win32.Build.0 = Debug|Win32
17-
{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Debug|x64.ActiveCfg = Debug|x64
18-
{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Debug|x64.Build.0 = Debug|x64
19-
{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Release|Win32.ActiveCfg = Release|Win32
20-
{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Release|Win32.Build.0 = Release|Win32
21-
{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Release|x64.ActiveCfg = Release|x64
22-
{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Release|x64.Build.0 = Release|x64
23-
EndGlobalSection
24-
GlobalSection(SolutionProperties) = preSolution
25-
HideSolutionNode = FALSE
26-
EndGlobalSection
27-
GlobalSection(ExtensibilityGlobals) = postSolution
28-
SolutionGuid = {A4C550A6-7D81-4A2D-B5B4-ABBCBD76197E}
29-
EndGlobalSection
30-
EndGlobal
1+
Microsoft Visual Studio Solution File, Format Version 12.00
2+
# Visual Studio Version 17
3+
VisualStudioVersion = 17.6.33815.320
4+
MinimumVisualStudioVersion = 10.0.40219.1
5+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdbcFb", "OdbcFb.vcxproj", "{C6127398-654D-4196-B8C1-5BB32D75D7FD}"
6+
EndProject
7+
Global
8+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
9+
Debug|ARM64 = Debug|ARM64
10+
Debug|Win32 = Debug|Win32
11+
Debug|x64 = Debug|x64
12+
Release|ARM64 = Release|ARM64
13+
Release|Win32 = Release|Win32
14+
Release|x64 = Release|x64
15+
EndGlobalSection
16+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
17+
{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Debug|ARM64.ActiveCfg = Debug|ARM64
18+
{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Debug|ARM64.Build.0 = Debug|ARM64
19+
{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Debug|Win32.ActiveCfg = Debug|Win32
20+
{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Debug|Win32.Build.0 = Debug|Win32
21+
{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Debug|x64.ActiveCfg = Debug|x64
22+
{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Debug|x64.Build.0 = Debug|x64
23+
{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Release|ARM64.ActiveCfg = Release|ARM64
24+
{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Release|ARM64.Build.0 = Release|ARM64
25+
{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Release|Win32.ActiveCfg = Release|Win32
26+
{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Release|Win32.Build.0 = Release|Win32
27+
{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Release|x64.ActiveCfg = Release|x64
28+
{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Release|x64.Build.0 = Release|x64
29+
EndGlobalSection
30+
GlobalSection(SolutionProperties) = preSolution
31+
HideSolutionNode = FALSE
32+
EndGlobalSection
33+
GlobalSection(ExtensibilityGlobals) = postSolution
34+
SolutionGuid = {A4C550A6-7D81-4A2D-B5B4-ABBCBD76197E}
35+
EndGlobalSection
36+
EndGlobal

0 commit comments

Comments
 (0)