From c28e2e0e0433f03cab8dcac964436ba6617be54a Mon Sep 17 00:00:00 2001 From: Yun Peng Date: Mon, 31 Jul 2017 13:51:57 +0200 Subject: Using cc_binary to build windows_jni.dll Get rid of build_windows_jni.sh and the corresponding genrule. Change-Id: I89a199b61109f5687f8b500b60d284cae97f6457 PiperOrigin-RevId: 163679307 --- src/main/native/BUILD | 4 ++ src/main/native/windows/BUILD | 13 ++-- src/main/native/windows/build_windows_jni.sh | 100 --------------------------- src/main/native/windows/file-jni.cc | 2 +- src/main/native/windows/jni-util.h | 4 +- src/main/native/windows/processes-jni.cc | 2 +- 6 files changed, 15 insertions(+), 110 deletions(-) delete mode 100755 src/main/native/windows/build_windows_jni.sh (limited to 'src/main') diff --git a/src/main/native/BUILD b/src/main/native/BUILD index c4b0d2ee3b..ad60099671 100644 --- a/src/main/native/BUILD +++ b/src/main/native/BUILD @@ -4,10 +4,13 @@ genrule( "//src:darwin": ["//tools/jdk:jni_md_header-darwin"], "//src:darwin_x86_64": ["//tools/jdk:jni_md_header-darwin"], "//src:freebsd": ["//tools/jdk:jni_md_header-freebsd"], + "//src:windows": ["//tools/jdk:jni_md_header-windows"], + "//src:windows_msvc": ["//tools/jdk:jni_md_header-windows"], "//conditions:default": ["//tools/jdk:jni_md_header-linux"], }), outs = ["jni_md.h"], cmd = "cp -f $< $@", + visibility = ["//src/main/native:__subpackages__"], ) genrule( @@ -15,6 +18,7 @@ genrule( srcs = ["//tools/jdk:jni_header"], outs = ["jni.h"], cmd = "cp -f $< $@", + visibility = ["//src/main/native:__subpackages__"], ) filegroup( diff --git a/src/main/native/windows/BUILD b/src/main/native/windows/BUILD index f0674c6ea5..8236a301d2 100644 --- a/src/main/native/windows/BUILD +++ b/src/main/native/windows/BUILD @@ -38,15 +38,16 @@ cc_library( hdrs = ["util.h"], ) -genrule( - name = "windows_jni", +cc_binary( + name = "windows_jni.dll", srcs = glob([ "*.cc", "*.h", - ]), - outs = ["windows_jni.dll"], - cmd = "$(location build_windows_jni.sh) $@ $(SRCS)", - tools = ["build_windows_jni.sh"], + ]) + [ + "//src/main/native:jni.h", + "//src/main/native:jni_md.h", + ], + linkshared = 1, visibility = [ "//src:__pkg__", "//src/test/java/com/google/devtools/build/lib:__subpackages__", diff --git a/src/main/native/windows/build_windows_jni.sh b/src/main/native/windows/build_windows_jni.sh deleted file mode 100755 index a66267814a..0000000000 --- a/src/main/native/windows/build_windows_jni.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/bash -eu - -# Copyright 2016 The Bazel Authors. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# It's not a good idea to link an MSYS dynamic library into a native Windows -# JVM, so we need to build it with Visual Studio. However, Bazel doesn't -# support multiple compilers in the same build yet, so we need to hack around -# this limitation using a genrule. - -DLL="$1" -shift 1 - -function fail() { - echo >&2 "ERROR: $@" - exit 1 -} - -# Ensure the PATH is set up correctly. -if ! which which >&/dev/null ; then - PATH="/bin:/usr/bin:$PATH" - which which >&/dev/null \ - || fail "System PATH is not set up correctly, cannot run GNU bintools" -fi - -# Create a temp directory. It will used for the batch file we generate soon and -# as the temp directory for CL.EXE . -VSTEMP=$(mktemp -d) -trap "rm -fr \"$VSTEMP\"" EXIT - -# Find Visual Studio. We don't have any regular environment variables available -# so this is the best we can do. -if [ -z "${BAZEL_VS+set}" ]; then - VSVERSION="$(ls "C:/Program Files (x86)" \ - | grep -E "Microsoft Visual Studio [0-9]+" \ - | sort --version-sort \ - | tail -n 1)" - [[ -n "$VSVERSION" ]] || fail "Visual Studio not found" - BAZEL_VS="C:/Program Files (x86)/$VSVERSION" -fi -VSVARS="${BAZEL_VS}/VC/VCVARSALL.BAT" - -# Check if Visual Studio 2017 is installed. Look for it at the default -# locations. -if [ ! -f "${VSVARS}" ]; then - VSVARS="C:/Program Files (x86)/Microsoft Visual Studio/2017/" - VSEDITION="BuildTools" - if [ -d "${VSVARS}Enterprise" ]; then - VSEDITION="Enterprise" - elif [ -d "${VSVARS}Professional" ]; then - VSEDITION="Professional" - elif [ -d "${VSVARS}Community" ]; then - VSEDITION="Community" - fi - VSVARS+="$VSEDITION/VC/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) -[[ -n "$JAVA" ]] || fail "JDK not found" -JAVAINCLUDES="C:/Program Files/java/$JAVA/include" - -# Convert all compilation units to Windows paths. -WINDOWS_SOURCES=() -for i in $*; do - if [[ "$i" =~ ^.*\.cc$ ]]; then - WINDOWS_SOURCES+=("\"$(cygpath -a -w $i)\"") - fi -done - -# CL.EXE needs a bunch of environment variables whose official location is a -# batch file. We can't make that have an effect on a bash instance, so -# generate a batch file that invokes it. -cat > "${VSTEMP}/windows_jni.bat" < #include #include #include +#include "src/main/native/jni.h" #include "src/main/native/windows/file.h" #include "src/main/native/windows/jni-util.h" #include "src/main/native/windows/util.h" diff --git a/src/main/native/windows/jni-util.h b/src/main/native/windows/jni-util.h index c3632fd1bc..269ce389e9 100644 --- a/src/main/native/windows/jni-util.h +++ b/src/main/native/windows/jni-util.h @@ -14,10 +14,10 @@ #ifndef BAZEL_SRC_MAIN_NATIVE_WINDOWS_JNI_UTIL_H_ #define BAZEL_SRC_MAIN_NATIVE_WINDOWS_JNI_UTIL_H_ -#include - #include +#include "src/main/native/jni.h" + namespace bazel { namespace windows { diff --git a/src/main/native/windows/processes-jni.cc b/src/main/native/windows/processes-jni.cc index dd3e62c067..5b0aed4582 100644 --- a/src/main/native/windows/processes-jni.cc +++ b/src/main/native/windows/processes-jni.cc @@ -16,13 +16,13 @@ #define WINVER 0x0601 #define _WIN32_WINNT 0x0601 -#include #include #include #include #include +#include "src/main/native/jni.h" #include "src/main/native/windows/jni-util.h" #include "src/main/native/windows/util.h" -- cgit v1.2.3