Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2024-12-22 11:39:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix gen scripts. Change default arch for macos application. (#901)

Browse source 
* 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>
This commit is contained in:
mkyq 2023-05-01 09:36:46 -04:00 committed by GitHub
parent 367efb3cae
commit b2c603a47b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
macos/Podfile.lock
View file

@ -103,7 +103,7 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS: SPEC CHECKSUMS:
connectivity_macos: 5dae6ee11d320fac7c05f0d08bd08fc32b5514d9 connectivity_macos: 5dae6ee11d320fac7c05f0d08bd08fc32b5514d9
cw_monero: f8b7f104508efba2591548e76b5c058d05cba3f0 cw_monero: ec03de55a19c4a2b174ea687e0f4202edc716fa4
device_info_plus: 5401765fde0b8d062a2f8eb65510fb17e77cf07f device_info_plus: 5401765fde0b8d062a2f8eb65510fb17e77cf07f
devicelocale: 9f0f36ac651cabae2c33f32dcff4f32b61c38225 devicelocale: 9f0f36ac651cabae2c33f32dcff4f32b61c38225
flutter_secure_storage_macos: 6ceee8fbc7f484553ad17f79361b556259df89aa flutter_secure_storage_macos: 6ceee8fbc7f484553ad17f79361b556259df89aa

6
macos/Runner.xcodeproj/project.pbxproj
View file

@ -423,7 +423,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */;
buildSettings = { buildSettings = {
ARCHS = arm64; ARCHS = "$(ARCHS_STANDARD)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
@ -557,7 +557,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */;
buildSettings = { buildSettings = {
ARCHS = arm64; ARCHS = "$(ARCHS_STANDARD)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
@ -585,7 +585,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */;
buildSettings = { buildSettings = {
ARCHS = arm64; ARCHS = "$(ARCHS_STANDARD)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements;

4
scripts/macos/app_env.sh
View file

@ -15,8 +15,8 @@ if [ -n "$1" ]; then
fi fi
CAKEWALLET_NAME="Cake Wallet" CAKEWALLET_NAME="Cake Wallet"
CAKEWALLET_VERSION="1.0.2" CAKEWALLET_VERSION="1.0.3"
CAKEWALLET_BUILD_NUMBER=18 CAKEWALLET_BUILD_NUMBER=20
CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet" CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then

17
scripts/macos/combine.sh Executable file
View file

@ -0,0 +1,17 @@
#!/bin/sh
. ./config.sh
cd $EXTERNAL_DIR
mkdir -p $EXTERNAL_MACOS_LIB_DIR
EXTERNAL_DIR_MACOS_ARM=${EXTERNAL_DIR}/macos-arm/lib
EXTERNAL_DIR_MACOS_X86_64=${EXTERNAL_DIR}/macos-x86_64/lib
LIBS=(libboost.a libcrypto.a libssl.a libsodium.a libunbound.a libmonero.a)
for lib in ${LIBS[@]}; do
echo ${EXTERNAL_DIR_MACOS_ARM}/$lib
echo ${EXTERNAL_DIR_MACOS_X86_64}/$lib
lipo -create -arch arm64 ${EXTERNAL_DIR_MACOS_ARM}/$lib -arch x86_64 ${EXTERNAL_DIR_MACOS_X86_64}/$lib -output ${EXTERNAL_MACOS_LIB_DIR}/$lib;
done

6
scripts/macos/gen_common.sh
View file

@ -15,13 +15,9 @@ gen_podspec() {
gen_project() { gen_project() {
ARCH=$1 ARCH=$1
CW_DIR="`pwd`/../../macos/Runner.xcodeproj" CW_DIR="`pwd`/../../macos/Runner.xcodeproj"
BASE_FILENAME="project_base.pbxproj"
BASE_FILE_PATH="${CW_DIR}/${BASE_FILENAME}"
DEFAULT_FILENAME="project.pbxproj" DEFAULT_FILENAME="project.pbxproj"
DEFAULT_FILE_PATH="${CW_DIR}/${DEFAULT_FILENAME}" DEFAULT_FILE_PATH="${CW_DIR}/${DEFAULT_FILENAME}"
rm -f $DEFAULT_FILE_PATH sed -i '' "s/ARCHS =.*/ARCHS = \"${ARCH}\";/g" $DEFAULT_FILE_PATH
cp $BASE_FILE_PATH $DEFAULT_FILE_PATH
sed -i '' "s/ARCHS =.*/ARCHS = ${ARCH};/g" $DEFAULT_FILE_PATH
} }
gen() { gen() {

2
scripts/macos/gen_universal.sh
View file

@ -2,4 +2,4 @@
. ./gen_common.sh . ./gen_common.sh
gen "arm64, x86_64" gen "\$(ARCHS_STANDARD)"