Browse Source

fixes: wrong webserver version cloned (versions.plist ignored)

IOS-2882
Andreas Buff 10 months ago
parent
commit
bf8c813deb
2 changed files with 17 additions and 4 deletions
  1. +14
    -1
      CommonPEPDependencies/CommonPEPDependencies.xcodeproj/project.pbxproj
  2. +3
    -3
      buildcode/pEpwebserver.code

+ 14
- 1
CommonPEPDependencies/CommonPEPDependencies.xcodeproj/project.pbxproj View File

@ -105,9 +105,10 @@
1585EE97269ED57700B822E1 /* Build */,
);
dependencies = (
1585EEA2269ED5EC00B822E1 /* PBXTargetDependency */,
1585EEA0269ED5D900B822E1 /* PBXTargetDependency */,
1585EE9E269ED5B500B822E1 /* PBXTargetDependency */,
1585EEA2269ED5EC00B822E1 /* PBXTargetDependency */,
1585F03E26A1A14A00B822E1 /* PBXTargetDependency */,
1585EE9C269ED59B00B822E1 /* PBXTargetDependency */,
);
name = build_pEpminijsonadapter_macOS;
@ -311,6 +312,13 @@
remoteGlobalIDString = 1585EE39269EC90100B822E1;
remoteInfo = build_boost_macOS;
};
1585F03D26A1A14A00B822E1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1585EE0B269DC6DD00B822E1 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 1585EEAA269EDAE200B822E1;
remoteInfo = build_pEpengine_macOS;
};
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
@ -701,6 +709,11 @@
target = 1585EE39269EC90100B822E1 /* build_boost_macOS */;
targetProxy = 1585EFB926A1798900B822E1 /* PBXContainerItemProxy */;
};
1585F03E26A1A14A00B822E1 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 1585EEAA269EDAE200B822E1 /* build_pEpengine_macOS */;
targetProxy = 1585F03D26A1A14A00B822E1 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */


+ 3
- 3
buildcode/pEpwebserver.code View File

@ -3,14 +3,14 @@ if [ -f "${LIB_DIR}/libpEpwebserver.a" ]; then
exit 0
fi
VERSION=$(sh "${SCRIPT_DIR}/get-pEp-version.sh" "WEBSERVER_VERSION")
PEP_WEB_SERVER_DIR="${TMP_DIR}/webserver"
if [ ! -d "${PEP_WEB_SERVER_DIR}" ]; then
git clone https://gitea.pep.foundation/pEp.foundation/webserver.git
git clone -b ${VERSION} https://gitea.pep.foundation/pEp.foundation/webserver.git
fi
pushd ${PEP_WEB_SERVER_DIR}
git checkout ${WEBSERVER_VERSION}
export CXXFLAGS="-arch ${ARCH} -isysroot ${SDK_PATH} -std=c++14 -fPIC"
export LDFLAGS="-arch ${ARCH}"
export CXX="$(xcrun --sdk ${SDK} -f clang++) -arch ${ARCH} -isysroot ${SDK_PATH}"


Loading…
Cancel
Save