Browse Source

IOSAD-213 fixes: iOS artefacts not coied to build/. ObjCTypeUtils not found at runtime.

IOSAD-213
Andreas Buff 11 months ago
parent
commit
37375d9f38
2 changed files with 36 additions and 8 deletions
  1. +2
    -2
      Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj/project.pbxproj
  2. +34
    -6
      pEpObjCAdapter.xcodeproj/project.pbxproj

+ 2
- 2
Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj/project.pbxproj View File

@ -498,7 +498,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "CUSTOM_BUILD_DIR=${PROJECT_DIR}/build\nmkdir -p ${CUSTOM_BUILD_DIR}\necho \"{BUILD_DIR}: ${BUILD_DIR}\"\ncp -R \"${BUILD_DIR}/${CONFIGURATION}/usr/local/include\" ${CUSTOM_BUILD_DIR}\ncp \"${BUILD_DIR}/${CONFIGURATION}/libPEPObjCAdapterTypes_macOS.a\" ${CUSTOM_BUILD_DIR}\n";
shellScript = "CUSTOM_BUILD_DIR=${PROJECT_DIR}/build\nmkdir -p ${CUSTOM_BUILD_DIR}\n\ncp -R \"${BUILD_DIR}/${CONFIGURATION}/usr/local/include\" ${CUSTOM_BUILD_DIR}\ncp \"${BUILT_PRODUCTS_DIR}/libPEPObjCAdapterTypes_macOS.a\" ${CUSTOM_BUILD_DIR}\n";
};
4E5758F8268371B10084F02D /* Copy artefacts to custom build dir */ = {
isa = PBXShellScriptBuildPhase;
@ -516,7 +516,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "CUSTOM_BUILD_DIR=${PROJECT_DIR}/build\nmkdir -p ${CUSTOM_BUILD_DIR}\necho \"{BUILD_DIR}: ${BUILD_DIR}\"\nREAL_BUILD_DIR=${BUILD_DIR}/${CONFIGURATION}${EFFECTIVE_PLATFORM_NAME}\necho \"{REAL_BUILD_DIR}: ${REAL_BUILD_DIR}\"\ncp -R \"${REAL_BUILD_DIR}/usr/local/include\" ${CUSTOM_BUILD_DIR}\ncp \"${REAL_BUILD_DIR}/libPEPObjCAdapterTypes_iOS.a\" ${CUSTOM_BUILD_DIR}\n";
shellScript = "CUSTOM_BUILD_DIR=${PROJECT_DIR}/build\nmkdir -p ${CUSTOM_BUILD_DIR}\necho \"{BUILD_DIR}: ${BUILD_DIR}\"\n\ncp -R \"${BUILT_PRODUCTS_DIR}/usr/local/include\" ${CUSTOM_BUILD_DIR}\ncp \"${BUILT_PRODUCTS_DIR}/libPEPObjCAdapterTypes_iOS.a\" ${CUSTOM_BUILD_DIR}\n";
};
/* End PBXShellScriptBuildPhase section */


+ 34
- 6
pEpObjCAdapter.xcodeproj/project.pbxproj View File

