aboutsummaryrefslogtreecommitdiffhomepage
path: root/scripts
diff options
context:
space:
mode:
authorGravatar Lukacs Berki <lberki@google.com>2016-01-19 11:47:11 +0000
committerGravatar Lukacs Berki <lberki@google.com>2016-01-19 13:28:19 +0000
commit6462d87752999d46e8528b52412dbf39d26f4288 (patch)
treec68a4e13f1b056bf2996572852937b7ebf2ee532 /scripts
parentd55d7afc7532f6e0cb56cde4b05487c784842395 (diff)
Make setup-intellij.sh work again.
Somewhat. The generated IntelliJ project is still somewhat broken and you need to manually exclude a few directories to use it and there is a mystical error about a missing method on truth.MapSubject, but at least now it fails in a less spectacular way. Fixes #796. -- MOS_MIGRATED_REVID=112458948
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/get_all_bazel_paths.sh8
1 files changed, 1 insertions, 7 deletions
diff --git a/scripts/get_all_bazel_paths.sh b/scripts/get_all_bazel_paths.sh
index dd132de01e..84f76a2c46 100755
--- a/scripts/get_all_bazel_paths.sh
+++ b/scripts/get_all_bazel_paths.sh
@@ -25,13 +25,7 @@ function query() {
}
# Compile bazel
-[ -f "output/bazel" ] || ./compile.sh tools,compile >&2 || exit $?
-([ -f "tools/jdk/JavaBuilder_deploy.jar" ] \
- && [ -f "tools/jdk/ijar" ] \
- && [ -f "tools/jdk/SingleJar_deploy.jar" ] \
- && [ -f "tools/jdk/GenClass_deploy.jar" ]) \
- || ./compile.sh tools,init output/bazel >&2 \
- || exit $?
+[ -f "output/bazel" ] || ./compile.sh compile >&2 || exit $?
# Build almost everything.
# //third_party/ijar/test/... is disabled due to #273.