Browse Source

IOSAD-213 fixes: absolut path used for dependency. Also removes obsolete dependencies.

IOSAD-213
Andreas Buff 11 months ago
parent
commit
69cc33a027
4 changed files with 14 additions and 182 deletions
  1. +1
    -32
      Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj/project.pbxproj
  2. +13
    -84
      Subprojects/PEPObjCTypeUtils/PEPObjCTypeUtils.xcodeproj/project.pbxproj
  3. +0
    -52
      pEpObjCAdapter.xcodeproj/project.pbxproj
  4. +0
    -14
      pEpObjCAdapter.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapter_macOS.xcscheme

+ 1
- 32
Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj/project.pbxproj View File

@ -64,13 +64,6 @@
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
1585EB13269861CE00B822E1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1585EB0D269861CE00B822E1 /* PEPObjCTypeUtils.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 1585EA7C26984C4300B822E1;
remoteInfo = PEPObjCTypeUtils_macOS;
};
4E5758D726836A0C0084F02D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 4E575836268328CD0084F02D /* Project object */;
@ -106,7 +99,7 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
1585EB0D269861CE00B822E1 /* PEPObjCTypeUtils.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PEPObjCTypeUtils.xcodeproj; path = ../../../PEPObjCTypeUtils/PEPObjCTypeUtils.xcodeproj; sourceTree = "<group>"; };
1585EB0D269861CE00B822E1 /* PEPObjCTypeUtils.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PEPObjCTypeUtils.xcodeproj; path = ../PEPObjCTypeUtils/PEPObjCTypeUtils.xcodeproj; sourceTree = "<group>"; };
43D44C832685BE4300638D1C /* module.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
4E575841268328CD0084F02D /* PEPObjCAdapterTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPObjCAdapterTypes.h; sourceTree = "<group>"; };
4E575843268328CD0084F02D /* PEPObjCAdapterTypes.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPObjCAdapterTypes.m; sourceTree = "<group>"; };
@ -174,14 +167,6 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
1585EB0E269861CE00B822E1 /* Products */ = {
isa = PBXGroup;
children = (
1585EB14269861CE00B822E1 /* libPEPObjCTypeUtils_macOS.a */,
);
name = Products;
sourceTree = "<group>";
};
4E575835268328CD0084F02D = {
isa = PBXGroup;
children = (
@ -446,12 +431,6 @@
mainGroup = 4E575835268328CD0084F02D;
productRefGroup = 4E57583F268328CD0084F02D /* Products */;
projectDirPath = "";
projectReferences = (
{
ProductGroup = 1585EB0E269861CE00B822E1 /* Products */;
ProjectRef = 1585EB0D269861CE00B822E1 /* PEPObjCTypeUtils.xcodeproj */;
},
);
projectRoot = "";
targets = (
4E575857268329170084F02D /* PEPObjCAdapterTypes_macOS */,
@ -461,16 +440,6 @@
};
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
1585EB14269861CE00B822E1 /* libPEPObjCTypeUtils_macOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libPEPObjCTypeUtils_macOS.a;
remoteRef = 1585EB13269861CE00B822E1 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
/* Begin PBXResourcesBuildPhase section */
4E5758BD26833D140084F02D /* Resources */ = {
isa = PBXResourcesBuildPhase;


+ 13
- 84
Subprojects/PEPObjCTypeUtils/PEPObjCTypeUtils.xcodeproj/project.pbxproj View File

@ -25,41 +25,6 @@
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
1585EC56269C39D800B822E1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1585EC53269C39D800B822E1 /* pEpEngine.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 64796A3E1B455AA5004B1C24;
remoteInfo = pEpEngine;
};
1585EC5C269C39D800B822E1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1585EC53269C39D800B822E1 /* pEpEngine.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 64796A3F1B455AA5004B1C24;
remoteInfo = pEpEngine;
};
1585EC5E269C39D800B822E1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1585EC53269C39D800B822E1 /* pEpEngine.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 1552DB112577D4F100A92F71;
remoteInfo = pEpEngine_macOS;
};
1585EC60269C39D800B822E1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1585EC53269C39D800B822E1 /* pEpEngine.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 644297BF1BE11C65002BC73B;
remoteInfo = pEpTrustWords;
};
1585EC62269C39E000B822E1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1585EC53269C39D800B822E1 /* pEpEngine.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 1552DB102577D4F100A92F71;
remoteInfo = pEpEngine_macOS;
};
1585EC67269C39ED00B822E1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1585EC64269C39ED00B822E1 /* PEPObjCAdapterTypes.xcodeproj */;
@ -137,6 +102,13 @@
remoteGlobalIDString = 4E5758BF26833D140084F02D;
remoteInfo = PEPObjCAdapterTypesTests_iOS;
};
1585ECC3269C5A0800B822E1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1585EACB269850B400B822E1 /* pEpEngine.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 1552DB102577D4F100A92F71;
remoteInfo = pEpEngine_macOS;
};
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
@ -164,7 +136,6 @@
1585EB3D2698636C00B822E1 /* libPEPObjCTypeUtils_iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPEPObjCTypeUtils_iOS.a; sourceTree = BUILT_PRODUCTS_DIR; };
1585EBC12698A8FC00B822E1 /* PEPObjCTypeUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PEPObjCTypeUtils.h; sourceTree = "<group>"; };
1585EBC22698A8FC00B822E1 /* PEPObjCTypeUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PEPObjCTypeUtils.m; sourceTree = "<group>"; };
1585EC53269C39D800B822E1 /* pEpEngine.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = pEpEngine.xcodeproj; path = "/Users/buff/workspace/pEp/src_pEp4iOS/pEpEngine/build-mac/pEpEngine.xcodeproj"; sourceTree = "<absolute>"; };
1585EC64269C39ED00B822E1 /* PEPObjCAdapterTypes.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PEPObjCAdapterTypes.xcodeproj; path = /Users/buff/workspace/pEp/src_pEp4iOS/pEpObjCAdapter/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj; sourceTree = "<absolute>"; };
/* End PBXFileReference section */
@ -194,7 +165,6 @@
1585EA7E26984C4300B822E1 /* PEPObjCTypeUtils */,
1585EA7D26984C4300B822E1 /* Products */,
1585EADB269850C700B822E1 /* Frameworks */,
1585EC53269C39D800B822E1 /* pEpEngine.xcodeproj */,
1585EC64269C39ED00B822E1 /* PEPObjCAdapterTypes.xcodeproj */,
);
sourceTree = "<group>";
@ -246,16 +216,6 @@
name = Frameworks;
sourceTree = "<group>";
};
1585EC54269C39D800B822E1 /* Products */ = {
isa = PBXGroup;
children = (
1585EC5D269C39D800B822E1 /* libpEpEngine.a */,
1585EC5F269C39D800B822E1 /* libpEpEngine_macOS.a */,
1585EC61269C39D800B822E1 /* pEpTrustWords.bundle */,
);
name = Products;
sourceTree = "<group>";
};
1585EC65269C39ED00B822E1 /* Products */ = {
isa = PBXGroup;
children = (
@ -326,8 +286,8 @@
buildRules = (
);
dependencies = (
1585ECC4269C5A0800B822E1 /* PBXTargetDependency */,
1585EC73269C39F700B822E1 /* PBXTargetDependency */,
1585EC63269C39E000B822E1 /* PBXTargetDependency */,
);
name = PEPObjCTypeUtils_macOS;
productName = PEPObjCTypeUtils;
@ -348,7 +308,6 @@
);
dependencies = (
1585EC68269C39ED00B822E1 /* PBXTargetDependency */,
1585EC57269C39D800B822E1 /* PBXTargetDependency */,
);
name = PEPObjCTypeUtils_iOS;
productName = PEPObjCTypeUtils_iOS;
@ -387,10 +346,6 @@
ProductGroup = 1585EC8A269C51EC00B822E1 /* Products */;
ProjectRef = 1585EACB269850B400B822E1 /* pEpEngine.xcodeproj */;
},
{
ProductGroup = 1585EC54269C39D800B822E1 /* Products */;
ProjectRef = 1585EC53269C39D800B822E1 /* pEpEngine.xcodeproj */;
},
{
ProductGroup = 1585EC65269C39ED00B822E1 /* Products */;
ProjectRef = 1585EC64269C39ED00B822E1 /* PEPObjCAdapterTypes.xcodeproj */;
@ -409,27 +364,6 @@
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
1585EC5D269C39D800B822E1 /* libpEpEngine.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libpEpEngine.a;
remoteRef = 1585EC5C269C39D800B822E1 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
1585EC5F269C39D800B822E1 /* libpEpEngine_macOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libpEpEngine_macOS.a;
remoteRef = 1585EC5E269C39D800B822E1 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
1585EC61269C39D800B822E1 /* pEpTrustWords.bundle */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = pEpTrustWords.bundle;
remoteRef = 1585EC60269C39D800B822E1 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
1585EC6D269C39ED00B822E1 /* libPEPObjCAdapterTypes_macOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
@ -560,16 +494,6 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
1585EC57269C39D800B822E1 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = pEpEngine;
targetProxy = 1585EC56269C39D800B822E1 /* PBXContainerItemProxy */;
};
1585EC63269C39E000B822E1 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = pEpEngine_macOS;
targetProxy = 1585EC62269C39E000B822E1 /* PBXContainerItemProxy */;
};
1585EC68269C39ED00B822E1 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = PEPObjCAdapterTypes_iOS;
@ -580,6 +504,11 @@
name = PEPObjCAdapterTypes_macOS;
targetProxy = 1585EC72269C39F700B822E1 /* PBXContainerItemProxy */;
};
1585ECC4269C5A0800B822E1 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = pEpEngine_macOS;
targetProxy = 1585ECC3269C5A0800B822E1 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */


