Browse Source

IOS-1482 Call generation from engine target, BUT state output files.

IOS-1482
Dirk Zimmermann 3 years ago
parent
commit
96927fb680
2 changed files with 35 additions and 103 deletions
  1. +0
    -10
      build-mac/generate_sync_files.sh
  2. +35
    -93
      build-mac/pEpEngine.xcodeproj/project.pbxproj

+ 0
- 10
build-mac/generate_sync_files.sh View File

@ -1,10 +0,0 @@
#!/bin/bash
export LANG=en_US.UTF-8
mkdir -p "$BUILT_PRODUCTS_DIR/include"
cd "$SRCROOT/.."
bash -l -c "gmake -C sync"
bash -l -c "gmake -C asn.1 Sync.c"

+ 35
- 93
build-mac/pEpEngine.xcodeproj/project.pbxproj View File

@ -163,13 +163,6 @@
remoteGlobalIDString = 644297BE1BE11C65002BC73B;
remoteInfo = pEpTrustWords;
};
43D47AF5225DE95100E97C5B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 64796A371B455AA5004B1C24 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 43D47AEE225DE7B700E97C5B;
remoteInfo = pEpGenerateSync;
};
64289E321B8B630200FC617B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 64DA24121B832EBA000BEE80 /* libetpan.xcodeproj */;
@ -731,23 +724,6 @@
};
/* End PBXHeadersBuildPhase section */
/* Begin PBXLegacyTarget section */
43D47AEE225DE7B700E97C5B /* pEpGenerateSync */ = {
isa = PBXLegacyTarget;
buildArgumentsString = "$(ACTION)";
buildConfigurationList = 43D47AEF225DE7B700E97C5B /* Build configuration list for PBXLegacyTarget "pEpGenerateSync" */;
buildPhases = (
);
buildToolPath = "$(SRCROOT)/generate_sync_files.sh";
buildWorkingDirectory = "$(SRCROOT)/..";
dependencies = (
);
name = pEpGenerateSync;
passBuildSettingsInEnvironment = 1;
productName = pEpGenerateSync;
};
/* End PBXLegacyTarget section */
/* Begin PBXNativeTarget section */
644297BE1BE11C65002BC73B /* pEpTrustWords */ = {
isa = PBXNativeTarget;
@ -771,6 +747,7 @@
isa = PBXNativeTarget;
buildConfigurationList = 64796A531B455AA5004B1C24 /* Build configuration list for PBXNativeTarget "pEpEngine" */;
buildPhases = (
43D47B08225DEBD600E97C5B /* ShellScript */,
64796A3B1B455AA5004B1C24 /* Sources */,
64796A3C1B455AA5004B1C24 /* Frameworks */,
64796A3D1B455AA5004B1C24 /* CopyFiles */,
@ -780,7 +757,6 @@
);
dependencies = (
43D47AA1225CC82400E97C5B /* PBXTargetDependency */,
43D47AF6225DE95100E97C5B /* PBXTargetDependency */,
645922541B8BD53F00A5AF93 /* PBXTargetDependency */,
64289E3F1B8B638800FC617B /* PBXTargetDependency */,
);
@ -798,11 +774,6 @@
LastUpgradeCheck = 0940;
ORGANIZATIONNAME = "p≡p Security S.A.";
TargetAttributes = {
43D47AEE225DE7B700E97C5B = {
CreatedOnToolsVersion = 10.2;
DevelopmentTeam = NQLYU6MGPN;
ProvisioningStyle = Automatic;
};
644297BE1BE11C65002BC73B = {
CreatedOnToolsVersion = 7.1;
};
@ -836,7 +807,6 @@
targets = (
64796A3E1B455AA5004B1C24 /* pEpEngine */,
644297BE1BE11C65002BC73B /* pEpTrustWords */,
43D47AEE225DE7B700E97C5B /* pEpGenerateSync */,
);
};
/* End PBXProject section */
@ -884,6 +854,40 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
43D47B08225DEBD600E97C5B /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
outputFileListPaths = (
);
outputPaths = (
"$(SRCROOT)/../asn.1/xer_encoder.c",
"$(SRCROOT)/../asn.1/xer_decoder.c",
"$(SRCROOT)/../asn.1/xer_support.c",
"$(SRCROOT)/../src/sync_impl.c",
"$(SRCROOT)/../src/sync_codec.c",
"$(SRCROOT)/../src/sync_actions.c",
"$(SRCROOT)/../asn.1/per_support.c",
"$(SRCROOT)/../asn.1/per_opentype.c",
"$(SRCROOT)/../asn.1/per_encoder.c",
"$(SRCROOT)/../asn.1/per_decoder.c",
"$(SRCROOT)/../asn.1/pdu_collection.c",
"$(SRCROOT)/../asn.1/der_encoder.c",
"$(SRCROOT)/../asn.1/constraints.c",
"$(SRCROOT)/../asn.1/constr_TYPE.c",
"$(SRCROOT)/../asn.1/constr_SET_OF.c",
"$(SRCROOT)/../asn.1/constr_SEQUENCE_OF.c",
"$(SRCROOT)/../asn.1/constr_SEQUENCE.c",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
shellScript = "export LANG=en_US.UTF-8\nmkdir -p \"$BUILT_PRODUCTS_DIR/include\"\n\ncd \"$SRCROOT/..\"\n\nbash -l -c \"gmake -C sync\"\nbash -l -c \"gmake -C asn.1 Sync.c\"\n";
};
644297C61BE11D00002BC73B /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@ -1005,11 +1009,6 @@
target = 644297BE1BE11C65002BC73B /* pEpTrustWords */;
targetProxy = 43D47AA0225CC82400E97C5B /* PBXContainerItemProxy */;
};
43D47AF6225DE95100E97C5B /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 43D47AEE225DE7B700E97C5B /* pEpGenerateSync */;
targetProxy = 43D47AF5225DE95100E97C5B /* PBXContainerItemProxy */;
};
64289E3F1B8B638800FC617B /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "libetpan ios";
@ -1023,54 +1022,6 @@
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */
43D47AF0225DE7B700E97C5B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Automatic;
DEBUGGING_SYMBOLS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = NQLYU6MGPN;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
OTHER_CFLAGS = "";
OTHER_LDFLAGS = "";
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
43D47AF1225DE7B700E97C5B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Automatic;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = NQLYU6MGPN;
GCC_C_LANGUAGE_STANDARD = gnu11;
MTL_FAST_MATH = YES;
OTHER_CFLAGS = "";
OTHER_LDFLAGS = "";
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
};
644297C31BE11C65002BC73B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@ -1250,15 +1201,6 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
43D47AEF225DE7B700E97C5B /* Build configuration list for PBXLegacyTarget "pEpGenerateSync" */ = {
isa = XCConfigurationList;
buildConfigurations = (
43D47AF0225DE7B700E97C5B /* Debug */,
43D47AF1225DE7B700E97C5B /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
644297C21BE11C65002BC73B /* Build configuration list for PBXNativeTarget "pEpTrustWords" */ = {
isa = XCConfigurationList;
buildConfigurations = (


Loading…
Cancel
Save