You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@heron.apache.org by ka...@apache.org on 2018/06/18 13:17:47 UTC
[incubator-heron] branch revert-2921-add-jdk-to-bazel_configure
created (now c50506e)
This is an automated email from the ASF dual-hosted git repository.
karthikz pushed a change to branch revert-2921-add-jdk-to-bazel_configure
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git.
at c50506e Revert "Add JDK/JAVA_HOME to bazel_configure.py (#2921)"
This branch includes the following new commits:
new c50506e Revert "Add JDK/JAVA_HOME to bazel_configure.py (#2921)"
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
karthikz@apache.org.
[incubator-heron] 01/01: Revert "Add JDK/JAVA_HOME to
bazel_configure.py (#2921)"
Posted by ka...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
karthikz pushed a commit to branch revert-2921-add-jdk-to-bazel_configure
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
commit c50506ef656f4dbac1e0347b9a39e457d73254de
Author: Karthik Ramasamy <ka...@streaml.io>
AuthorDate: Mon Jun 18 06:17:45 2018 -0700
Revert "Add JDK/JAVA_HOME to bazel_configure.py (#2921)"
This reverts commit b3522d2c319965630b64d0c9a45a3a5b56d6fca6.
---
bazel_configure.py | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/bazel_configure.py b/bazel_configure.py
index ed8b439..b91efe2 100755
--- a/bazel_configure.py
+++ b/bazel_configure.py
@@ -263,19 +263,6 @@ variable to specify the full path to yours.'""" % (program, program, program, en
print('Using %s:\t%s' % (msg.ljust(20), print_value))
return VALUE
-def discover_jdk():
- try:
- jdk_path = os.environ['JAVA_HOME']
- except KeyError:
- javac_path = real_program_path('javac')
- if javac_path is None:
- fail("You need to have JDK installed to build Heron.\n"
- "You can set the JAVA_HOME environment variavle to specify the full path to yours.")
- jdk_bin_path = os.path.dirname(javac_path)
- jdk_path = os.path.dirname(jdk_bin_path)
- print('Using %s:\t%s' % ('JDK'.ljust(20), jdk_path))
- return jdk_path
-
######################################################################
# Discover the linker directory
######################################################################
@@ -390,7 +377,6 @@ def main():
env_map['CXXCPP'] = discover_tool('cpp','C++ preprocessor', 'CXXCPP', cpp_min)
env_map['LD'] = discover_tool('ld','linker', 'LD')
env_map['BLDFLAG'] = discover_linker(env_map)
- env_map['JAVA_HOME'] = discover_jdk()
# Discover the utilities
env_map['AUTOMAKE'] = discover_tool('automake', 'Automake', 'AUTOMAKE', '1.9.6')
--
To stop receiving notification emails like this one, please contact
karthikz@apache.org.