Fix gen scripts. Change default arch for macos application. (#901)
* Fix gen scripts. Change default arch for macos application. * Add combine script for combine arm and x86_64 libs. * - Update Mac version for release - Update branch with main [skip ci] --------- Co-authored-by: OmarHatem <omarh.ismail1@gmail.com>
mkyq committed
May 1, 2023 at 09:36 UTC
b2c603a47b127cb5eb48d3a600f77b08a36666aa
6 files changed
+25
-12
macos/Podfile.lock
+1
-1
@@ -103,7 +103,7 @@ EXTERNAL SOURCES:
103
104
SPEC CHECKSUMS:
105
connectivity_macos: 5dae6ee11d320fac7c05f0d08bd08fc32b5514d9
106
- cw_monero: f8b7f104508efba2591548e76b5c058d05cba3f0
106
+ cw_monero: ec03de55a19c4a2b174ea687e0f4202edc716fa4
107
device_info_plus: 5401765fde0b8d062a2f8eb65510fb17e77cf07f
108
devicelocale: 9f0f36ac651cabae2c33f32dcff4f32b61c38225
109
flutter_secure_storage_macos: 6ceee8fbc7f484553ad17f79361b556259df89aa
macos/Runner.xcodeproj/project.pbxproj
+3
-3
@@ -423,7 +423,7 @@
423
isa = XCBuildConfiguration;
424
baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */;
425
buildSettings = {
426
- ARCHS = arm64;
426
+ ARCHS = "$(ARCHS_STANDARD)";
427
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
428
CLANG_ENABLE_MODULES = YES;
429
CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
@@ -557,7 +557,7 @@
557
isa = XCBuildConfiguration;
558
baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */;
559
buildSettings = {
560
- ARCHS = arm64;
560
+ ARCHS = "$(ARCHS_STANDARD)";
561
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
562
CLANG_ENABLE_MODULES = YES;
563
CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
@@ -585,7 +585,7 @@
585
isa = XCBuildConfiguration;
586
baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */;
587
buildSettings = {
588
- ARCHS = arm64;
588
+ ARCHS = "$(ARCHS_STANDARD)";
589
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
590
CLANG_ENABLE_MODULES = YES;
591
CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements;
scripts/macos/app_env.sh
+2
-2
@@ -15,8 +15,8 @@ if [ -n "$1" ]; then
15
fi
16
17
CAKEWALLET_NAME="Cake Wallet"
18
-CAKEWALLET_VERSION="1.0.2"
19
-CAKEWALLET_BUILD_NUMBER=18
18
+CAKEWALLET_VERSION="1.0.3"
19
+CAKEWALLET_BUILD_NUMBER=20
20
CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
21
22
if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then
scripts/macos/combine.sh
new
+17
@@ -0,0 +1,17 @@
1
+#!/bin/sh
2
+
3
+. ./config.sh
4
+
5
+cd $EXTERNAL_DIR
6
+mkdir -p $EXTERNAL_MACOS_LIB_DIR
7
+
8
+EXTERNAL_DIR_MACOS_ARM=${EXTERNAL_DIR}/macos-arm/lib
9
+EXTERNAL_DIR_MACOS_X86_64=${EXTERNAL_DIR}/macos-x86_64/lib
10
+
11
+LIBS=(libboost.a libcrypto.a libssl.a libsodium.a libunbound.a libmonero.a)
12
+
13
+for lib in ${LIBS[@]}; do
14
+ echo ${EXTERNAL_DIR_MACOS_ARM}/$lib
15
+ echo ${EXTERNAL_DIR_MACOS_X86_64}/$lib
16
+ lipo -create -arch arm64 ${EXTERNAL_DIR_MACOS_ARM}/$lib -arch x86_64 ${EXTERNAL_DIR_MACOS_X86_64}/$lib -output ${EXTERNAL_MACOS_LIB_DIR}/$lib;
17
+done
\ No newline at end of file
scripts/macos/gen_common.sh
+1
-5
@@ -15,13 +15,9 @@ gen_podspec() {
15
gen_project() {
16
ARCH=$1
17
CW_DIR="`pwd`/../../macos/Runner.xcodeproj"
18
- BASE_FILENAME="project_base.pbxproj"
19
- BASE_FILE_PATH="${CW_DIR}/${BASE_FILENAME}"
18
DEFAULT_FILENAME="project.pbxproj"
19
DEFAULT_FILE_PATH="${CW_DIR}/${DEFAULT_FILENAME}"
22
- rm -f $DEFAULT_FILE_PATH
23
- cp $BASE_FILE_PATH $DEFAULT_FILE_PATH
24
- sed -i '' "s/ARCHS =.*/ARCHS = ${ARCH};/g" $DEFAULT_FILE_PATH
20
+ sed -i '' "s/ARCHS =.*/ARCHS = \"${ARCH}\";/g" $DEFAULT_FILE_PATH
21
}
22
23
gen() {
scripts/macos/gen_universal.sh
+1
-1
@@ -2,4 +2,4 @@
2
3
. ./gen_common.sh
4
5
-gen "arm64, x86_64"
\ No newline at end of file
5
+gen "\$(ARCHS_STANDARD)"
\ No newline at end of file