diff options
| author |  Alex Humesky <ahumesky@google.com> | 2015-07-08 18:18:33 +0000 |
|---|---|---|
| committer |  Han-Wen Nienhuys <hanwen@google.com> | 2015-07-10 17:15:23 +0000 |
| commit | d3f7eda5548fae0d9c022d9e1a0761b8e8ba22a6 (patch) | |
| tree | 8cbca5cb9298446be3ac2c539526b7714a647790 /scripts | |
| parent | 525019b7bd8810ef8401ecb80247fa4226eba8c2 (diff) | |
Adds gen jar and manifest proto outputs.
Adds a jar output to Java and Android rules which contains the class files for source files generated from Java annotation processors. For a java_binary foo, the jar will be foo-gen.jar, and for a java_library foo the jar will be libfoo-gen.jar, and similarly for Android. Also adds a binary serialized proto manifest file output to Java and Android rules which describes the contents of the output class jar of those rules, which is used to create the -gen.jar. See src/main/protobuf/java_compilation.proto.
--
MOS_MIGRATED_REVID=97793715
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/bootstrap/bootstrap.sh | 1 | ||||
| -rwxr-xr-x | scripts/get_all_bazel_paths.sh | 8 | ||||
| -rwxr-xr-x | scripts/setup-eclipse.sh | 9 |
3 files changed, 13 insertions, 5 deletions
diff --git a/scripts/bootstrap/bootstrap.sh b/scripts/bootstrap/bootstrap.sh index bd5721c49c..3c0f7ff222 100755 --- a/scripts/bootstrap/bootstrap.sh +++ b/scripts/bootstrap/bootstrap.sh @@ -32,6 +32,7 @@ fi : ${JAVA_VERSION:="1.8"} : ${BAZEL_ARGS="--singlejar_top=//src/java_tools/singlejar:bootstrap_deploy.jar \ --javabuilder_top=//src/java_tools/buildjar:bootstrap_deploy.jar \ + --genclass_top=//src/java_tools/buildjar:bootstrap_genclass_deploy.jar \ --ijar_top=//third_party/ijar"} function bazel_bootstrap() { diff --git a/scripts/get_all_bazel_paths.sh b/scripts/get_all_bazel_paths.sh index c945ea0a08..b64ff407e2 100755 --- a/scripts/get_all_bazel_paths.sh +++ b/scripts/get_all_bazel_paths.sh @@ -25,8 +25,12 @@ function query() { } # Compile bazel -([ -f "output/bazel" ] && [ -f "tools/jdk/JavaBuilder_deploy.jar" ] && [ -f "tools/jdk/ijar" ] \ - && [ -f "tools/jdk/SingleJar_deploy.jar" ] && [ -e "tools/jdk/jdk" ]) || ./compile.sh >&2 || exit $? +([ -f "output/bazel" ] \ + && [ -f "tools/jdk/JavaBuilder_deploy.jar" ] \ + && [ -f "tools/jdk/ijar" ] \ + && [ -f "tools/jdk/SingleJar_deploy.jar" ] \ + && [ -f "tools/jdk/GenClass_deploy.jar" ] \ + && [ -e "tools/jdk/jdk" ]) || ./compile.sh >&2 || exit $? # Build almost everything. # //third_party/ijar/test/... is disabled due to #273. diff --git a/scripts/setup-eclipse.sh b/scripts/setup-eclipse.sh index 2dd01050c1..5bac977d26 100755 --- a/scripts/setup-eclipse.sh +++ b/scripts/setup-eclipse.sh @@ -30,9 +30,12 @@ EXTRA_JARS="bazel-bazel/external/local-jdk/lib/tools.jar" cd $(dirname $(dirname "$0")) # Compile bazel -([ -f "output/bazel" ] && [ -f "tools/jdk/JavaBuilder_deploy.jar" ] \ - && [ -f "tools/jdk/ijar" ] && [ -f "tools/jdk/SingleJar_deploy.jar" ] \ - && [ -e "tools/jdk/jdk" ]) || ./compile.sh >&2 || exit $? +([ -f "output/bazel" ] \ + && [ -f "tools/jdk/JavaBuilder_deploy.jar" ] \ + && [ -f "tools/jdk/ijar" ] \ + && [ -f "tools/jdk/SingleJar_deploy.jar" ] \ + && [ -f "tools/jdk/GenClass_deploy.jar" ] \ + && [ -e "tools/jdk/jdk" ]) || ./compile.sh >&2 || exit $? # Make the script use actual bazel function bazel() { |