nlu90 closed pull request #2903: cleaning setup scripts for removed directories
URL: https://github.com/apache/incubator-heron/pull/2903
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/scripts/get_all_heron_paths.sh b/scripts/get_all_heron_paths.sh
index 8df9b5207c..c88921bd91 100755
--- a/scripts/get_all_heron_paths.sh
+++ b/scripts/get_all_heron_paths.sh
@@ -67,7 +67,7 @@ function get_package_of() {
}
function get_heron_java_paths() {
- local java_paths=$(find
{heron,heron/tools,tools,integration_test,storm-compatibility,contrib,eco,eco-storm-examples,eco-heron-examples}
-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/" )
+ local java_paths=$(find
{heron,heron/tools,tools,integration_test,storm-compatibility,eco,eco-storm-examples,eco-heron-examples}
-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/" )
if [ "$(uname -s | tr 'A-Z' 'a-z')" != "darwin" ]; then
java_paths=$(echo "${java_paths}" | fgrep -v "/objc_tools/")
fi
@@ -105,8 +105,7 @@ function get_containing_library() {
function collect_generated_binary_deps() {
local proto_deps=$(find bazel-bin/heron/proto -type f | grep "jar$");
- local thrift_deps=$(find bazel-bin/heron/metricsmgr/src/thrift -type f |
grep "jar$");
- echo "${proto_deps} ${thrift_deps}" | sort | uniq
+ echo "${proto_deps}" | sort | uniq
}
function collect_generated_paths() {
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
