erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-10-13 17:37:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge pull request #1926 from keymanapp/ios-fix-validation-in-build

Browse source 
[ios] Fix validation issues in build
This commit is contained in:
Marc Durdin 2019-08-03 08:20:03 +10:00 • committed by GitHub
commit f80fe54cc8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj
View file

@ -933,7 +933,6 @@
C06D37271F81F4E100F61AE0 /* Frameworks */,
C06D37281F81F4E100F61AE0 /* Headers */,
C06D37291F81F4E100F61AE0 /* Resources */,
9A0FC9FE22D66DF300D33F86 /* ShellScript */,
);
buildRules = (
);
@ -1074,28 +1073,6 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
9A0FC9FE22D66DF300D33F86 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"$(SRCROOT)/../../Carthage/Build/iOS/Reachability.framework",
"$(SRCROOT)/../../Carthage/Build/iOS/DeviceKit.framework",
);
outputFileListPaths = (
);
outputPaths = (
"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Reachability.framework",
"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/DeviceKit.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "echo \"-- Carthage copy-frameworks Begin --\"\n/usr/local/bin/carthage copy-frameworks\necho \"-- Carthage copy-frameworks End --\"\n";
showEnvVarsInLog = 0;
};
C06D37C61F82364E00F61AE0 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@ -1558,7 +1535,7 @@
INFOPLIST_FILE = KeymanEngine/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks @executable_path/Frameworks/KeymanEngine.framework/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks @executable_path/../../Frameworks";
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = org.sil.Keyman.ios.Engine;
@ -1606,7 +1583,7 @@
INFOPLIST_FILE = KeymanEngine/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks @executable_path/Frameworks/KeymanEngine.framework/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks @executable_path/../../Frameworks";
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = org.sil.Keyman.ios.Engine;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";

2
ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj
View file

@ -1049,12 +1049,14 @@
"$(SRCROOT)/../../Carthage/Build/iOS/ObjcExceptionBridging.framework",
"$(SRCROOT)/../../Carthage/Build/iOS/XCGLogger.framework",
"$(SRCROOT)/../../Carthage/Build/iOS/DeviceKit.framework",
"$(SRCROOT)/../../Carthage/Build/iOS/Reachability.framework",
);
outputPaths = (
"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Zip.framework",
"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/ObjcExceptionBridging.framework",
"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/XCGLogger.framework",
"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/DeviceKit.framework",
"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Reachability.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;