wassname/ray
1
0
Fork 0
mirror of https://github.com/wassname/ray.git synced 2026-07-18 12:40:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Apply patches while considering index as well (#231)

Browse Source
This commit is contained in:
mehrdadn
2016-07-08 09:24:25 -07:00
committed by Robert Nishihara
parent 875b20e397
commit 7ff1580606
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
thirdparty/download_thirdparty.bat
Vendored
+6 -6
View File
@@ -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