This is an automated email from the ASF dual-hosted git repository.
nicknezis pushed a commit to branch nicknezis/bazel-2
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
The following commit(s) were added to refs/heads/nicknezis/bazel-2 by this push:
new f195065 `bazel-genfiles` no longer exists
f195065 is described below
commit f195065a70ac07a8bd68b975a12bafe4656e4768
Author: Nicholas Nezis <[email protected]>
AuthorDate: Fri Apr 10 10:45:10 2020 -0400
`bazel-genfiles` no longer exists
---
heron/io/dlog/README.md | 4 ++--
scripts/get_all_heron_paths.sh | 8 ++++----
scripts/run_integration_test.sh | 4 ++--
scripts/run_integration_topology_test.sh | 4 ++--
scripts/setup-eclipse.sh | 6 +++---
website2/website/scripts/javadocs.sh | 2 +-
website2/website/scripts/python-doc-gen.sh | 4 ++--
7 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/heron/io/dlog/README.md b/heron/io/dlog/README.md
index b75e28f..58cb4d0 100644
--- a/heron/io/dlog/README.md
+++ b/heron/io/dlog/README.md
@@ -34,10 +34,10 @@ bazel build heron/io/dlog/src/java:dlog-util
3. Upload a file to dlog.
```
-java -jar ./bazel-genfiles/heron/io/dlog/src/java/dlog-util.jar
distributedlog://127.0.0.1/path/to/stream /path/to/file
+java -jar ./bazel-bin/heron/io/dlog/src/java/dlog-util.jar
distributedlog://127.0.0.1/path/to/stream /path/to/file
```
4. Download a dlog stream as a file
```
-java -jar ./bazel-genfiles/heron/io/dlog/src/java/dlog-util.jar
distributedlog://127.0.0.1/path/to/stream /path/to/file
+java -jar ./bazel-bin/heron/io/dlog/src/java/dlog-util.jar
distributedlog://127.0.0.1/path/to/stream /path/to/file
```
diff --git a/scripts/get_all_heron_paths.sh b/scripts/get_all_heron_paths.sh
index d285139..0856f51 100755
--- a/scripts/get_all_heron_paths.sh
+++ b/scripts/get_all_heron_paths.sh
@@ -41,10 +41,10 @@ function get_heron_python_paths() {
function get_heron_thirdparty_dependencies() {
# bazel-bin/heron/proto for heron proto jars from heron/proto
- # bazel-genfiles/external for third_party deps
+ # bazel-bin/external for third_party deps
# bazel-heron/bazel-out/host/bin/third_party for extra_action proto jars in
third_party
# bazel-heron/bazel-out/host/genfiles/external more third_party deps
- echo "$(find
{bazel-bin/heron/proto,bazel-genfiles/external,bazel-incubator-heron/bazel-out/host/bin/third_party,bazel-incubator-heron/bazel-out/host/genfiles/external}/.
-name "*jar" -type f | sort -u)";
+ echo "$(find
{bazel-bin/heron/proto,bazel-bin/external,bazel-incubator-heron/bazel-out/host/bin/third_party,bazel-incubator-heron/bazel-out/host/genfiles/external}/.
-name "*jar" -type f | sort -u)";
}
function get_heron_bazel_deps(){
@@ -110,8 +110,8 @@ function collect_generated_binary_deps() {
function collect_generated_paths() {
# uniq to avoid doing blaze query on duplicates.
- for path in $(find bazel-genfiles/ -name "*.java" | sed
's|/\{0,1\}bazel-genfiles/\{1,2\}|//|' | uniq); do
- source_path=$(echo ${path} | sed 's|//|bazel-genfiles/|' | sed
's|/com/.*$||')
+ for path in $(find bazel-bin/ -name "*.java" | sed
's|/\{0,1\}bazel-bin/\{1,2\}|//|' | uniq); do
+ source_path=$(echo ${path} | sed 's|//|bazel-bin/|' | sed 's|/com/.*$||')
echo "$(get_containing_library ${path}):${source_path}"
done | sort -u
}
diff --git a/scripts/run_integration_test.sh b/scripts/run_integration_test.sh
index 92394df..20f224e 100755
--- a/scripts/run_integration_test.sh
+++ b/scripts/run_integration_test.sh
@@ -65,9 +65,9 @@ echo "Topology language is: " $LANGUAGE
echo "Topology filter pattern is: " $TESTS_PATTERN
# integration test binaries have to be specified as absolute path
-JAVA_INTEGRATION_TESTS_BIN="${PWD}/bazel-genfiles/integration_test/src/java/integration-tests.jar"
+JAVA_INTEGRATION_TESTS_BIN="${PWD}/bazel-bin/integration_test/src/java/integration-tests.jar"
PYTHON_INTEGRATION_TESTS_BIN="${PWD}/bazel-bin/integration_test/src/python/integration_test/topology/heron_integ_topology.pex"
-SCALA_INTEGRATION_TESTS_BIN="${PWD}/bazel-genfiles/integration_test/src/scala/scala-integration-tests.jar"
+SCALA_INTEGRATION_TESTS_BIN="${PWD}/bazel-bin/integration_test/src/scala/scala-integration-tests.jar"
CORE_PKG="file://${PWD}/bazel-bin/scripts/packages/heron-core.tar.gz"
diff --git a/scripts/run_integration_topology_test.sh
b/scripts/run_integration_topology_test.sh
index 665e237..04861e9 100644
--- a/scripts/run_integration_topology_test.sh
+++ b/scripts/run_integration_topology_test.sh
@@ -27,9 +27,9 @@
PYTHON_TESTS_DIR="integration_test/src/python/integration_test/topology"
SCALA_TESTS_DIR="integration_test/src/scala/org/apache/heron/integration_test/topology"
# integration test binaries have to be specified as absolute path
-JAVA_INTEGRATION_TESTS_BIN="${PWD}/bazel-genfiles/integration_test/src/java/integration-topology-tests.jar"
+JAVA_INTEGRATION_TESTS_BIN="${PWD}/bazel-bin/integration_test/src/java/integration-topology-tests.jar"
PYTHON_INTEGRATION_TESTS_BIN="${PWD}/bazel-bin/integration_test/src/python/integration_test/topology/heron_integ_topology.pex"
-SCALA_INTEGRATION_TESTS_BIN="${PWD}/bazel-genfiles/integration_test/src/scala/scala-integration-tests.jar"
+SCALA_INTEGRATION_TESTS_BIN="${PWD}/bazel-bin/integration_test/src/scala/scala-integration-tests.jar"
CORE_PKG="file://${PWD}/bazel-bin/scripts/packages/heron-core.tar.gz"
diff --git a/scripts/setup-eclipse.sh b/scripts/setup-eclipse.sh
index d5f1da8..f659ea4 100755
--- a/scripts/setup-eclipse.sh
+++ b/scripts/setup-eclipse.sh
@@ -17,8 +17,8 @@
set -e
DIR=`dirname $0`
-if [ ! -d $DIR/../bazel-genfiles ]; then
- echo "Error: Directory $DIR/../bazel-genfiles does not exists."
+if [ ! -d $DIR/../bazel-bin ]; then
+ echo "Error: Directory $DIR/../bazel-bin does not exists."
echo "please buid heron first"
exit 1
fi
@@ -119,7 +119,7 @@ generate_source_dirs
#generate_source_dirs
-for jarfile in `find $DIR/../bazel-genfiles/ -name \*.jar | cut -d '/' -f 4-`;
do
+for jarfile in `find $DIR/../bazel-bin/ -name \*.jar | cut -d '/' -f 4-`; do
cat >> $classpath_file << EOH
<classpathentry kind="lib" path="$jarfile"/>
EOH
diff --git a/website2/website/scripts/javadocs.sh
b/website2/website/scripts/javadocs.sh
index dfee9b8..7cdf4af 100755
--- a/website2/website/scripts/javadocs.sh
+++ b/website2/website/scripts/javadocs.sh
@@ -51,7 +51,7 @@ rm -rf $JAVADOC_OUTPUT_DIR
mkdir -p $JAVADOC_OUTPUT_DIR
BIN_JARS=`find $HERON_ROOT_DIR/bazel-incubator-heron/_bin/. -name "*\.jar" |
tr '\n' ':'`
-GEN_JARS=`find $HERON_ROOT_DIR/bazel-genfiles/external/. -name "*\.jar" | tr
'\n' ':'`
+GEN_JARS=`find $HERON_ROOT_DIR/bazel-bin/external/. -name "*\.jar" | tr '\n'
':'`
SCRIBE_JARS=`find $HERON_ROOT_DIR/bazel-bin/. -name
"libthrift_scribe_java.jar" | tr '\n' ':'`
PROTO_JARS=`find $HERON_ROOT_DIR/bazel-bin/heron/proto/. -name "*\.jar" | tr
'\n' ':'`
CLOSURE_CLASSES="$HERON_ROOT_DIR/bazel-bin/storm-compatibility/src/java/_javac/storm-compatibility-java/libstorm-compatibility-java_classes/."
diff --git a/website2/website/scripts/python-doc-gen.sh
b/website2/website/scripts/python-doc-gen.sh
index 5d8a7e6..c5934c6 100755
--- a/website2/website/scripts/python-doc-gen.sh
+++ b/website2/website/scripts/python-doc-gen.sh
@@ -24,7 +24,7 @@ cd ${HERON_ROOT_DIR}
./bazel_configure.py
-# Generate python whl packages, packages will be generated in
${HERON_ROOT_DIR}/bazel-genfiles/scripts/packages/
+# Generate python whl packages, packages will be generated in
${HERON_ROOT_DIR}/bazel-bin/scripts/packages/
bazel build --config=ubuntu scripts/packages:pypkgs
cd website2/website/
@@ -34,7 +34,7 @@ rm -rf ./venv/
mkdir -p ./venv/
VENV=./venv/
echo $VENV
-PIP_LOCATION=${HERON_ROOT_DIR}/bazel-genfiles/scripts/packages
+PIP_LOCATION=${HERON_ROOT_DIR}/bazel-bin/scripts/packages
virtualenv "$VENV"
source "$VENV/bin/activate"
