Browse Source

Merge branch 'IOSAD-218'

master
Andreas Buff 2 weeks ago
parent
commit
90d6cde847
2 changed files with 25 additions and 102 deletions
  1. +8
    -98
      README.md
  2. +17
    -4
      pEpObjCAdapter.xcodeproj/project.pbxproj

+ 8
- 98
README.md View File

@ -55,104 +55,14 @@ You need to have an Apple ID (connected to pEp team account) configured in Xcode
```
mkdir src_pEpObjCAdapter_macOS
cd src_pEpObjCAdapter_macOS
mkdir local
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!!!!!!!!!!!!!!! IS COMPLETELY OUTDATED. DO NOT USE. WIP !!!!!!!!!!!!!!!!!!!!!!!!!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
export MACOSX_DEPLOYMENT_TARGET=10.10
git clone -b OpenSSL_1_1_1g https://github.com/openssl/openssl.git
pushd "openssl"
./Configure --prefix=$(pwd)/../local/ --openssldir=$(pwd)/../local/ssl darwin64-x86_64-cc
make
make install
popd
git clone https://github.com/fdik/libetpan
pushd libetpan
./autogen.sh --prefix=$(pwd)/../local/
make install
popd
GMP_VERSION="6.1.2"
GMP_DIR="gmp-${GMP_VERSION}"
TARBALL="gmp-${GMP_VERSION}.tar.bz2"
wget -nc https://gmplib.org/download/gmp/"${TARBALL}"
tar xvf "${TARBALL}"
pushd ${GMP_DIR}
PKG_CONFIG_ALLOW_CROSS=1 PKG_CONFIG_PATH=$(pwd)/../local/lib/pkgconfig ./configure --host=${HOST} --prefix=$(pwd)/../local/
make -j4
make install
popd
rm -rf "${TARBALL}"
HOST="x86_64-apple-darwin10.0.0"
NETTLE_VERSION="3.4.1"
NETTLE_DIR="nettle-${NETTLE_VERSION}"
TARBALL=nettle-${NETTLE_VERSION}.tar.gz
wget -nc https://ftp.gnu.org/gnu/nettle/nettle-${NETTLE_VERSION}.tar.gz
tar xvf "${TARBALL}"
pushd ${NETTLE_DIR}
PKG_CONFIG_ALLOW_CROSS=1 PKG_CONFIG_PATH=$(pwd)/../local/lib/pkgconfig ./configure --host=${HOST} --prefix=$(pwd)/../local/ --with-lib-path=$(pwd)/../local/lib --with-include-path=$(pwd)/../local/include
make -j4
make install
popd
rm -rf "${TARBALL}"
git clone -b "pep-engine" --depth 1 https://gitlab.com/sequoia-pgp/sequoia.git
pushd sequoia
make build-release PYTHON=disable
make install PYTHON=disable PREFIX=$(pwd)/../local/
popd
git clone git://github.com/vlm/asn1c.git
pushd asn1c
git checkout tags/v0.9.28 -b pep-engine
autoreconf -iv
./configure --prefix=$(pwd)/../local/
make install
popd
ICONV_VERSION="1.16"
ICONV_DIR="libiconv-${ICONV_VERSION}"
TARBALL="libiconv-${ICONV_VERSION}.tar.gz"
wget -nc https://ftp.gnu.org/pub/gnu/libiconv/${TARBALL}
tar xvf "${TARBALL}"
pushd ${ICONV_DIR}
./configure --prefix=$(pwd)/../local/ --enable-static
make -j 4
make install
popd
# //BUFF: weget and build libz too and link it to libetpan. Rm linking dynamic lib in client afterwards. (SHOULD BE OBSOLETE)
git clone https://github.com/fdik/libetpan
pushd libetpan
# //BUFF: This is not working (afaics). libetpan is still using the systems dynamic iconv lib. I was unable yet to force libetpan to use libiconv.a MAKE XCODE PROJECT TAKE CARE. Add only clone libetpan here
git clone https://github.com/fdik/libetpan
pushd libetpan
#ToDo: This is not working (afaics). libetpan is still using the systems dynamic iconv lib. I was unable yet to force libetpan to use libiconv.a
unset CFLAGS
unset LDFLAGS
export LDFLAGS="-Wl/Users/buff/workspace/pEp/src_pEpObjCAdapter_macOS/local/libiconv.a"
./autogen.sh --prefix=$(pwd)/../local/ --enable-shared=no
make install
popd
#BAD, required due to ios libetpan sub project. RM after moving out of project or even better being able to build macOS libetpan with the Xcode project
rm -rf libetpan
git clone https://pep-security.lu/gitlab/misc/libetpan.git
git clone https://pep-security.lu/gitlab/misc/sqlite.git
git clone https://gitea.pep.foundation/pEp.foundation/pEpEngine
git clone https://gitea.pep.foundation/pep.foundation/pEpObjCAdapter.git
git clone https://gitea.pep.foundation/buff/common-dependency-build-helpers-4-apple-hardware.git
git clone http://pep-security.lu/gitlab/iOS/pep-toolbox.git
git clone https://pep-security.lu/gitlab/iOS/CocoaLumberjack
git clone https://pep-security.lu/gitlab/misc/libetpan.git
git clone https://pep-security.lu/gitlab/misc/sqlite.git
git clone https://gitea.pep.foundation/pEp.foundation/pEpEngine
git clone https://gitea.pep.foundation/pep.foundation/pEpObjCAdapter.git
```
## Build


+ 17
- 4
pEpObjCAdapter.xcodeproj/project.pbxproj View File

