aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/run_tests/build_artifact_protoc.bat
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@google.com>2016-12-09 11:09:34 +0100
committerGravatar Jan Tattermusch <jtattermusch@google.com>2016-12-09 11:09:34 +0100
commite3e2106fad7bde3638a0b0753ba1b1e225e30a89 (patch)
tree13a789407962cb4099bd95476c70e8b4e1cd94c6 /tools/run_tests/build_artifact_protoc.bat
parentc204647295437b01337ad8e6c17c4296609c7a13 (diff)
make protobuf building consistent
Diffstat (limited to 'tools/run_tests/build_artifact_protoc.bat')
-rw-r--r--tools/run_tests/build_artifact_protoc.bat9
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/run_tests/build_artifact_protoc.bat b/tools/run_tests/build_artifact_protoc.bat
index 3246a903d0..b2bf86da40 100644
--- a/tools/run_tests/build_artifact_protoc.bat
+++ b/tools/run_tests/build_artifact_protoc.bat
@@ -30,15 +30,16 @@
mkdir artifacts
setlocal
-cd third_party/protobuf
+cd third_party/protobuf/cmake
-cd cmake
-cmake -G "%generator%" -Dprotobuf_BUILD_TESTS=OFF || goto :error
+mkdir build & cd build
+mkdir solution & cd solution
+cmake -G "%generator%" -Dprotobuf_BUILD_TESTS=OFF ../.. || goto :error
endlocal
call vsprojects/build_plugins.bat || goto :error
-xcopy /Y third_party\protobuf\cmake\Release\protoc.exe artifacts\ || goto :error
+xcopy /Y third_party\protobuf\cmake\build\solution\Release\protoc.exe artifacts\ || goto :error
xcopy /Y vsprojects\Release\*_plugin.exe artifacts\ || xcopy /Y vsprojects\x64\Release\*_plugin.exe artifacts\ || goto :error
goto :EOF