Browse Source

Merge pull request 'master' (#1) from buff/libetpan:master into master

Reviewed-on: https://gitea.pep.foundation/pEp.foundation/libetpan/pulls/1
pull/2/head
darthmama 4 months ago
parent
commit
0123f34ec4
4 changed files with 120 additions and 83 deletions
  1. +111
    -78
      build-mac/libetpan.xcodeproj/project.pbxproj
  2. +0
    -4
      build-mac/libetpan.xcodeproj/xcshareddata/xcschemes/static libetpan.xcscheme
  3. +9
    -0
      build-mac/update-macos.sh
  4. +0
    -1
      build-windows/build_headers.list

+ 111
- 78
build-mac/libetpan.xcodeproj/project.pbxproj View File

@ -6,6 +6,20 @@
objectVersion = 46;
objects = {
/* Begin PBXAggregateTarget section */
156AFED72672635E00AF0039 /* prepare-macos */ = {
isa = PBXAggregateTarget;
buildConfigurationList = 156AFEDA2672635E00AF0039 /* Build configuration list for PBXAggregateTarget "prepare-macos" */;
buildPhases = (
156AFEDB2672639100AF0039 /* Prepare */,
);
dependencies = (
);
name = "prepare-macos";
productName = "prepare-macos";
};
/* End PBXAggregateTarget section */
/* Begin PBXBuildFile section */
2307A00C170AAA5500C43C59 /* mailstream_compress.c in Sources */ = {isa = PBXBuildFile; fileRef = 2307A00A170AAA5500C43C59 /* mailstream_compress.c */; };
365DFFD215D1C93100F2DD85 /* xgmmsgid.c in Sources */ = {isa = PBXBuildFile; fileRef = 365DFFD115D1C93100F2DD85 /* xgmmsgid.c */; };
@ -554,19 +568,12 @@
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
C6635C4716E000310066276E /* PBXContainerItemProxy */ = {
156AFEDC267263CA00AF0039 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
proxyType = 1;
remoteGlobalIDString = C6635C4316DFFE6E0066276E;
remoteInfo = "libetpan-prepare";
};
C6635C4916E000340066276E /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
proxyType = 1;
remoteGlobalIDString = C6635C4316DFFE6E0066276E;
remoteInfo = "libetpan-prepare";
remoteGlobalIDString = 156AFED72672635E00AF0039;
remoteInfo = "prepare-macos";
};
C6635C5116E0027B0066276E /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
@ -578,6 +585,7 @@
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
156AFE802670E65E00AF0039 /* libiconv.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libiconv.a; path = ../../local/lib/libiconv.a; sourceTree = "<group>"; };
2307A00A170AAA5500C43C59 /* mailstream_compress.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mailstream_compress.c; sourceTree = "<group>"; };
2307A00B170AAA5500C43C59 /* mailstream_compress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mailstream_compress.h; sourceTree = "<group>"; };
365DFFD115D1C93100F2DD85 /* xgmmsgid.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = xgmmsgid.c; sourceTree = "<group>"; };
@ -1002,20 +1010,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
C682E2BC15B315EF00BE9DA7 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
C69AB10810546FE500F32FBD /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
@ -1036,6 +1030,7 @@
089C1665FE841158C02AAC07 /* Resources */,
0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */,
034768DFFF38A50411DB9C8B /* Products */,
156AFE7F2670E65E00AF0039 /* Frameworks */,
);
indentWidth = 2;
name = libetpan;
@ -1071,6 +1066,14 @@
path = ..;
sourceTree = "<group>";
};
156AFE7F2670E65E00AF0039 /* Frameworks */ = {
isa = PBXGroup;
children = (
156AFE802670E65E00AF0039 /* libiconv.a */,
);
name = Frameworks;
sourceTree = "<group>";
};
C6F9E82E105335BC0059C3BA /* src */ = {
isa = PBXGroup;
children = (
@ -1717,20 +1720,6 @@
/* End PBXGroup section */
/* Begin PBXLegacyTarget section */
C6635C4316DFFE6E0066276E /* libetpan-prepare */ = {
isa = PBXLegacyTarget;
buildArgumentsString = "$(SRCROOT)/update.sh";
buildConfigurationList = C6635C4416DFFE6E0066276E /* Build configuration list for PBXLegacyTarget "libetpan-prepare" */;
buildPhases = (
);
buildToolPath = /bin/sh;
buildWorkingDirectory = "$(SRCROOT)";
dependencies = (
);
name = "libetpan-prepare";
passBuildSettingsInEnvironment = 1;
productName = "libetpan-prepare";
};
C6635C4D16E002340066276E /* libetpan-prepare-ios */ = {
isa = PBXLegacyTarget;
buildArgumentsString = "$(SRCROOT)/update.sh";
@ -1760,7 +1749,6 @@
buildRules = (
);
dependencies = (
C6635C4816E000310066276E /* PBXTargetDependency */,
);
name = libetpan;
productInstallPath = "$(HOME)/Library/Frameworks";
@ -1774,7 +1762,6 @@
buildPhases = (
C6635C3416DFF0030066276E /* ShellScript */,
C682E21B15B315EF00BE9DA7 /* Sources */,
C682E2BC15B315EF00BE9DA7 /* Frameworks */,
C6740DB515B384FB00D4A16B /* ShellScript */,
);
buildRules = (
@ -1793,12 +1780,12 @@
buildPhases = (
C6635C3316DFEFE00066276E /* ShellScript */,
C69AB10710546FE500F32FBD /* Sources */,
C69AB10810546FE500F32FBD /* Frameworks */,
156AFEB9267208CE00AF0039 /* Copy Artefacts to Custom Build DIr */,
);
buildRules = (
);
dependencies = (
C6635C4A16E000340066276E /* PBXTargetDependency */,
156AFEDD267263CA00AF0039 /* PBXTargetDependency */,
);
name = "static libetpan";
productName = "static libetpan";
@ -1812,6 +1799,13 @@
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0720;
TargetAttributes = {
156AFED72672635E00AF0039 = {
CreatedOnToolsVersion = 12.5;
DevelopmentTeam = NQLYU6MGPN;
ProvisioningStyle = Automatic;
};
};
};
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "libetpan" */;
compatibilityVersion = "Xcode 3.2";
@ -1831,8 +1825,8 @@
8DC2EF4F0486A6940098B216 /* libetpan */,
C69AB10910546FE500F32FBD /* static libetpan */,
C682E21815B315EF00BE9DA7 /* libetpan ios */,
C6635C4316DFFE6E0066276E /* libetpan-prepare */,
C6635C4D16E002340066276E /* libetpan-prepare-ios */,
156AFED72672635E00AF0039 /* prepare-macos */,
);
};
/* End PBXProject section */
@ -1848,6 +1842,42 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
156AFEB9267208CE00AF0039 /* Copy Artefacts to Custom Build DIr */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Copy Artefacts to Custom Build DIr";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "CUSTOM_BUILD_DIR=\"${PROJECT_DIR}/build\"\nmkdir -p \"${CUSTOM_BUILD_DIR}\"\ncp -r \"${BUILD_DIR}/${CONFIGURATION}/libetpan.a\" \"${CUSTOM_BUILD_DIR}\"\n\n# COPY HEADERS\n#CUSTOM_INCLUDE_DIR=\"${CUSTOM_BUILD_DIR}/include/pEp\"\n#mkdir -p \"${CUSTOM_INCLUDE_DIR}\"\n";
};
156AFEDB2672639100AF0039 /* Prepare */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = Prepare;
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "sh -l ${PROJECT_DIR}/update-macos.sh\n";
};
C6635C3316DFEFE00066276E /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@ -2461,15 +2491,10 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
C6635C4816E000310066276E /* PBXTargetDependency */ = {
156AFEDD267263CA00AF0039 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = C6635C4316DFFE6E0066276E /* libetpan-prepare */;
targetProxy = C6635C4716E000310066276E /* PBXContainerItemProxy */;
};
C6635C4A16E000340066276E /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = C6635C4316DFFE6E0066276E /* libetpan-prepare */;
targetProxy = C6635C4916E000340066276E /* PBXContainerItemProxy */;
target = 156AFED72672635E00AF0039 /* prepare-macos */;
targetProxy = 156AFEDC267263CA00AF0039 /* PBXContainerItemProxy */;
};
C6635C5216E0027B0066276E /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
@ -2479,6 +2504,24 @@
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */
156AFED82672635E00AF0039 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = NQLYU6MGPN;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
156AFED92672635E00AF0039 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = NQLYU6MGPN;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
};
1DEB91AE08733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@ -2532,12 +2575,13 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"${PROJECT_DIR}/../../local/lib/include/**",
"$(SRCROOT)/..",
"$(SRCROOT)/include",
);
MACOSX_DEPLOYMENT_TARGET = 10.10;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
"-DHAVE_CFNETWORK=1",
"-DHAVE_CONFIG_H=1",
"-DLIBETPAN_IOS_DISABLE_SSL=1",
);
@ -2552,31 +2596,18 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"${PROJECT_DIR}/../../local/lib/include/**",
"$(SRCROOT)/..",
"$(SRCROOT)/include",
);
MACOSX_DEPLOYMENT_TARGET = 10.10;
OTHER_CFLAGS = (
"-DHAVE_CFNETWORK=1",
"-DHAVE_CONFIG_H=1",
"-DLIBETPAN_IOS_DISABLE_SSL=1",
);
};
name = Release;
};
C6635C4516DFFE6E0066276E /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
SDKROOT = macosx;
};
name = Debug;
};
C6635C4616DFFE6E0066276E /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
SDKROOT = macosx;
};
name = Release;
};
C6635C4F16E002340066276E /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@ -2649,7 +2680,8 @@
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
INSTALL_PATH = /usr/local/lib;
MACOSX_DEPLOYMENT_TARGET = 10.8;
MACOSX_DEPLOYMENT_TARGET = "${inherited}";
OTHER_LIBTOOLFLAGS = "${PROJECT_DIR}/../../local/lib/libiconv.a";
PRODUCT_NAME = etpan;
SDKROOT = macosx;
SKIP_INSTALL = YES;
@ -2665,7 +2697,8 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_MODEL_TUNING = G5;
INSTALL_PATH = /usr/local/lib;
MACOSX_DEPLOYMENT_TARGET = 10.8;
MACOSX_DEPLOYMENT_TARGET = "${inherited}";
OTHER_LIBTOOLFLAGS = "${PROJECT_DIR}/../../local/lib/libiconv.a";
PRODUCT_NAME = etpan;
SDKROOT = macosx;
SKIP_INSTALL = YES;
@ -2676,29 +2709,29 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "libetpan" */ = {
156AFEDA2672635E00AF0039 /* Build configuration list for PBXAggregateTarget "prepare-macos" */ = {
isa = XCConfigurationList;
buildConfigurations = (
1DEB91AE08733DA50010E9CD /* Debug */,
1DEB91AF08733DA50010E9CD /* Release */,
156AFED82672635E00AF0039 /* Debug */,
156AFED92672635E00AF0039 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "libetpan" */ = {
1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "libetpan" */ = {
isa = XCConfigurationList;
buildConfigurations = (
1DEB91B208733DA50010E9CD /* Debug */,
1DEB91B308733DA50010E9CD /* Release */,
1DEB91AE08733DA50010E9CD /* Debug */,
1DEB91AF08733DA50010E9CD /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
C6635C4416DFFE6E0066276E /* Build configuration list for PBXLegacyTarget "libetpan-prepare" */ = {
1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "libetpan" */ = {
isa = XCConfigurationList;
buildConfigurations = (
C6635C4516DFFE6E0066276E /* Debug */,
C6635C4616DFFE6E0066276E /* Release */,
1DEB91B208733DA50010E9CD /* Debug */,
1DEB91B308733DA50010E9CD /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;


+ 0
- 4
build-mac/libetpan.xcodeproj/xcshareddata/xcschemes/static libetpan.xcscheme View File

@ -29,8 +29,6 @@
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
@ -51,8 +49,6 @@
ReferencedContainer = "container:libetpan.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"


+ 9
- 0
build-mac/update-macos.sh View File

@ -0,0 +1,9 @@
#!/bin/sh
logfile="`pwd`/update.log"
echo preparing
pushd ..
./autogen.sh --without-openssl --without-gnutls --without-sasl --without-curl --without-expat --without-zlib --disable-dependency-tracking
make clean
make -j 4 > "$logfile" 2>&1
popd

+ 0
- 1
build-windows/build_headers.list View File

@ -128,7 +128,6 @@ src\low-level\mbox\mailmbox_types.h
src\low-level\mh\mailmh.h
src\low-level\mime\mailmime.h
src\low-level\mime\mailmime_content.h
src\low-level\mime\mailmime_encode.h
src\low-level\mime\mailmime_decode.h
src\low-level\mime\mailmime_disposition.h
src\low-level\mime\mailmime_types.h


Loading…
Cancel
Save