Browse Source

no dependencies for macodadapter (beside downloadclient, which is subproject)

IOS-2882
Andreas Buff 10 months ago
parent
commit
553bd1d57f
2 changed files with 51 additions and 40 deletions
  1. +38
    -26
      CommonPEPDependencies/CommonPEPDependencies.xcodeproj/project.pbxproj
  2. +13
    -14
      build-macOSAdapter.sh

+ 38
- 26
CommonPEPDependencies/CommonPEPDependencies.xcodeproj/project.pbxproj View File

@ -155,8 +155,6 @@
1585EED9269EF98B00B822E1 /* Build */,
);
dependencies = (
1585EED5269EF98B00B822E1 /* PBXTargetDependency */,
1585EED7269EF98B00B822E1 /* PBXTargetDependency */,
);
name = "build_build-macOSAdapter";
productName = "libetpan-dependencies_macOS";
@ -198,6 +196,16 @@
name = "build-downloadclient-dependencies_macOS";
productName = "build-pEpMIME-dependencies";
};
1585F01526A1964100B822E1 /* build-macOSAdapter-dependencies_macOS */ = {
isa = PBXAggregateTarget;
buildConfigurationList = 1585F01C26A1964100B822E1 /* Build configuration list for PBXAggregateTarget "build-macOSAdapter-dependencies_macOS" */;
buildPhases = (
);
dependencies = (
);
name = "build-macOSAdapter-dependencies_macOS";
productName = "build-pEpMIME-dependencies";
};
/* End PBXAggregateTarget section */
/* Begin PBXContainerItemProxy section */
@ -264,20 +272,6 @@
remoteGlobalIDString = 1585EEA5269EDA1E00B822E1;
remoteInfo = build_asn1cexecutable;
};
1585EED6269EF98B00B822E1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1585EE0B269DC6DD00B822E1 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 1585EEA5269EDA1E00B822E1;
remoteInfo = build_asn1cexecutable;
};
1585EED8269EF98B00B822E1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1585EE0B269DC6DD00B822E1 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 1585EECA269EF0F100B822E1;
remoteInfo = build_sequoia_macOS;
};
1585EEF826A0425300B822E1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1585EE0B269DC6DD00B822E1 /* Project object */;
@ -380,6 +374,7 @@
1585EE1C269DCEB300B822E1 /* build-libetpan-dependencies_macOS */,
1585EE16269DCEA600B822E1 /* build-pEpMIME-dependencies_macOS */,
1585EFAF26A178FE00B822E1 /* build-downloadclient-dependencies_macOS */,
1585F01526A1964100B822E1 /* build-macOSAdapter-dependencies_macOS */,
1585EEFC26A0432A00B822E1 /* CLEAN_ALL */,
1585EF0526A0479800B822E1 /* build_sequoia_iOS */,
);
@ -682,16 +677,6 @@
target = 1585EEA5269EDA1E00B822E1 /* build_asn1cexecutable */;
targetProxy = 1585EED2269EF71C00B822E1 /* PBXContainerItemProxy */;
};
1585EED5269EF98B00B822E1 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 1585EEA5269EDA1E00B822E1 /* build_asn1cexecutable */;
targetProxy = 1585EED6269EF98B00B822E1 /* PBXContainerItemProxy */;
};
1585EED7269EF98B00B822E1 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 1585EECA269EF0F100B822E1 /* build_sequoia_macOS */;
targetProxy = 1585EED8269EF98B00B822E1 /* PBXContainerItemProxy */;
};
1585EEF926A0425300B822E1 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 1585EE39269EC90100B822E1 /* build_boost_macOS */;
@ -1030,6 +1015,24 @@
};
name = Release;
};
1585F01D26A1964100B822E1 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = NQLYU6MGPN;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
1585F01E26A1964100B822E1 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = NQLYU6MGPN;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
@ -1186,6 +1189,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
1585F01C26A1964100B822E1 /* Build configuration list for PBXAggregateTarget "build-macOSAdapter-dependencies_macOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
1585F01D26A1964100B822E1 /* Debug */,
1585F01E26A1964100B822E1 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 1585EE0B269DC6DD00B822E1 /* Project object */;


+ 13
- 14
build-macOSAdapter.sh View File

@ -20,15 +20,18 @@ DOWNLOADCLIENT_VERSION=$(sh get-pEp-version.sh "DOWNLOADCLIENT_VERSION")
# Get Absolute Paths & Setup
SCRIPT_DIR=$(sh "${SCRIPT_DIR}/helper/absolutepath.sh ${SCRIPT_DIR}"
pushd "${SCRIPT_DIR}"
SCRIPT_DIR=$(pwd)
popd
if [ "${PREFIX}" = "" ]; then
PREFIX="${SCRIPT_DIR}/local"
fi
mkdir -p "${PREFIX}"
PREFIX=$(sh "${SCRIPT_DIR}/helper/absolutepath.sh ${PREFIX}"
pushd "${PREFIX}"
PREFIX=$(pwd)
popd
TMP_DIR="${SCRIPT_DIR}/tmp"
mkdir -p "${TMP_DIR}"
PARENT_DIR="${SCRIPT_DIR}/.."
if [ -f "${PREFIX}/bin/foundation.pEp.adapter.macOS" ]; then
echo "lib exists already in ${LIB_DIR}. If you want to rebuild it, delete the existing one."
@ -36,14 +39,16 @@ if [ -f "${PREFIX}/bin/foundation.pEp.adapter.macOS" ]; then
fi
# libpEpEngine
pushd "${TMP_DIR}"
MAC_OS_ADAPTER_DIR="${TMP_DIR}/pEpMacOSAdapter"
pushd "${PARENT_DIR}"
MAC_OS_ADAPTER_DIR="${PARENT_DIR}/pEpMacOSAdapter"
if [ ! -d "${MAC_OS_ADAPTER_DIR}" ]; then
git clone -b "${MACOSADAPTER_VERSION}" https://gitea.pep.foundation/pEp.foundation/pEpMacOSAdapter/
# git clone -b "${MACOSADAPTER_VERSION}" https://gitea.pep.foundation/pEp.foundation/pEpMacOSAdapter/
git clone -b "IOSAD-218" https://gitea.pep.foundation/pEp.foundation/pEpMacOSAdapter/
fi
DOWNLOADCLIENT_DIR="${TMP_DIR}/downloadclient"
if [ ! -d "${DOWNLOADCLIENT_DIR}" ]; then
git clone -b "${DOWNLOADCLIENT_VERSION}" https://gitea.pep.foundation/pEp.foundation/downloadclient
# git clone -b "${DOWNLOADCLIENT_VERSION}" https://gitea.pep.foundation/pEp.foundation/downloadclient
git clone -b "IOSAD-218" https://gitea.pep.foundation/pEp.foundation/downloadclient
# Is build with macOSAdapter Xcode project
fi
pushd ${MAC_OS_ADAPTER_DIR}
@ -53,9 +58,3 @@ pushd "${TMP_DIR}"
cp -r "Submodules/pEpNotifications/build/p≡p updates.app" "${PREFIX}/apps/p≡p updates.app"
popd
popd
# Cleanup
rm -rf "${TMP_DIR}/x86_64"
rm -rf "${TMP_DIR}/arm64"
export MACOSX_DEPLOYMENT_TARGET=10.10

Loading…
Cancel
Save