@ -103,6 +103,8 @@
1552D98F257660C900A92F71 /* PEPAutoPointer.h in Headers */ = {isa = PBXBuildFile; fileRef = 434ED6D4207E27B8000A7590 /* PEPAutoPointer.h */; };
1552D990257660C900A92F71 /* PEPPassphraseCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 43589EF624A4A3B70079BEA2 /* PEPPassphraseCache.m */; };
1585EB762698955800B822E1 /* libPEPObjCAdapter_iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1543DC66257943CE0041EFB5 /* libPEPObjCAdapter_iOS.a */; platformFilter = ios; };
1585EC7E269C45A100B822E1 /* libPEPObjCTypeUtils_iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1585EC52269C38FB00B822E1 /* libPEPObjCTypeUtils_iOS.a */; };
1585EC7F269C45AC00B822E1 /* libPEPObjCTypeUtils_macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1585EC50269C38FB00B822E1 /* libPEPObjCTypeUtils_macOS.a */; };
15921D89261CB474003346B7 /* system.db in Resources */ = {isa = PBXBuildFile; fileRef = 15921D87261CB474003346B7 /* system.db */; };
159C009925BB13F700F13E2B /* NSArray+Take.m in Sources */ = {isa = PBXBuildFile; fileRef = 43209B271ECC2ACD007E7E2E /* NSArray+Take.m */; };
159C00A525BB140F00F13E2B /* NSNumber+PEPRating.m in Sources */ = {isa = PBXBuildFile; fileRef = 435665CB2080A6CB00EC5B10 /* NSNumber+PEPRating.m */; };
@ -185,6 +187,20 @@
remoteGlobalIDString = 1585EB3D2698636C00B822E1;
remoteInfo = PEPObjCTypeUtils_iOS;
};
1585EC7A269C458700B822E1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1585EB15269861D700B822E1 /* PEPObjCTypeUtils.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 1585EB3C2698636C00B822E1;
remoteInfo = PEPObjCTypeUtils_iOS;
};
1585EC7C269C459300B822E1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1585EB15269861D700B822E1 /* PEPObjCTypeUtils.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 1585EA7B26984C4300B822E1;
remoteInfo = PEPObjCTypeUtils_macOS;
};
15A32462260E2A23009D07EB /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 64DA243B1B833248000BEE80 /* pEpEngine.xcodeproj */;
@ -430,6 +446,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
1585EC7E269C45A100B822E1 /* libPEPObjCTypeUtils_iOS.a in Frameworks */,
436B444E26838437002624AB /* libPEPObjCAdapterTypes_iOS.a in Frameworks */,
430D78E02681E19000B12650 /* libPEPObjCAdapterProtocols_iOS.a in Frameworks */,
436DDE162640210800B88D66 /* pEpIOSToolboxForExtensions.framework in Frameworks */,
@ -442,6 +459,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
1585EC7F269C45AC00B822E1 /* libPEPObjCTypeUtils_macOS.a in Frameworks */,
4E5758F5268371440084F02D /* libPEPObjCAdapterTypes_macOS.a in Frameworks */,
1500C92E264BD9BD001FD417 /* libPEPToolbox_macOS.a in Frameworks */,
1543D9E02577EF260041EFB5 /* libpEpEngine_macOS.a in Frameworks */,
@ -803,6 +821,7 @@
buildRules = (
);
dependencies = (
1585EC7B269C458700B822E1 /* PBXTargetDependency */,
43D44C7C2685B96200638D1C /* PBXTargetDependency */,
430D78E22681E1CF00B12650 /* PBXTargetDependency */,
15A32465260E2A33009D07EB /* PBXTargetDependency */,
@ -824,6 +843,7 @@
buildRules = (
);
dependencies = (
1585EC7D269C459300B822E1 /* PBXTargetDependency */,
15A32463260E2A23009D07EB /* PBXTargetDependency */,
4EA8EB0926860BEF00B44B01 /* PBXTargetDependency */,
4E57580F26821A660084F02D /* PBXTargetDependency */,
@ -1033,7 +1053,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "CUSTOM_BUILD_DIR=${PROJECT_DIR}/build\nmkdir -p ${CUSTOM_BUILD_DIR}\necho \"{BUILD_DIR}: ${BUILD_DIR}\"\nREAL_BUILD_DIR=${BUILD_DIR}/${CONFIGURATION}${EFFECTIVE_PLATFORM_NAME}\necho \"{REAL_BUILD_DIR}: ${REAL_BUILD_DIR}\"\ncp -R \"${REAL_BUILD_DIR}/usr/local/include\" ${CUSTOM_BUILD_DIR}\ncp \"${REAL_BUILD_DIR}/libPEPObjCAdapter_iOS.a\" ${CUSTOM_BUILD_DIR}\ncp \"${REAL_BUILD_DIR}/libPEPObjCAdapterTypes_iOS.a\" ${CUSTOM_BUILD_DIR}\n";
shellScript = "CUSTOM_BUILD_DIR=${PROJECT_DIR}/build\nmkdir -p ${CUSTOM_BUILD_DIR}\n\ncp -R \"${BUILT_PRODUCTS_DIR}/usr/local/include\" ${CUSTOM_BUILD_DIR}\ncp \"${BUILT_PRODUCTS_DIR}/libPEPObjCAdapter_iOS.a\" ${CUSTOM_BUILD_DIR}\ncp \"${BUILT_PRODUCTS_DIR}/libPEPObjCAdapterTypes_iOS.a\" ${CUSTOM_BUILD_DIR}\n";
};
1543D9262577E3920041EFB5 /* Copy artefacts to custom build dir */ = {
isa = PBXShellScriptBuildPhase;
@ -1051,7 +1071,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "CUSTOM_BUILD_DIR=${PROJECT_DIR}/build\nmkdir -p ${CUSTOM_BUILD_DIR}\necho \"{BUILD_DIR}: ${BUILD_DIR}\"\ncp -R \"${BUILD_DIR}/${CONFIGURATION}/usr/local/include\" ${CUSTOM_BUILD_DIR}\ncp \"${BUILD_DIR}/${CONFIGURATION}/libPEPObjCAdapter_macOS.a\" ${CUSTOM_BUILD_DIR}\ncp \"${BUILD_DIR}/${CONFIGURATION}/libPEPObjCAdapterTypes_macOS.a\" ${CUSTOM_BUILD_DIR}\n";
shellScript = "CUSTOM_BUILD_DIR=${PROJECT_DIR}/build\nmkdir -p ${CUSTOM_BUILD_DIR}\n\ncp -R \"${BUILT_PRODUCTS_DIR}/usr/local/include\" ${CUSTOM_BUILD_DIR}\ncp \"${BUILT_PRODUCTS_DIR}/libPEPObjCAdapter_macOS.a\" ${CUSTOM_BUILD_DIR}\ncp \"${BUILT_PRODUCTS_DIR}/libPEPObjCAdapterTypes_macOS.a\" ${CUSTOM_BUILD_DIR}\n";
};
/* End PBXShellScriptBuildPhase section */
@ -1138,6 +1158,16 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
1585EC7B269C458700B822E1 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = PEPObjCTypeUtils_iOS;
targetProxy = 1585EC7A269C458700B822E1 /* PBXContainerItemProxy */;
};
1585EC7D269C459300B822E1 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = PEPObjCTypeUtils_macOS;
targetProxy = 1585EC7C269C459300B822E1 /* PBXContainerItemProxy */;
};
15A32463260E2A23009D07EB /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = pEpEngine_macOS;
@ -1204,7 +1234,6 @@
IPHONEOS_DEPLOYMENT_TARGET = "${inherited}";
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = "1,2";
@ -1233,7 +1262,6 @@
);
IPHONEOS_DEPLOYMENT_TARGET = "${inherited}";
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = "1,2";
@ -1271,7 +1299,6 @@
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = "";
OTHER_LIBTOOLFLAGS = "";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
@ -1310,7 +1337,6 @@
);
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = "";
OTHER_LIBTOOLFLAGS = "";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
@ -1370,6 +1396,7 @@
LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/../Sequoia4iOS/build/lib";
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-ObjC";
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
VALID_ARCHS = "arm64 x86_64";
@ -1421,6 +1448,7 @@
LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/../Sequoia4iOS/build/lib";
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = "-ObjC";
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
VALIDATE_PRODUCT = YES;


Loading…
Cancel
Save