Browse Source

IOS-2882 Nettle 4 macOS and iconv 4 iOS works

IOS-2882
Andreas Buff 3 months ago
parent
commit
cbc970fbf9
3 changed files with 286 additions and 10 deletions
  1. +152
    -10
      CommonPEPDependencies/CommonPEPDependencies.xcodeproj/project.pbxproj
  2. +67
    -0
      CommonPEPDependencies/CommonPEPDependencies.xcodeproj/xcshareddata/xcschemes/build_libiconv_iOS.xcscheme
  3. +67
    -0
      CommonPEPDependencies/CommonPEPDependencies.xcodeproj/xcshareddata/xcschemes/build_nettle_macOS.xcscheme

+ 152
- 10
CommonPEPDependencies/CommonPEPDependencies.xcodeproj/project.pbxproj View File

@ -52,6 +52,29 @@
name = build_nettle_iOS;
productName = "libetpan-dependencies_macOS";
};
152E49A226A9CEE0009BD3CE /* build_nettle_macOS */ = {
isa = PBXAggregateTarget;
buildConfigurationList = 152E49A426A9CEE0009BD3CE /* Build configuration list for PBXAggregateTarget "build_nettle_macOS" */;
buildPhases = (
152E49A326A9CEE0009BD3CE /* Build */,
);
dependencies = (
152E49A826A9CF1E009BD3CE /* PBXTargetDependency */,
);
name = build_nettle_macOS;
productName = "libetpan-dependencies_macOS";
};
152E49AB26A9CFD4009BD3CE /* build_libiconv_iOS */ = {
isa = PBXAggregateTarget;
buildConfigurationList = 152E49AD26A9CFD4009BD3CE /* Build configuration list for PBXAggregateTarget "build_libiconv_iOS" */;
buildPhases = (
152E49AC26A9CFD4009BD3CE /* Build */,
);
dependencies = (
);
name = build_libiconv_iOS;
productName = "libetpan-dependencies_macOS";
};
1585EE16269DCEA600B822E1 /* build-pEpMIME-dependencies_macOS */ = {
isa = PBXAggregateTarget;
buildConfigurationList = 1585EE17269DCEA600B822E1 /* Build configuration list for PBXAggregateTarget "build-pEpMIME-dependencies_macOS" */;
@ -190,6 +213,7 @@
1585EECB269EF0F100B822E1 /* Build */,
);
dependencies = (
152E49AA26A9CF2D009BD3CE /* PBXTargetDependency */,
);
name = build_sequoia_macOS;
productName = "libetpan-dependencies_macOS";
@ -223,7 +247,7 @@
1585EF0626A0479800B822E1 /* Build */,
);
dependencies = (
152E499326A9B88A009BD3CE /* PBXTargetDependency */,
152E49A126A9CED3009BD3CE /* PBXTargetDependency */,
);
name = build_sequoia_iOS;
productName = "libetpan-dependencies_macOS";
@ -267,19 +291,33 @@
/* End PBXAggregateTarget section */
/* Begin PBXContainerItemProxy section */
152E499226A9B88A009BD3CE /* PBXContainerItemProxy */ = {
152E499E26A9C62B009BD3CE /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1585EE0B269DC6DD00B822E1 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 152E498D26A9B252009BD3CE;
remoteInfo = build_gmp_iOS;
};
152E499E26A9C62B009BD3CE /* PBXContainerItemProxy */ = {
152E49A026A9CED3009BD3CE /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1585EE0B269DC6DD00B822E1 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 152E498D26A9B252009BD3CE;
remoteInfo = build_gmp_iOS;
remoteGlobalIDString = 152E499926A9BC94009BD3CE;
remoteInfo = build_nettle_iOS;
};
152E49A726A9CF1E009BD3CE /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1585EE0B269DC6DD00B822E1 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 152E499426A9B88E009BD3CE;
remoteInfo = build_gmp_macOS;
};
152E49A926A9CF2D009BD3CE /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1585EE0B269DC6DD00B822E1 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 152E49A226A9CEE0009BD3CE;
remoteInfo = build_nettle_macOS;
};
1585EE35269EC8DD00B822E1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
@ -440,6 +478,7 @@
1585EE48269ECB8700B822E1 /* build_cryptopp_macOS */,
1585EEA5269EDA1E00B822E1 /* build_asn1cexecutable */,
152E499426A9B88E009BD3CE /* build_gmp_macOS */,
152E49A226A9CEE0009BD3CE /* build_nettle_macOS */,
1585EECA269EF0F100B822E1 /* build_sequoia_macOS */,
1585EE43269ECB2500B822E1 /* build_pEpwebserver_macOS */,
1585EEAA269EDAE200B822E1 /* build_pEpengine_macOS */,
@ -455,6 +494,7 @@
152E498D26A9B252009BD3CE /* build_gmp_iOS */,
152E499926A9BC94009BD3CE /* build_nettle_iOS */,
1585EF0526A0479800B822E1 /* build_sequoia_iOS */,
152E49AB26A9CFD4009BD3CE /* build_libiconv_iOS */,
152E47C626A5B7C2009BD3CE /* CLEAN_ALL_iOS */,
);
};
@ -537,6 +577,44 @@
shellScript = "LIB_NAME=\"nettle\"\n\nSCRIPTS_DIR=\"${PROJECT_DIR}/..\"\nPREFIX=\"${PROJECT_DIR}/$(${SCRIPTS_DIR}/get-config-prefix.sh)\"\n\nBUILD_SCRIPT=\"${SCRIPTS_DIR}/generate_and_run_ios_dependency_build_script.sh\" \nsh \"${BUILD_SCRIPT}\" $LIB_NAME \"${PREFIX}\"\n";
showEnvVarsInLog = 0;
};
152E49A326A9CEE0009BD3CE /* Build */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = Build;
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = "/bin/sh -l";
shellScript = "LIB_NAME=\"nettle\"\n\nSCRIPTS_DIR=\"${PROJECT_DIR}/..\"\nPREFIX=\"${PROJECT_DIR}/$(${SCRIPTS_DIR}/get-config-prefix.sh)\"\n\nBUILD_SCRIPT=\"${SCRIPTS_DIR}/generate_and_run_mac_dependency_build_script.sh\" \nsh \"${BUILD_SCRIPT}\" $LIB_NAME \"${PREFIX}\"\n";
showEnvVarsInLog = 0;
};
152E49AC26A9CFD4009BD3CE /* Build */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = Build;
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "LIB_NAME=\"iconv\"\n\nSCRIPTS_DIR=\"${PROJECT_DIR}/..\"\nPREFIX=\"${PROJECT_DIR}/$(${SCRIPTS_DIR}/get-config-prefix.sh)\"\n\nBUILD_SCRIPT=\"${SCRIPTS_DIR}/generate_and_run_ios_dependency_build_script.sh\" \nsh \"${BUILD_SCRIPT}\" $LIB_NAME \"${PREFIX}\"\n";
showEnvVarsInLog = 0;
};
1585EE28269DD87700B822E1 /* Build */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@ -806,16 +884,26 @@
/* End PBXShellScriptBuildPhase section */
/* Begin PBXTargetDependency section */
152E499326A9B88A009BD3CE /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 152E498D26A9B252009BD3CE /* build_gmp_iOS */;
targetProxy = 152E499226A9B88A009BD3CE /* PBXContainerItemProxy */;
};
152E499F26A9C62B009BD3CE /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 152E498D26A9B252009BD3CE /* build_gmp_iOS */;
targetProxy = 152E499E26A9C62B009BD3CE /* PBXContainerItemProxy */;
};
152E49A126A9CED3009BD3CE /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 152E499926A9BC94009BD3CE /* build_nettle_iOS */;
targetProxy = 152E49A026A9CED3009BD3CE /* PBXContainerItemProxy */;
};
152E49A826A9CF1E009BD3CE /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 152E499426A9B88E009BD3CE /* build_gmp_macOS */;
targetProxy = 152E49A726A9CF1E009BD3CE /* PBXContainerItemProxy */;
};
152E49AA26A9CF2D009BD3CE /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 152E49A226A9CEE0009BD3CE /* build_nettle_macOS */;
targetProxy = 152E49A926A9CF2D009BD3CE /* PBXContainerItemProxy */;
};
1585EE36269EC8DD00B822E1 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 1585EE27269DD87700B822E1 /* build_libiconv_macOS */;
@ -976,6 +1064,42 @@
};
name = Release;
};
152E49A526A9CEE0009BD3CE /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = NQLYU6MGPN;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
152E49A626A9CEE0009BD3CE /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = NQLYU6MGPN;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
};
152E49AE26A9CFD4009BD3CE /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = NQLYU6MGPN;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
152E49AF26A9CFD4009BD3CE /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = NQLYU6MGPN;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
};
1585EE0F269DC6DD00B822E1 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@ -1351,6 +1475,24 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
152E49A426A9CEE0009BD3CE /* Build configuration list for PBXAggregateTarget "build_nettle_macOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
152E49A526A9CEE0009BD3CE /* Debug */,
152E49A626A9CEE0009BD3CE /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
152E49AD26A9CFD4009BD3CE /* Build configuration list for PBXAggregateTarget "build_libiconv_iOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
152E49AE26A9CFD4009BD3CE /* Debug */,
152E49AF26A9CFD4009BD3CE /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
1585EE0E269DC6DD00B822E1 /* Build configuration list for PBXProject "CommonPEPDependencies" */ = {
isa = XCConfigurationList;
buildConfigurations = (


+ 67
- 0
CommonPEPDependencies/CommonPEPDependencies.xcodeproj/xcshareddata/xcschemes/build_libiconv_iOS.xcscheme View File

@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1250"
version = "1.3">
<BuildAction
parallelizeBuildables = "NO"
buildImplicitDependencies = "NO">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "152E49AB26A9CFD4009BD3CE"
BuildableName = "build_libiconv_iOS"
BlueprintName = "build_libiconv_iOS"
ReferencedContainer = "container:CommonPEPDependencies.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "152E49AB26A9CFD4009BD3CE"
BuildableName = "build_libiconv_iOS"
BlueprintName = "build_libiconv_iOS"
ReferencedContainer = "container:CommonPEPDependencies.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

+ 67
- 0
CommonPEPDependencies/CommonPEPDependencies.xcodeproj/xcshareddata/xcschemes/build_nettle_macOS.xcscheme View File

@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1250"
version = "1.3">
<BuildAction
parallelizeBuildables = "NO"
buildImplicitDependencies = "NO">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "152E49A226A9CEE0009BD3CE"
BuildableName = "build_nettle_macOS"
BlueprintName = "build_nettle_macOS"
ReferencedContainer = "container:CommonPEPDependencies.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "152E49A226A9CEE0009BD3CE"
BuildableName = "build_nettle_macOS"
BlueprintName = "build_nettle_macOS"
ReferencedContainer = "container:CommonPEPDependencies.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

Loading…
Cancel
Save