@ -12,7 +12,7 @@
15160AF1257A58A000DD42E0 /* libpEpEngine.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 64289E561B8B70E800FC617B /* libpEpEngine.a */; platformFilter = ios; };
15160E80257AA06500DD42E0 /* pEp4iosIntern.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15160E7F257AA06500DD42E0 /* pEp4iosIntern.framework */; platformFilter = ios; };
152A9C472010F50400F962ED /* PEPInternalSessionTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 152A9C462010F50400F962ED /* PEPInternalSessionTest.m */; };
1543D9E02577EF260041EFB5 /* libpEpEngine_macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1552DCBD2577E0B600A92F71 /* libpEpEngine_macOS.a */; };
152E48FE26A86327009BD3CE /* libpEpEngine_macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1552DCBD2577E0B600A92F71 /* libpEpEngine_macOS.a */; };
1543DC6A257943CF0041EFB5 /* PEPObjCAdapter_iOS.m in Sources */ = {isa = PBXBuildFile; fileRef = 1543DC69257943CF0041EFB5 /* PEPObjCAdapter_iOS.m */; };
1543DC6B257943CF0041EFB5 /* PEPObjCAdapter_iOS.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1543DC68257943CE0041EFB5 /* PEPObjCAdapter_iOS.h */; platformFilter = ios; };
1543DC89257944660041EFB5 /* PEPCSVScanner.m in Sources */ = {isa = PBXBuildFile; fileRef = 43209B291ECC2ACD007E7E2E /* PEPCSVScanner.m */; };
@ -328,6 +328,7 @@
15206CA81F8BA183003FF880 /* PEPSessionProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPSessionProvider.h; sourceTree = "<group>"; };
15206CA91F8BA183003FF880 /* PEPSessionProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPSessionProvider.m; sourceTree = "<group>"; };
152A9C462010F50400F962ED /* PEPInternalSessionTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPInternalSessionTest.m; sourceTree = "<group>"; };
152E488726A85A15009BD3CE /* CommonPEPDependencies.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = CommonPEPDependencies.xcodeproj; path = "../common-dependency-build-helpers-4-apple-hardware/CommonPEPDependencies/CommonPEPDependencies.xcodeproj"; sourceTree = "<group>"; };
1543DC66257943CE0041EFB5 /* libPEPObjCAdapter_iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPEPObjCAdapter_iOS.a; sourceTree = BUILT_PRODUCTS_DIR; };
1543DC68257943CE0041EFB5 /* PEPObjCAdapter_iOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPObjCAdapter_iOS.h; sourceTree = "<group>"; };
1543DC69257943CF0041EFB5 /* PEPObjCAdapter_iOS.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPObjCAdapter_iOS.m; sourceTree = "<group>"; };
@ -461,8 +462,8 @@
files = (
1585EC7F269C45AC00B822E1 /* libPEPObjCTypeUtils_macOS.a in Frameworks */,
4E5758F5268371440084F02D /* libPEPObjCAdapterTypes_macOS.a in Frameworks */,
152E48FE26A86327009BD3CE /* libpEpEngine_macOS.a in Frameworks */,
1500C92E264BD9BD001FD417 /* libPEPToolbox_macOS.a in Frameworks */,
1543D9E02577EF260041EFB5 /* libpEpEngine_macOS.a in Frameworks */,
4E57581226821A760084F02D /* libPEPObjCAdapterProtocols_macOS.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@ -480,6 +481,13 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
152E488826A85A15009BD3CE /* Products */ = {
isa = PBXGroup;
children = (
);
name = Products;
sourceTree = "<group>";
};
1543DC67257943CE0041EFB5 /* PEPObjCAdapter_iOS */ = {
isa = PBXGroup;
children = (
@ -579,6 +587,7 @@
352988A11AEF964100FA7E2E = {
isa = PBXGroup;
children = (
152E488726A85A15009BD3CE /* CommonPEPDependencies.xcodeproj */,
1585EB15269861D700B822E1 /* PEPObjCTypeUtils.xcodeproj */,
4EEB4CC92680E56A00161040 /* PEPObjCAdapterProtocols.xcodeproj */,
436B444126837F78002624AB /* PEPObjCAdapterTypes.xcodeproj */,
@ -906,6 +915,10 @@
productRefGroup = 352988AB1AEF964100FA7E2E /* Products */;
projectDirPath = "";
projectReferences = (
{
ProductGroup = 152E488826A85A15009BD3CE /* Products */;
ProjectRef = 152E488726A85A15009BD3CE /* CommonPEPDependencies.xcodeproj */;
},
{
ProductGroup = 64289E521B8B70E800FC617B /* Products */;
ProjectRef = 64DA243B1B833248000BEE80 /* pEpEngine.xcodeproj */;
@ -1291,7 +1304,7 @@
"$(PROJECT_DIR)/Subprojects/PEPObjCAdapterTypes/build/include",
"$(PROJECT_DIR)/Subprojects/PEPObjCTypeUtils/build/include",
"$(PROJECT_DIR)/Subprojects/PEPObjCAdapterProtocols/build/include",
"$(PROJECT_DIR)/../pEpEngine/build-mac/build/include",
"$(PROJECT_DIR)/../pEpEngine/build-mac/build/include/pEp",
);
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
@ -1332,7 +1345,7 @@
"$(PROJECT_DIR)/Subprojects/PEPObjCAdapterTypes/build/include",
"$(PROJECT_DIR)/Subprojects/PEPObjCTypeUtils/build/include",
"$(PROJECT_DIR)/Subprojects/PEPObjCAdapterProtocols/build/include",
"$(PROJECT_DIR)/../pEpEngine/build-mac/build/include",
"$(PROJECT_DIR)/../pEpEngine/build-mac/build/include/pEp",
);
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",


Loading…
Cancel
Save