Skip to content
This repository was archived by the owner on Mar 3, 2023. It is now read-only.

Commit a5459f1

Browse files
huijunwuhuijunw
andauthored
allfix (#3577)
Signed-off-by: Huijun Wu <[email protected]> Co-authored-by: Huijun Wu <[email protected]>
1 parent cd42fa8 commit a5459f1

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

scripts/get_all_heron_paths.sh

+7-9
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,12 @@
1717

1818
set -eu
1919

20-
function query() {
21-
./output/bazel query "$@"
22-
}
2320

2421
set +e
2522
# Build everything
2623
DIR=`dirname $0`
2724
source ${DIR}/detect_os_type.sh
28-
bazel build --config=`platform` {heron,integration_test,tools/java,examples,heronpy,storm-compatibility,storm-compatibility-examples,eco,eco-storm-examples,eco-heron-examples}/...
25+
bazel build --config=`platform`_nostyle {heron,integration_test,tools/java,examples,heronpy,storm-compatibility/v0.10.2,storm-compatibility-examples,eco,eco-storm-examples,eco-heron-examples}/...
2926
result=$?
3027
if [ "${result}" -eq "0" ] ; then
3128
echo "Bazel build successful!!"
@@ -44,7 +41,7 @@ function get_heron_thirdparty_dependencies() {
4441
# bazel-bin/external for third_party deps
4542
# bazel-heron/bazel-bin/host/bin/third_party for extra_action proto jars in third_party
4643
# bazel-heron/bazel-bin/host/genfiles/external more third_party deps
47-
echo "$(find {bazel-bin/heron/proto,bazel-bin/external,bazel-incubator-heron/bazel-bin/host/bin/third_party,bazel-incubator-heron/bazel-bin/host/genfiles/external}/. -name "*jar" -type f | sort -u)";
44+
echo "$(find {bazel-bin/heron/proto,bazel-bin/external,bazel-incubator-heron/bazel-out/host/bin/third_party,bazel-incubator-heron/bazel-out/host/bin/external}/. -name "*jar" -type f | sort -u)";
4845
}
4946

5047
function get_heron_bazel_deps(){
@@ -67,7 +64,7 @@ function get_package_of() {
6764
}
6865

6966
function get_heron_java_paths() {
70-
local java_paths=$(find {heron,heron/tools,tools,integration_test,examples,storm-compatibility,eco,eco-storm-examples,eco-heron-examples,contrib} -name "*.java" | sed "s|/src/java/.*$|/src/java|"| sed "s|/java/src/.*$|/java/src|" | sed "s|/tests/java/.*$|/tests/java|" | sort -u | fgrep -v "heron/scheduler/" | fgrep -v "heron/scheduler/" )
67+
local java_paths=$(find {heron,heron/tools,tools,integration_test,examples,storm-compatibility/v0.10.2,eco,eco-storm-examples,eco-heron-examples,contrib} -name "*.java" | sed "s|/src/java/.*$|/src/java|"| sed "s|/java/src/.*$|/java/src|" | sed "s|/tests/java/.*$|/tests/java|" | sort -u | fgrep -v "heron/scheduler/" | fgrep -v "heron/scheduler/" )
7168
if [ "$(uname -s | tr 'A-Z' 'a-z')" != "darwin" ]; then
7269
java_paths=$(echo "${java_paths}" | fgrep -v "/objc_tools/")
7370
fi
@@ -92,9 +89,9 @@ function get_consuming_target() {
9289
# Here to the god of bazel, I should probably offer one or two memory chips for that
9390
local target=$(get_target_of $1)
9491
# Get the rule that generated this file.
95-
local generating_target=$(query "kind(rule, deps(${target}, 1)) - ${target}")
92+
local generating_target=$(bazel query "kind(rule, deps(${target}, 1)) - ${target}")
9693
[[ -n $generating_target ]] || echo "Couldn't get generating target for ${target}" 1>&2
97-
local java_library=$(query "rdeps(//heron/..., ${generating_target}, 1) - ${generating_target}")
94+
local java_library=$(bazel query "rdeps(//heron/..., ${generating_target}, 1) - ${generating_target}")
9895
echo "${java_library}"
9996
}
10097

@@ -118,4 +115,5 @@ function collect_generated_paths() {
118115

119116
# GENERATED_PATHS stores pairs of jar:source_path as a list of strings, with
120117
# each pair internally delimited by a colon. Use ${string//:/ } to split one.
121-
GENERATED_PATHS="$(collect_generated_paths)"
118+
#GENERATED_PATHS="$(collect_generated_paths)" # bypass java_doc issue
119+
GENERATED_PATHS=""

0 commit comments

Comments
 (0)