Skip to content

Commit b9ee7a7

Browse files
committed
Fix #8334 - MacOS ARM version requires Rosetta.
1 parent df94a7b commit b9ee7a7

File tree

3 files changed

+22
-1
lines changed

3 files changed

+22
-1
lines changed

builds/install/arch-specific/darwin/Distribution.xml renamed to builds/install/arch-specific/darwin/Distribution-arm64.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<license file="License.txt" mime-type="text/plain"/>
66
<readme file="Readme.txt" mime-type="text/plain"/>
77
<pkg-ref id="com.firebirdsql.Firebird"/>
8+
<options hostArchitectures="arm64"/>
89
<options customize="never" require-scripts="false"/>
910
<choices-outline>
1011
<line choice="default">
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="utf-8" standalone="no"?>
2+
<installer-gui-script minSpecVersion="1">
3+
<title>Firebird Database Server</title>
4+
<welcome file="Welcome.txt" mime-type="text/plain"/>
5+
<license file="License.txt" mime-type="text/plain"/>
6+
<readme file="Readme.txt" mime-type="text/plain"/>
7+
<pkg-ref id="com.firebirdsql.Firebird"/>
8+
<options hostArchitectures="x86_64"/>
9+
<options customize="never" require-scripts="false"/>
10+
<choices-outline>
11+
<line choice="default">
12+
<line choice="com.firebirdsql.Firebird"/>
13+
</line>
14+
</choices-outline>
15+
<choice id="default"/>
16+
<choice id="com.firebirdsql.Firebird" visible="false">
17+
<pkg-ref id="com.firebirdsql.Firebird"/>
18+
</choice>
19+
<pkg-ref id="com.firebirdsql.Firebird" version="4.0.0" onConclusion="none">Firebird.pkg</pkg-ref>
20+
</installer-gui-script>

builds/install/arch-specific/darwin/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ package_firebird:
5858
$(ROOT)/gen/$(TARGET)/resources/Readme.txt
5959
cp ../builds/install/arch-specific/darwin/License.txt \
6060
$(ROOT)/gen/$(TARGET)/resources/License.txt
61-
cp ../builds/install/arch-specific/darwin/Distribution.xml \
61+
cp ../builds/install/arch-specific/darwin/Distribution-$(CpuType).xml \
6262
$(ROOT)/gen/$(TARGET)/Distribution.xml
6363

6464
rm -fr $(TARGET)/packages

0 commit comments

Comments
 (0)