Skip to content

Commit 28f6639

Browse files
scareythingscareything
authored
update ziti-tunnel-sdk-c@v1.10.9 (#314)
* enable building just for active arch, without simulators * add include path for generated files * update ziti-tunnel-sdk-c@v1.10.9
1 parent d13fc13 commit 28f6639

File tree

4 files changed

+45
-10
lines changed

4 files changed

+45
-10
lines changed

‎CZiti.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1048,7 +1048,6 @@
10481048
ENABLE_STRICT_OBJC_MSGSEND = YES;
10491049
ENABLE_TESTABILITY = YES;
10501050
GCC_NO_COMMON_BLOCKS = YES;
1051-
"GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = TLSUV_HTTP;
10521051
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
10531052
GCC_WARN_ABOUT_RETURN_TYPE = YES;
10541053
GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -1057,6 +1056,7 @@
10571056
GCC_WARN_UNUSED_VARIABLE = YES;
10581057
HEADER_SEARCH_PATHS = (
10591058
"$(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/_deps/tlsuv-src/include",
1059+
"$(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/_deps/tlsuv-build/generated",
10601060
"$(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/_deps/tlsuv-src/deps/uv_link_t/include",
10611061
"$(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/_deps/ziti-sdk-c-src/includes",
10621062
"$(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/vcpkg_installed/$(VCPKG_ARCH)-$(VCPKG_OS)/include",
@@ -1076,7 +1076,7 @@
10761076
);
10771077
ONLY_ACTIVE_ARCH = YES;
10781078
OTHER_SWIFT_FLAGS = "";
1079-
SWIFT_INCLUDE_PATHS = "$(SRCROOT)/lib/ProjectModule $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/_deps/tlsuv-src/include $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/_deps/tlsuv-src/deps/uv_link_t/include $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/_deps/ziti-sdk-c-src/includes $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/vcpkg_installed/$(VCPKG_ARCH)-$(VCPKG_OS)/include $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/include $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/lib/ziti-tunnel/include $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/lib/ziti-tunnel-cbs/include $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/lib/ziti-tunnel/lwip $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/_deps/lwip-src/src/include $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/_deps/lwip-contrib-src/ports/unix/port/include";
1079+
SWIFT_INCLUDE_PATHS = "$(SRCROOT)/lib/ProjectModule $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/_deps/tlsuv-src/include $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/_deps/tlsuv-build/generated $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/_deps/tlsuv-src/deps/uv_link_t/include $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/_deps/ziti-sdk-c-src/includes $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/vcpkg_installed/$(VCPKG_ARCH)-$(VCPKG_OS)/include $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/include $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/lib/ziti-tunnel/include $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/lib/ziti-tunnel-cbs/include $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/lib/ziti-tunnel/lwip $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/_deps/lwip-src/src/include $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/_deps/lwip-contrib-src/ports/unix/port/include";
10801080
SWIFT_OBJC_BRIDGING_HEADER = "";
10811081
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
10821082
};
@@ -1107,7 +1107,6 @@
11071107
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
11081108
ENABLE_STRICT_OBJC_MSGSEND = YES;
11091109
GCC_NO_COMMON_BLOCKS = YES;
1110-
"GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = TLSUV_HTTP;
11111110
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
11121111
GCC_WARN_ABOUT_RETURN_TYPE = YES;
11131112
GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -1116,6 +1115,7 @@
11161115
GCC_WARN_UNUSED_VARIABLE = YES;
11171116
HEADER_SEARCH_PATHS = (
11181117
"$(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/_deps/tlsuv-src/include",
1118+
"$(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/_deps/tlsuv-build/generated",
11191119
"$(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/_deps/tlsuv-src/deps/uv_link_t/include",
11201120
"$(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/_deps/ziti-sdk-c-src/includes",
11211121
"$(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/vcpkg_installed/$(VCPKG_ARCH)-$(VCPKG_OS)/include",
@@ -1135,7 +1135,7 @@
11351135
);
11361136
OTHER_SWIFT_FLAGS = "";
11371137
SWIFT_COMPILATION_MODE = wholemodule;
1138-
SWIFT_INCLUDE_PATHS = "$(SRCROOT)/lib/ProjectModule $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/_deps/tlsuv-src/include $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/_deps/tlsuv-src/deps/uv_link_t/include $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/_deps/ziti-sdk-c-src/includes $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/vcpkg_installed/$(VCPKG_ARCH)-$(VCPKG_OS)/include $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/include $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/lib/ziti-tunnel/include $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/lib/ziti-tunnel-cbs/include $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/lib/ziti-tunnel/lwip $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/_deps/lwip-src/src/include $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/_deps/lwip-contrib-src/ports/unix/port/include";
1138+
SWIFT_INCLUDE_PATHS = "$(SRCROOT)/lib/ProjectModule $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/_deps/tlsuv-src/include $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/_deps/tlsuv-build/generated $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/_deps/tlsuv-src/deps/uv_link_t/include $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/_deps/ziti-sdk-c-src/includes $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/vcpkg_installed/$(VCPKG_ARCH)-$(VCPKG_OS)/include $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/include $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/lib/ziti-tunnel/include $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/lib/ziti-tunnel-cbs/include $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/lib/ziti-tunnel/lwip $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/_deps/lwip-src/src/include $(PROJECT_DIR)/deps/ziti-tunnel-sdk-c/build-$(PLATFORM_NAME)-$(CURRENT_ARCH)/_deps/lwip-contrib-src/ports/unix/port/include";
11391139
SWIFT_OBJC_BRIDGING_HEADER = "";
11401140
};
11411141
name = Release;

