Skip to content

Commit

Permalink
Apply patches while considering index as well (ray-project#231)
Browse files Browse the repository at this point in the history
  • Loading branch information
@mehrdadn @robertnishihara
mehrdadn authored and robertnishihara committed Jul 8, 2016
1 parent 875b20e commit 7ff1580
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions thirdparty/download_thirdparty.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
git -C "grpc" submodule update --init "third_party/protobuf"
git -C "grpc" submodule update --init "third_party/nanopb"
git -C "grpc" submodule update --init "third_party/zlib"
git -C "grpc" apply "%~dp0patches/grpc-source.patch"
git -C "grpc" apply "%~dp0patches/windows/grpc-projects.patch"
git -C "grpc/third_party/protobuf" apply "%~dp0patches/windows/protobuf-projects.patch"
git -C "arrow/cpp/thirdparty/flatbuffers" apply "%~dp0patches/windows/flatbuffers-projects.patch"
git -C "arrow/cpp/thirdparty/parquet" apply "%~dp0patches/windows/parquet-endian.patch"
git -C "python" apply "%~dp0patches/windows/python-pyconfig.patch"
git -C "grpc" apply --index --3way "%~dp0patches/grpc-source.patch"
git -C "grpc" apply --index --3way "%~dp0patches/windows/grpc-projects.patch"
git -C "grpc/third_party/protobuf" apply --index --3way "%~dp0patches/windows/protobuf-projects.patch"
git -C "arrow/cpp/thirdparty/flatbuffers" apply --index --3way "%~dp0patches/windows/flatbuffers-projects.patch"
git -C "arrow/cpp/thirdparty/parquet" apply --index --3way "%~dp0patches/windows/parquet-endian.patch"
git -C "python" apply --index --3way "%~dp0patches/windows/python-pyconfig.patch"
@PopD
@EndLocal

0 comments on commit 7ff1580

Please sign in to comment.