From 84450b8c1a6d9a5cb47032d00aac851741fc94ad Mon Sep 17 00:00:00 2001
From: Kristina Chodorow <kchodorow@google.com>
Date: Thu, 28 Jan 2016 15:16:02 +0000
Subject: Rollback of commit 14cf67863d56bab1eef11687a881adf323ba55ad.

*** Reason for rollback ***

Issue that caused the rollback (#819) is resolved

*** Original change description ***

Automated [] rollback of [].

*** Reason for rollback ***

Prerequisite for rolling back j2objc base workspace change

*** Original change description ***

Remove base_workspace from bazel setup

I also removed a couple places the documentation referred to it incorrectly.
There are still a couple of blog posts that mention it, but that seemed okay.

RELNOTES: A bazelrc with --package_path set is no longer required for Bazel to
find its tools. This also means that building //......

--
MOS_MIGRATED_REVID=113259357
---
 compile.sh | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

(limited to 'compile.sh')

diff --git a/compile.sh b/compile.sh
index 1cc6ecf545..9f435e0b2b 100755
--- a/compile.sh
+++ b/compile.sh
@@ -27,30 +27,26 @@ cd "$(dirname "$0")"
 source scripts/bootstrap/buildenv.sh
 
 function usage() {
-  [ -n "${1:-build}" ] && echo "Invalid command(s): $1" >&2
+  [ -n "${1:-compile}" ] && echo "Invalid command(s): $1" >&2
   echo "syntax: $0 [command[,command]* [BAZEL_BIN [BAZEL_SUM]]]" >&2
   echo "  General purpose commands:" >&2
-  echo "     build       = compile,init (default)" >&2
-  echo "     compile     = compile a Bazel binary for usage" >&2
-  echo "     init        = initialize the base workspace" >&2
+  echo "     compile       = compile the bazel binary (default)" >&2
   echo "  Commands for developers:" >&2
-  echo "     all         = build,determinism,test" >&2
+  echo "     all         = compile,determinism,test" >&2
   echo "     determinism = test for stability of Bazel builds" >&2
   echo "     test        = run the full test suite of Bazel" >&2
   exit 1
 }
 
 function parse_options() {
-  local keywords="(build|compile|init|all|determinism|bootstrap|test)"
-  COMMANDS="${1:-build}"
+  local keywords="(compile|all|determinism|bootstrap|test)"
+  COMMANDS="${1:-compile}"
   [[ "${COMMANDS}" =~ ^$keywords(,$keywords)*$ ]] || usage "$@"
   DO_COMPILE=
   DO_CHECKSUM=
   DO_FULL_CHECKSUM=1
   DO_TESTS=
-  DO_BASE_WORKSPACE_INIT=
-  [[ "${COMMANDS}" =~ (compile|build|all) ]] && DO_COMPILE=1
-  [[ "${COMMANDS}" =~ (init|build|all) ]] && DO_BASE_WORKSPACE_INIT=1
+  [[ "${COMMANDS}" =~ (compile|all) ]] && DO_COMPILE=1
   [[ "${COMMANDS}" =~ (bootstrap|determinism|all) ]] && DO_CHECKSUM=1
   [[ "${COMMANDS}" =~ (bootstrap) ]] && DO_FULL_CHECKSUM=
   [[ "${COMMANDS}" =~ (test|all) ]] && DO_TESTS=1
@@ -159,14 +155,5 @@ if [ $DO_TESTS ]; then
       || fail "Tests failed"
 fi
 
-#
-# Setup the base workspace
-#
-if [ $DO_BASE_WORKSPACE_INIT ]; then
-  new_step 'Setting up base workspace'
-  display "."
-  source scripts/bootstrap/init_workspace.sh
-fi
-
 clear_log
 display "Build successful! Binary is here: ${BAZEL}"
-- 
cgit v1.2.3