From eedbd197dcd04a560ecf77c96513ecbdb0206223 Mon Sep 17 00:00:00 2001 From: Floris van Doorn Date: Wed, 18 Jan 2017 22:54:46 +0100 Subject: [PATCH] doc(README/make): correct some build instructions --- README.md | 5 ++--- doc/make/msys2.md | 10 +++++----- doc/make/ubuntu-12.04-detailed.md | 20 ++++++++++---------- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index ed991bb3b..68b20d2b8 100644 --- a/README.md +++ b/README.md @@ -32,8 +32,8 @@ _Windows_ _Linux_ -- [Ubuntu 12.04](doc/make/ubuntu-12.04.md) -- [Ubuntu 12.04 (detailed)](doc/make/ubuntu-12.04-detailed.md) +- [Ubuntu 12.04 or newer](doc/make/ubuntu-12.04.md) +- [Ubuntu 12.04 or newer (detailed)](doc/make/ubuntu-12.04-detailed.md) - [Fedora 19](doc/make/fedora-19.md) _OS X_ @@ -54,5 +54,4 @@ Miscellaneous - [Coding Style](doc/coding_style.md) - [Library Style Conventions](doc/lean/library_style.org) - [Git Commit Conventions](doc/commit_convention.md) -- [Automatic Builds](doc/make/travis.md) - [Syntax Highlight Lean Code in LaTeX](extras/latex/lstlean.md) diff --git a/doc/make/msys2.md b/doc/make/msys2.md index 3b385ba83..1e716b814 100644 --- a/doc/make/msys2.md +++ b/doc/make/msys2.md @@ -11,9 +11,9 @@ It is easy to install all dependencies, it produces native ## Installing dependencies -Lean requires Python2 or Python3. If you do not have a Python installation on your machine, +Lean requires Python2 or Python3. If you do not have a Python installation on your machine, please download and install one from [Python.org](https://www.python.org/downloads/windows). -Also please make sure that your `PATH` environment variable includes the installed +Also please make sure that your `PATH` environment variable includes the installed Python directory (i.e. `C:\Python27`). [The official webpage of msys2][msys2] provides one-click installers. @@ -50,11 +50,11 @@ In the [msys2] shell, execute the following commands. ```bash cd /c/ -git clone https://github.com/leanprover/lean +git clone https://github.com/leanprover/lean2 git clone http://github.com/leanprover/emacs-dependencies mkdir -p lean/src/emacs/dependencies cp -R emacs-dependencies/* lean/src/emacs/dependencies -cd lean +cd lean2 mkdir build && cd build cmake -D CMAKE_CXX_COMPILER=g++.exe -G Ninja ../src ninja @@ -72,7 +72,7 @@ In the [msys2] shell, execute the following commands. ```bash cd /c/ -git clone https://github.com/leanprover/lean +git clone https://github.com/leanprover/lean2 cd lean mkdir build && cd build cmake -D CMAKE_CXX_COMPILER=g++.exe -D BOOST=ON -G Ninja ../src diff --git a/doc/make/ubuntu-12.04-detailed.md b/doc/make/ubuntu-12.04-detailed.md index c1aa8a223..26661a786 100644 --- a/doc/make/ubuntu-12.04-detailed.md +++ b/doc/make/ubuntu-12.04-detailed.md @@ -28,7 +28,7 @@ Preparing working environment on Ubuntu 12.04 sudo apt-get install libboost1.54-dev sudo apt-get install libboost-thread1.54-dev -### Fork Lean on github : https://github.com/leanprover/lean +### Fork Lean on github : https://github.com/leanprover/lean2 ### Create a projects directory @@ -38,22 +38,22 @@ Preparing working environment on Ubuntu 12.04 ### Clone your fork - git clone https://github.com/[your-user-name]/lean.git + git clone https://github.com/[your-user-name]/lean2.git ### Build Lean in release mode - cd lean - mkdir -p build/debug - cd build/debug - cmake -D CMAKE_BUILD_TYPE=Release ../../src + cd lean2 + mkdir -p build + cd build + cmake -D CMAKE_BUILD_TYPE=Release ../src make ### Alternatively, build Lean using Boost - cd lean - mkdir -p build/release - cd build/release - cmake -D CMAKE_BUILD_TYPE=Release -D BOOST=ON ../../src + cd lean2 + mkdir -p build + cd build + cmake -D CMAKE_BUILD_TYPE=Release -D BOOST=ON ../src make ### If you are using Emacs, here are some basic configurations