aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--site/docs/install-compile-source.md45
-rw-r--r--site/docs/install-windows.md8
-rw-r--r--site/docs/windows.md27
3 files changed, 23 insertions, 57 deletions
diff --git a/site/docs/install-compile-source.md b/site/docs/install-compile-source.md
index 453d5658df..327d18ca44 100644
--- a/site/docs/install-compile-source.md
+++ b/site/docs/install-compile-source.md
@@ -5,6 +5,8 @@ title: Compile Bazel from Source
# <a name="compiling-from-source"></a>Compile Bazel from source
+## <a name="unix"></a> On Linux or macOS
+
1. Ensure that you have OpenJDK 8 installed on your system.
For a system based on debian packages (e.g. Debian, Ubuntu), install
OpenJDK 8 by running the command `sudo apt-get install openjdk-8-jdk`.
@@ -22,37 +24,22 @@ title: Compile Bazel from Source
binary in `output/bazel`. This binary is self-contained, so it can be copied
to a directory on the PATH (such as `/usr/local/bin`) or used in-place.
-## <a name="compiling-from-source-issues"></a>Known issues when compiling from source
-
-### On Windows:
-
-* version 0.4.4 and below: `compile.sh` may fail right after start with an error
- like this:
-
- ```
- File not found - *.jar
- no error prone jar
- ```
-
- Workaround is to run this (and add it to your `~/.bashrc`):
+## <a name="windows"></a> On Windows
- ```
- export PATH="/bin:/usr/bin:$PATH"
- ```
+Windows support is in beta. Known issues are [marked with label
+"Windows"](https://github.com/bazelbuild/bazel/issues?q=is%3Aissue+is%3Aopen+label%3A%22category%3A+multi-platform+%3E+windows%22)
+on github issues.
-* version 0.4.3 and below: `compile.sh` may fail fairly early with many Java
- compilation errors. The errors look similar to:
+Prerequisites:
- ```
- C:\...\bazel_VR1HFY7x\src\com\google\devtools\build\lib\remote\ExecuteServiceGrpc.java:11: error: package io.grpc.stub does not exist
- import static io.grpc.stub.ServerCalls.asyncUnaryCall;
- ^
- ```
+* Follow the [Windows requirements](windows.md#requirements).
+* Install [Visual C++ Build Tools](http://landinghub.visualstudio.com/visual-cpp-build-tools)
+ or the full [Visual C++](https://www.visualstudio.com/) (as part of Visual
+ Studio; Community Edition is fine) with Windows SDK installed.
- This is caused by a bug in one of the bootstrap scripts
- (`scripts/bootstrap/compile.sh`). Manually apply this one-line fix if you
- want to build Bazel purely from source (without using an existing Bazel
- binary): [5402993a5e9065984a42eca2132ec56ca3aa456f]( https://github.com/bazelbuild/bazel/commit/5402993a5e9065984a42eca2132ec56ca3aa456f).
+To build Bazel on Windows:
-* version 0.3.2 and below:
- [github issue #1919](https://github.com/bazelbuild/bazel/issues/1919)
+* Open the msys2 shell.
+* Clone the [Bazel git repository](https://github.com/bazelbuild/bazel) as normal.
+* Run ``compile.sh`` in Bazel directory.
+* If all works fine, Bazel will be built at ``output\bazel.exe``.
diff --git a/site/docs/install-windows.md b/site/docs/install-windows.md
index 44713c291e..2228e2b683 100644
--- a/site/docs/install-windows.md
+++ b/site/docs/install-windows.md
@@ -5,9 +5,8 @@ title: Installing Bazel on Windows
# <a name="windows"></a>Install Bazel on Windows
-Windows support is highly experimental. Known issues are [marked with
-label "Windows"](https://github.com/bazelbuild/bazel/issues?q=is%3Aissue+is%3Aopen+label%3A%22category%3A+multi-platform+%3E+windows%22)
-on GitHub issues.
+Windows support is in beta. Known issues are [marked with label "Windows"](https://github.com/bazelbuild/bazel/issues?q=is%3Aissue+is%3Aopen+label%3A%22category%3A+multi-platform+%3E+windows%22)
+on GitHub.
We currently support only 64 bit Windows 7 or higher and we compile Bazel as a
MSYS2 binary.
@@ -33,7 +32,8 @@ This will install the latest available version of Bazel, and dependencies.
This package is experimental. Please provide feedback to `@petemounce` in GitHub
issue tracker. See the [Chocolatey installation and package
-maintenance](windows-chocolatey-maintenance.md) guide for more information.
+maintenance](https://bazel.build/windows-chocolatey-maintenance.html) guide for
+more information.
## <a name="download-binary-windows"></a>Install using the binary distribution
diff --git a/site/docs/windows.md b/site/docs/windows.md
index 5a0b6b51c4..7b986b3780 100644
--- a/site/docs/windows.md
+++ b/site/docs/windows.md
@@ -5,17 +5,13 @@ title: Windows
# Using Bazel on Windows
-Windows support is experimental. Known issues are [marked with label
+Windows support is in beta. Known issues are [marked with label
"Windows"](https://github.com/bazelbuild/bazel/issues?q=is%3Aissue+is%3Aopen+label%3A%22category%3A+multi-platform+%3E+windows%22)
on github issues.
We currently support only 64 bit Windows 7 or higher and we compile Bazel as a
msys2 binary.
-## <a name="install"></a>Installation
-
-See instructions on the [installation page](install-windows.md).
-
## <a name="requirements"></a>Requirements
Before you can compile or run Bazel, you will need to set some environment
@@ -63,26 +59,9 @@ To **run** Bazel (even pre-built binaries), you will need:
pacman -Syuu gcc git curl zip unzip zlib-devel
```
-To **compile** Bazel, in addition to the above you will need:
-
-* [Visual C++ Build Tools](http://landinghub.visualstudio.com/visual-cpp-build-tools)
- or the full [Visual C++](https://www.visualstudio.com/) (as part of Visual
- Studio; Community Edition is fine) with Windows SDK installed.
-* You may need to apply some patches/workarounds, see the
- [known issues](install-compile-source.md#known-issues-when-compiling-from-source).
-
-## <a name="compiling"></a>Compiling Bazel on Windows
-
-Ensure you have the [requirements](#requirements).
-
-To build Bazel:
-
-* Open the msys2 shell.
-* Clone the Bazel git repository as normal.
-* Set the environment variables (see above)
-* Run ``compile.sh`` in Bazel directory.
-* If all works fine, bazel will be built at ``output\bazel.exe``.
+## <a name="install"></a>Installation
+See [Install Bazel on Windows](install-windows.md) for installation instructions.
## <a name="using"></a>Using Bazel on Windows