aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rwxr-xr-xconfigure6
-rwxr-xr-xtensorflow/tools/ci_build/windows/libtensorflow_cpu.sh6
2 files changed, 10 insertions, 2 deletions
diff --git a/configure b/configure
index 0064d5574a..05daa23d70 100755
--- a/configure
+++ b/configure
@@ -41,8 +41,10 @@ function bazel_clean_and_fetch() {
if ! is_windows; then
bazel clean --expunge
fi
- bazel fetch "//tensorflow/... -//tensorflow/contrib/nccl/... \
- -//tensorflow/examples/android/..."
+ if [ -z "$TF_BAZEL_TARGETS" ]; then
+ TF_BAZEL_TARGETS="//tensorflow/... -//tensorflow/contrib/nccl/... -//tensorflow/examples/android/..."
+ fi
+ bazel fetch "$TF_BAZEL_TARGETS"
}
function sed_hyphen_i() {
diff --git a/tensorflow/tools/ci_build/windows/libtensorflow_cpu.sh b/tensorflow/tools/ci_build/windows/libtensorflow_cpu.sh
index 9d59a6eb51..b428bebc6f 100755
--- a/tensorflow/tools/ci_build/windows/libtensorflow_cpu.sh
+++ b/tensorflow/tools/ci_build/windows/libtensorflow_cpu.sh
@@ -48,6 +48,11 @@ cp "${JAVA_HOME}/include/win32/jni_md.h" "./tensorflow/java/src/main/native/wind
sed -i -e "s|@bazel_tools//tools/jdk:jni_md_header-linux|windows_jni_md.h|" ./tensorflow/java/src/main/native/BUILD
#### END HACKS TO BE RESOLVED WITH NEW BAZEL VERSIONS ####
+export TF_BAZEL_TARGETS="//tensorflow:libtensorflow.so"
+export TF_BAZEL_TARGETS="${TF_BAZEL_TARGETS} //tensorflow/tools/lib_package:clicenses_generate"
+export TF_BAZEL_TARGETS="${TF_BAZEL_TARGETS} //tensorflow/java:libtensorflow_jni.so"
+export TF_BAZEL_TARGETS="${TF_BAZEL_TARGETS} //tensorflow/tools/lib_package:jnilicenses_generate"
+
clean_output_base
run_configure_for_cpu_build
@@ -66,6 +71,7 @@ git checkout ./tensorflow/java/src/main/native/BUILD
rm -f ./tensorflow/java/src/main/native/windows_jni_md.h
DIR=lib_package
+rm -rf ${DIR}
mkdir -p ${DIR}
# Zip up the .dll and the LICENSE for the JNI library.