diff options
| author |  Yun Peng <pcloudy@google.com> | 2017-02-14 15:08:17 +0000 |
|---|---|---|
| committer |  Dmitry Lomov <dslomov@google.com> | 2017-02-14 15:51:54 +0000 |
| commit | 321aa540feb2cd0583b824bbb646c885fda17f0b (patch) | |
| tree | de1871b1c36256fdf0c54358d45ff14dc9b6ac9a /src/main/native | |
| parent | 0300c6a3bfd11e28467f2f186783d39391337e3a (diff) | |
Make Bazel work with Visual Studio 2017
Now Bazel can detect MSVC from Visual Studio 2017 or Visual C++ build
tools 2017.
Also modified build_windows_jni.sh to make it work with VS 2017.
Fixed: https://github.com/bazelbuild/bazel/issues/2440
--
Change-Id: I4afbce809ff74634f32fab87efe5e7f0b3f60c95
Reviewed-on: https://cr.bazel.build/8890
PiperOrigin-RevId: 147467993
MOS_MIGRATED_REVID=147467993
Diffstat (limited to 'src/main/native')
| -rwxr-xr-x | src/main/native/build_windows_jni.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/main/native/build_windows_jni.sh b/src/main/native/build_windows_jni.sh index 6716f89d7b..a3caed361c 100755 --- a/src/main/native/build_windows_jni.sh +++ b/src/main/native/build_windows_jni.sh @@ -51,6 +51,16 @@ if [ -z "${BAZEL_VS+set}" ]; then fi VSVARS="${BAZEL_VS}/VC/VCVARSALL.BAT" +# Check if Visual Studio 2017 is installed. Look for it at the default location. +if [ ! -f "${VSVARS}" ]; then + VSVARS="C:/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/VC/" + VSVARS+="Auxiliary/Build/VCVARSALL.BAT" +fi + +if [ ! -f "${VSVARS}" ]; then + fail "VCVARSALL.bat not found, check your Visual Studio installation" +fi + # Find Java. $(JAVA) in the BUILD file points to external/local_jdk/..., which # is not very useful for anything not MSYS-based. JAVA=$(ls "C:/Program Files/java" | grep -E "^jdk" | sort | tail -n 1) |