+ 0
- 52
pEpObjCAdapter.xcodeproj/project.pbxproj View File

@ -201,20 +201,6 @@
remoteGlobalIDString = 1585EA7B26984C4300B822E1;
remoteInfo = PEPObjCTypeUtils_macOS;
};
15A32462260E2A23009D07EB /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 64DA243B1B833248000BEE80 /* pEpEngine.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 1552DB102577D4F100A92F71;
remoteInfo = pEpEngine_macOS;
};
15A32464260E2A33009D07EB /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 64DA243B1B833248000BEE80 /* pEpEngine.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 64796A3E1B455AA5004B1C24;
remoteInfo = pEpEngine;
};
430D78DE2681E13300B12650 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 4EEB4CC92680E56A00161040 /* PEPObjCAdapterProtocols.xcodeproj */;
@ -250,13 +236,6 @@
remoteGlobalIDString = 4E5758BF26833D140084F02D;
remoteInfo = PEPObjCAdapterTypesTests_iOS;
};
43D44C7B2685B96200638D1C /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 436B444126837F78002624AB /* PEPObjCAdapterTypes.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 4E575864268329A20084F02D;
remoteInfo = PEPObjCAdapterTypes_iOS;
};
4E23E6F52681C8AF00B8F4C2 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 4EEB4CC92680E56A00161040 /* PEPObjCAdapterProtocols.xcodeproj */;
@ -271,13 +250,6 @@
remoteGlobalIDString = 4E23E6E52681C7CD00B8F4C2;
remoteInfo = PEPObjCAdapterProtocols_macOS;
};
4EA8EB0826860BEF00B44B01 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 436B444126837F78002624AB /* PEPObjCAdapterTypes.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 4E575857268329170084F02D;
remoteInfo = PEPObjCAdapterTypes_macOS;
};
64289E551B8B70E800FC617B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 64DA243B1B833248000BEE80 /* pEpEngine.xcodeproj */;
@ -822,9 +794,7 @@
);
dependencies = (
1585EC7B269C458700B822E1 /* PBXTargetDependency */,
43D44C7C2685B96200638D1C /* PBXTargetDependency */,
430D78E22681E1CF00B12650 /* PBXTargetDependency */,
15A32465260E2A33009D07EB /* PBXTargetDependency */,
);
name = PEPObjCAdapter_iOS;
productName = PEPObjCAdapter_iOS;
@ -844,8 +814,6 @@
);
dependencies = (
1585EC7D269C459300B822E1 /* PBXTargetDependency */,
15A32463260E2A23009D07EB /* PBXTargetDependency */,
4EA8EB0926860BEF00B44B01 /* PBXTargetDependency */,
4E57580F26821A660084F02D /* PBXTargetDependency */,
);
name = PEPObjCAdapter_macOS;
@ -1168,36 +1136,16 @@
name = PEPObjCTypeUtils_macOS;
targetProxy = 1585EC7C269C459300B822E1 /* PBXContainerItemProxy */;
};
15A32463260E2A23009D07EB /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = pEpEngine_macOS;
targetProxy = 15A32462260E2A23009D07EB /* PBXContainerItemProxy */;
};
15A32465260E2A33009D07EB /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = pEpEngine;
targetProxy = 15A32464260E2A33009D07EB /* PBXContainerItemProxy */;
};
430D78E22681E1CF00B12650 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = PEPObjCAdapterProtocols_iOS;
targetProxy = 430D78E12681E1CF00B12650 /* PBXContainerItemProxy */;
};
43D44C7C2685B96200638D1C /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = PEPObjCAdapterTypes_iOS;
targetProxy = 43D44C7B2685B96200638D1C /* PBXContainerItemProxy */;
};
4E57580F26821A660084F02D /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = PEPObjCAdapterProtocols_macOS;
targetProxy = 4E57580E26821A660084F02D /* PBXContainerItemProxy */;
};
4EA8EB0926860BEF00B44B01 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = PEPObjCAdapterTypes_macOS;
targetProxy = 4EA8EB0826860BEF00B44B01 /* PBXContainerItemProxy */;
};
64415E401BE95B2000F6CBB2 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = pEpTrustWords;


+ 0
- 14
pEpObjCAdapter.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapter_macOS.xcscheme View File

@ -34,20 +34,6 @@
ReferencedContainer = "container:../pep-toolbox/pEpIOSToolbox.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1552DB102577D4F100A92F71"
BuildableName = "libpEpEngine_macOS.a"
BlueprintName = "pEpEngine_macOS"
ReferencedContainer = "container:../pEpEngine/build-mac/pEpEngine.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"


Loading…
Cancel
Save