Switch to offical Foonathan memory repo.

DimaRU · Dec 5, 2020 · 6098573 · 6098573
1 parent 76459c0
commit 6098573
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/script/fastrtps_build_apple.sh b/script/fastrtps_build_apple.sh
@@ -58,7 +58,7 @@ cmake -S$SOURCE_DIR/memory -B"$PROJECT_TEMP_DIR/memory" \
 -D CMAKE_INSTALL_PREFIX="$BUILT_PRODUCTS_DIR" \
 -D FOONATHAN_MEMORY_BUILD_EXAMPLES=OFF \
 -D FOONATHAN_MEMORY_BUILD_TESTS=OFF \
--D FOONATHAN_MEMORY_BUILD_TOOLS=ON \
+-D FOONATHAN_MEMORY_BUILD_TOOLS=OFF \
 -D CMAKE_DEBUG_POSTFIX="" \
 -D CMAKE_OSX_DEPLOYMENT_TARGET="10.10" \
 -D CMAKE_OSX_ARCHITECTURES="$ARCHS" \

diff --git a/script/fastrtps_build_xctframework.sh b/script/fastrtps_build_xctframework.sh
@@ -4,25 +4,23 @@
 # Copyright © 2020 Dmitriy Borovikov. All rights reserved.
 #
 set -e
-set -x
+#set -x
 
 if [[ $# > 0 ]]; then
 TAG=$1
 else
-echo "Usage: fastrtps_build_xctframework.sh TAG"
+echo "Usage: fastrtps_build_xctframework.sh TAG commit"
 echo "where TAG is FasT-DDS version tag eg. 2.0.1"
 exit -1
 fi
 
 BRANCH=$(git branch --show-current)
 if [ "$BRANCH" == "master" ]
 then
-    Foonathan_memory_repo="-b crosscompile https://github.com/DimaRU/memory.git"
     FastRTPS_repo="-b v$TAG https://github.com/eProsima/Fast-DDS.git"
     ReleaseNote="Fast-DDS $TAG: iOS(armv7, armv7s, arm64), iOS Simulator(x86_64, arm64), macOS(x86_64, arm64), maccatalyst (x86_64, arm64)."
 elif [ "$BRANCH" == "whitelist" ]
 then
-    Foonathan_memory_repo="-b crosscompile https://github.com/DimaRU/memory.git"
     FastRTPS_repo="-b feature/remote-whitelist-$TAG https://github.com/DimaRU/Fast-DDS.git"
     ReleaseNote="Fast-DDS $TAG: iOS(armv7, armv7s, arm64), iOS Simulator(x86_64, arm64), macOS(x86_64, arm64), maccatalyst (x86_64, arm64). Remote whitelist feature."
     TAG="$TAG-$BRANCH"
@@ -44,7 +42,10 @@ export PROJECT_TEMP_DIR=$BUILD/temp
 export SOURCE_DIR=$BUILD/src
 
 if [ ! -d $SOURCE_DIR/memory ]; then
-git clone --quiet --recurse-submodules --depth 1 $Foonathan_memory_repo $SOURCE_DIR/memory
+git clone --quiet https://github.com/foonathan/memory.git $SOURCE_DIR/memory
+pushd $SOURCE_DIR/memory > /dev/null
+git checkout 7851d12
+popd > /dev/null
 fi
 if [ ! -d $SOURCE_DIR/Fast-DDS ]; then
 git clone --quiet --recurse-submodules --depth 1 $FastRTPS_repo $SOURCE_DIR/Fast-DDS
@@ -94,14 +95,14 @@ let package = Package(
 )
 EOL
 
-if [[ $# == 1 ]]; then
+if [[ $2 == "commit" ]]; then
 
 git add Package.swift
 git commit -m "Build $TAG"
 git tag $TAG
 git push
 git push --tags
-gh release create "$TAG" fastrtps-$TAG.xcframework.zip --title "$TAG" --notes "$ReleaseNote"
+gh release create "$TAG" $ZIPNAME --title "$TAG" --notes "$ReleaseNote"
 
 fi
 popd > /dev/null