Skip to content

Commit

Permalink
Dev: add syntax patch
Browse files Browse the repository at this point in the history
Cleanup other branches patches
  • Loading branch information
andriydruk committed Dec 14, 2024
1 parent 9e8b971 commit b6f2aa7
Show file tree
Hide file tree
Showing 38 changed files with 18 additions and 1,960 deletions.
13 changes: 5 additions & 8 deletions build/Linux/020-clone-swift.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,22 @@ pushd $SWIFT_SRC
git clone https://github.com/apple/swift.git --branch $BRANCH --single-branch
swift/utils/update-checkout --clone --scheme $BRANCH

# Replace Apple foundation with Readdle's fork
rm -rf swift-corelibs-foundation
git clone https://github.com/swiftlang/swift-corelibs-foundation.git --branch $BRANCH --single-branch

# Construct .swift.sum based on repositories that take part in release build
echo "cmark-$(git -C ./cmark rev-parse HEAD)" >> $ROOT_DIR/.swift.sum
echo "llvm-project-$(git -C ./llvm-project rev-parse HEAD)" >> $ROOT_DIR/.swift.sum
echo "swift-$(git -C ./swift rev-parse HEAD)" >> $ROOT_DIR/.swift.sum
echo "swiftpm-$(git -C ./swiftpm rev-parse HEAD)" >> $ROOT_DIR/.swift.sum
echo "ninja-$(git -C ./ninja rev-parse HEAD)" >> $ROOT_DIR/.swift.sum
echo "llbuild-$(git -C ./llbuild rev-parse HEAD)" >> $ROOT_DIR/.swift.sum
echo "swift-syntax-$(git -C ./swift-syntax rev-parse HEAD)" >> $ROOT_DIR/.swift.sum
echo "NDK=$ANDROID_NDK_HOME" >> $ROOT_DIR/.swift.sum

# Apply patches for $BRANCH if exist
# Apply patches if exist
for REPO in */; do
if [ -d "$ROOT_DIR/patches/$BRANCH/$REPO" ]; then
if [ -d "$ROOT_DIR/patches/$REPO" ]; then
pushd $REPO
git apply $ROOT_DIR/patches/$BRANCH/$REPO/*.patch
echo "$(ls $ROOT_DIR/patches/$BRANCH/$REPO)" >> $ROOT_DIR/.swift.sum
git apply $ROOT_DIR/patches/$REPO/*.patch
echo "$(ls $ROOT_DIR/patches/$REPO)" >> $ROOT_DIR/.swift.sum
popd
fi
done
Expand Down

This file was deleted.

This file was deleted.

35 changes: 0 additions & 35 deletions patches/release/5.10/swift/0005-Disable-all-tests.patch

This file was deleted.

13 changes: 0 additions & 13 deletions patches/release/5.10/swift/0006-Enable-libdispatch.patch

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit b6f2aa7

Please sign in to comment.