Skip to content

Commit c3335bb

Browse files
committed
Switch to offical Foonathan memory repo.
(cherry picked from commit 6def034)
1 parent e1a4ccb commit c3335bb

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

script/fastrtps_build_apple.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ cmake -S$SOURCE_DIR/memory -B"$PROJECT_TEMP_DIR/memory" \
5858
-D CMAKE_INSTALL_PREFIX="$BUILT_PRODUCTS_DIR" \
5959
-D FOONATHAN_MEMORY_BUILD_EXAMPLES=OFF \
6060
-D FOONATHAN_MEMORY_BUILD_TESTS=OFF \
61-
-D FOONATHAN_MEMORY_BUILD_TOOLS=ON \
61+
-D FOONATHAN_MEMORY_BUILD_TOOLS=OFF \
6262
-D CMAKE_DEBUG_POSTFIX="" \
6363
-D CMAKE_OSX_DEPLOYMENT_TARGET="10.10" \
6464
-D CMAKE_OSX_ARCHITECTURES="$ARCHS" \

script/fastrtps_build_xctframework.sh

+7-6
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,18 @@ set -x
99
if [[ $# > 0 ]]; then
1010
TAG=$1
1111
else
12-
echo "Usage: fastrtps_build_xctframework.sh TAG"
12+
echo "Usage: fastrtps_build_xctframework.sh TAG commit"
1313
echo "where TAG is FasT-DDS version tag eg. 2.0.1"
1414
exit -1
1515
fi
1616

1717
BRANCH=$(git branch --show-current)
1818
if [ "$BRANCH" == "master" ]
1919
then
20-
Foonathan_memory_repo="-b crosscompile https://github.com/DimaRU/memory.git"
2120
FastRTPS_repo="-b v$TAG https://github.com/eProsima/Fast-DDS.git"
2221
ReleaseNote="Fast-DDS $TAG: iOS(armv7, armv7s, arm64), iOS Simulator(x86_64, arm64), macOS(x86_64, arm64), maccatalyst (x86_64, arm64)."
2322
elif [ "$BRANCH" == "whitelist" ]
2423
then
25-
Foonathan_memory_repo="-b crosscompile https://github.com/DimaRU/memory.git"
2624
FastRTPS_repo="-b feature/remote-whitelist-$TAG https://github.com/DimaRU/Fast-DDS.git"
2725
ReleaseNote="Fast-DDS $TAG: iOS(armv7, armv7s, arm64), iOS Simulator(x86_64, arm64), macOS(x86_64, arm64), maccatalyst (x86_64, arm64). Remote whitelist feature."
2826
TAG="$TAG-$BRANCH"
@@ -44,7 +42,10 @@ export PROJECT_TEMP_DIR=$BUILD/temp
4442
export SOURCE_DIR=$BUILD/src
4543

4644
if [ ! -d $SOURCE_DIR/memory ]; then
47-
git clone --quiet --recurse-submodules --depth 1 $Foonathan_memory_repo $SOURCE_DIR/memory
45+
git clone --quiet https://github.com/foonathan/memory.git $SOURCE_DIR/memory
46+
pushd $SOURCE_DIR/memory > /dev/null
47+
git checkout 7851d12
48+
popd > /dev/null
4849
fi
4950
if [ ! -d $SOURCE_DIR/Fast-DDS ]; then
5051
git clone --quiet --recurse-submodules --depth 1 $FastRTPS_repo $SOURCE_DIR/Fast-DDS
@@ -94,14 +95,14 @@ let package = Package(
9495
)
9596
EOL
9697

97-
if [[ $# == 1 ]]; then
98+
if [[ $2 == "commit" ]]; then
9899

99100
git add Package.swift
100101
git commit -m "Build $TAG"
101102
git tag $TAG
102103
git push
103104
git push --tags
104-
gh release create "$TAG" fastrtps-$TAG.xcframework.zip --title "$TAG" --notes "$ReleaseNote"
105+
gh release create "$TAG" $ZIPNAME --title "$TAG" --notes "$ReleaseNote"
105106

106107
fi
107108
popd > /dev/null

0 commit comments

Comments
 (0)