commit 9b1e3a2957981ab6900dbb7d29c8c68ef9ba2f76
author Lukacs Berki <lberki@google.com> Wed Nov 18 09:55:46 2015 +0000
committer Lukacs Berki <lberki@google.com> Wed Nov 18 15:31:56 2015 +0000
tree e4f9cf0c2b86697d0fff7a0fac0852fbda06e637
parent 07475c7b3812d6194602213a69e6e9f70643b32a

Tweak the bootstrapping and build process so that the prebuilt tools under tools/jdk are not necessary anymore.

Fixes #508.

--
MOS_MIGRATED_REVID=108123264

src/create_embedded_tools.sh

diff --git a/src/create_embedded_tools.sh b/src/create_embedded_tools.sh
index 2abd269..742b2ec 100755
--- a/src/create_embedded_tools.sh
+++ b/src/create_embedded_tools.sh
@@ -27,7 +27,14 @@
 trap "rm -fr \"${PACKAGE_DIR}\"" EXIT
 
 for i in $*; do
-  OUTPUT_PATH=$(echo $i | sed 's_^.*bazel-out/[^/]*/bin/__')
+  case "$i" in
+    *JavaBuilder_deploy.jar) OUTPUT_PATH=tools/jdk/JavaBuilder_deploy.jar ;;
+    *SingleJar_deploy.jar) OUTPUT_PATH=tools/jdk/SingleJar_deploy.jar ;;
+    *GenClass_deploy.jar) OUTPUT_PATH=tools/jdk/GenClass_deploy.jar ;;
+    *ijar) OUTPUT_PATH=tools/jdk/ijar ;;
+    *) OUTPUT_PATH=$(echo $i | sed 's_^.*bazel-out/[^/]*/bin/__') ;;
+  esac
+
   mkdir -p "${PACKAGE_DIR}/$(dirname "${OUTPUT_PATH}")"
   cp "$i" "${PACKAGE_DIR}/${OUTPUT_PATH}"
 done