‎build_all.sh‎

Lines changed: 36 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ C_SDK_ROOT="${PROJECT_ROOT}/deps/ziti-tunnel-sdk-c"
1515
: ${CONFIGURATION:="Release"}
1616
# make for iOS, macOS, or All
1717
: ${FOR:="All"}
18+
# make for simulators
19+
: ${SIMS:="Yes"}
1820

1921
function build_tsdk {
2022
name=$1
@@ -23,10 +25,14 @@ function build_tsdk {
2325
echo "Building TSDK for ${name}; toolchain:${toolchain}"
2426
rm -rf ./deps/ziti-tunnel-sdk-c/${name}
2527

28+
local for_mac=""
29+
if echo "${name}" | grep -q "macosx"; then for_mac=y; fi
30+
2631
cmake_build_type=RelWithDebInfo
2732
if [ "${CONFIGURATION}" == "Debug" ]; then cmake_build_type="Debug"; fi
2833

29-
if [ -n "${ASAN_ENABLED}" -a "${FOR}" = "macOS" ]; then
34+
local clang_asan_flags=""
35+
if [ -n "${ASAN_ENABLED}" -a -n "${for_mac}" ]; then
3036
clang_asan_flags="-DCMAKE_C_FLAGS=-fsanitize=address -DCMAKE_CXX_FLAGS=-fsanitize=address"
3137
fi
3238

@@ -37,6 +43,7 @@ function build_tsdk {
3743
-DEXCLUDE_PROGRAMS=ON \
3844
-DZITI_TUNNEL_BUILD_TESTS=OFF \
3945
-DCMAKE_TOOLCHAIN_FILE="${toolchain}" \
46+
-DCMAKE_INSTALL_PREFIX=./deps/ziti-tunnel-sdk-c/${name}/cmake_installed \
4047
-S ./deps/ziti-tunnel-sdk-c -B ./deps/ziti-tunnel-sdk-c/${name}
4148

4249
if [ $? -ne 0 ] ; then
@@ -49,6 +56,15 @@ function build_tsdk {
4956
echo "Unable to cmake build ${name}"
5057
exit 1
5158
fi
59+
60+
# installing would let us clean up the lib/include paths in the xcode project
61+
# in theory, but at the moment the install targets in the cmake files are not
62+
# quite accurate.
63+
#cmake --install ./deps/ziti-tunnel-sdk-c/${name}
64+
#if [ $? -ne 0 ] ; then
65+
# echo "Unable to cmake install ${name}"
66+
# exit 1
67+
#fi
5268
}
5369

5470
if ! command -v xcpretty > /dev/null; then
@@ -89,23 +105,38 @@ fi
89105
toolchain_dir="../../toolchains"
90106
if [ "${FOR}" = "All" ] || [ "${FOR}" = "iOS" ] ; then
91107
build_tsdk 'build-iphoneos-arm64' "${toolchain_dir}/iOS-arm64.cmake"
108+
fi
109+
110+
if [ "${SIMS}" = "Yes" ] && [ "${FOR}" = "All" ] || [ "${FOR}" = "iOS" ] ; then
92111
build_tsdk 'build-iphonesimulator-x86_64' "${toolchain_dir}/iOS-Simulator-x86_64.cmake"
93112
build_tsdk 'build-iphonesimulator-arm64' "${toolchain_dir}/iOS-Simulator-arm64.cmake"
94113
fi
95114

96115
if [ "${FOR}" = "All" ] || [ "${FOR}" = "macOS" ] ; then
97-
build_tsdk 'build-macosx-arm64' "${toolchain_dir}/macOS-arm64.cmake"
98-
build_tsdk 'build-macosx-x86_64' "${toolchain_dir}/macOS-x86_64.cmake"
116+
if [ "${ONLY_ACTIVE_ARCH}" = "YES" ]; then
117+
active_arch=$(arch)
118+
build_tsdk "build-macosx-${active_arch}" "${toolchain_dir}/macOS-${active_arch}.cmake"
119+
else
120+
build_tsdk 'build-macosx-arm64' "${toolchain_dir}/macOS-arm64.cmake"
121+
build_tsdk 'build-macosx-x86_64' "${toolchain_dir}/macOS-x86_64.cmake"
122+
fi
99123
fi
100124

101-
102125
if [ "${FOR}" = "All" ] || [ "${FOR}" = "iOS" ] ; then
103126
build_cziti 'CZiti-iOS' 'iphoneos' '-arch arm64'
127+
fi
128+
129+
if [ "${SIMS}" = "Yes" ] && [ "${FOR}" = "All" ] || [ "${FOR}" = "iOS" ] ; then
104130
build_cziti 'CZiti-iOS' 'iphonesimulator' '-arch x86_64 -arch arm64 ONLY_ACTIVE_ARCH=NO'
105131
fi
106132

107133
if [ "${FOR}" = "All" ] || [ "${FOR}" = "macOS" ] ; then
108-
build_cziti 'CZiti-macOS' 'macosx' '-arch x86_64 -arch arm64 ONLY_ACTIVE_ARCH=NO'
134+
if [ "${ONLY_ACTIVE_ARCH}" = "YES" ]; then
135+
active_arch=$(arch)
136+
build_cziti 'CZiti-macOS' 'macosx' "-arch ${active_arch} ONLY_ACTIVE_ARCH=YES"
137+
else
138+
build_cziti 'CZiti-macOS' 'macosx' '-arch x86_64 -arch arm64 ONLY_ACTIVE_ARCH=NO'
139+
fi
109140
fi
110141

111142
/bin/sh ${PROJECT_ROOT}/make_dist.sh

‎deps/ziti-tunnel-sdk-c‎

‎make_dist.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ SWIFTMODULE_NAME="CZiti.swiftmodule"
1212

1313
# make for iOS, macOS, or All
1414
: ${FOR:="All"}
15+
# make for simulators
16+
: ${SIMS:="Yes"}
1517

1618
function edit_interfaces {
1719
module_dir="$1"
@@ -37,6 +39,8 @@ xcframework_args=""
3739
if [ "${FOR}" = "All" ] || [ "${FOR}" = "iOS" ] ; then
3840
xcframework_args+=" -library ${BUILD_DIR}/${CONFIGURATION}-iphoneos/${LIB_NAME}"
3941
xcframework_args+=" -headers ${DERIVED_BUILD_DIR}/${CONFIGURATION}-iphoneos/CZiti-iOS.build/DerivedSources"
42+
fi
43+
if [ "${SIMS}" = "Yes" ] && [ "${FOR}" = "All" ] || [ "${FOR}" = "iOS" ] ; then
4044
xcframework_args+=" -library ${BUILD_DIR}/${CONFIGURATION}-iphonesimulator/${LIB_NAME}"
4145
xcframework_args+=" -headers ${DERIVED_BUILD_DIR}/${CONFIGURATION}-iphonesimulator/CZiti-iOS.build/DerivedSources"
4246
fi

0 commit comments

Comments
 (0)