Commit 22306b9b authored by Drew's avatar Drew

Update to use CaffeinatedSwift

parent 663dde9b
Pipeline #1566 skipped
#!/bin/bash
if [ "$tag" == "" ]; then
echo "Please set a tag"
exit 1
fi
sed "s/__TAG__/$tag/" build.dockerfile > Dockerfile.tagged
docker build -f Dockerfile.tagged -t swift-tmp .
\ No newline at end of file
......@@ -35,16 +35,9 @@ RUN bash /swift-dev/update-tags.sh
# RUN git config --global user.email "drew@sealedabstract.com" && git config --global user.name "Drew Crawford"
# RUN git am -3 < ../SAMPLE.patch
# use hubertus's newest libdispatch
RUN cd ../swift-corelibs-libdispatch/libpwq && git checkout origin/master
# apply PR 62
RUN git config --global user.email "drew@sealedabstract.com" && git config --global user.name "Drew Crawford"
RUN cd ../swift-corelibs-libdispatch && git fetch origin pull/62/head:PR62 && git merge PR62
# apply ⛏ 1242
ADD 0001-Don-t-run-libdispatch-tests.patch /swift-dev/
RUN git am -3 ../0001-Don-t-run-libdispatch-tests.patch
# use CaffeinatedSwift
RUN git remote add CaffeinatedSwift https://code.sealedabstract.com/CaffeinatedSwift/swift.git && git fetch CaffeinatedSwift --tags && git checkout caffeinated-$SWIFT_TAG
RUN cd ../swift-corelibs-libdispatch && git remote add CaffeinatedSwift https://code.sealedabstract.com/CaffeinatedSwift/swift-corelibs-libdispatch.git && git fetch CaffeinatedSwift --tags && git checkout caffeinated-$SWIFT_TAG && git submodule update
# And now we build, like a good little linuxen.
# I believe this is what the linux build script does. In practice, this builds a system into /tmp/install and then tars it up.
......
if [ "$0" = "$BASH_SOURCE" ]; then
echo "Run with source"
exit 1
fi
export tag=caffeinated-$tag
\ No newline at end of file
FROM debian:latest
MAINTAINER Drew Crawford
#these: libblocksruntime-dev libkqueue0 libpthread-workqueue0 are libdispatch-related
RUN apt-get update && apt-get install --no-install-recommends -y clang libedit2 libpython2.7 libxml2 libicu52 libblocksruntime-dev libkqueue0 libpthread-workqueue0 && rm -rf rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
#these: libbsd-dev libicu-dev are static-stdlib related
RUN apt-get update && apt-get install --no-install-recommends -y clang libedit2 libpython2.7 libxml2 libicu52 libblocksruntime-dev libkqueue0 libpthread-workqueue0 libbsd-dev libicu-dev && rm -rf rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
ADD swift-local.tar.gz /
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment