From 5f688986594687e49113e8a89e95188eea059e95 Mon Sep 17 00:00:00 2001 From: Lars Bilke <lars.bilke@ufz.de> Date: Wed, 14 Aug 2019 15:16:11 +0200 Subject: [PATCH] [web] Updated prereqs page. Added note for Windows users to enable git symbolic links support. --- .../devguide/getting-started/git-installer-win.png | 3 +++ .../devguide/getting-started/prerequisites.pandoc | 14 +++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 web/content/docs/devguide/getting-started/git-installer-win.png diff --git a/web/content/docs/devguide/getting-started/git-installer-win.png b/web/content/docs/devguide/getting-started/git-installer-win.png new file mode 100644 index 00000000000..c422ef30cf5 --- /dev/null +++ b/web/content/docs/devguide/getting-started/git-installer-win.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:efa3713903e2a9029601cd8bd3c2be55125a204e3e71a8be1772dd84f6a6206c +size 54081 diff --git a/web/content/docs/devguide/getting-started/prerequisites.pandoc b/web/content/docs/devguide/getting-started/prerequisites.pandoc index 2d610794c6d..02aef8f11c1 100644 --- a/web/content/docs/devguide/getting-started/prerequisites.pandoc +++ b/web/content/docs/devguide/getting-started/prerequisites.pandoc @@ -22,7 +22,7 @@ The minimum prerequisites to build OGS are: ## Step: Install a compiler ::: {.win} -As we use lots of features of the C++17-standard we support **Visual Studio 2017** and up. Therefore you will need at least **Windows 7** (64-bit recommended). It is perfectly fine to use the free Community Edition of Visual Studio. +As we use lots of features of the C++11-standard we support **Visual Studio 2015** and up. Therefore you will need at least **Windows 7** (64-bit recommended). It is perfectly fine to use the free Community Edition of Visual Studio. - Download and install [Visual Studio Community 2017](https://www.visualstudio.com/de/thank-you-downloading-visual-studio/?sku=Community&rel=15) - Select the *workload* `Desktop Development with C++` @@ -31,11 +31,11 @@ As we use lots of features of the C++17-standard we support **Visual Studio 2017 ::: ::: {.linux} -If you have a recent linux distribution you should also have a recent gcc. Please check that you have at least **gcc 7.3**: +If you have a recent linux distribution you should also have a recent gcc. Please check that you have at least **gcc 6.2**: ```bash $ gcc --version -gcc (GCC) 7.3.0 +gcc (GCC) 6.2.0 ``` ::: @@ -63,7 +63,11 @@ The Homebrew package manager is needed for installing other libraries and packag Git is a powerful and distributed version control system. OGS source code is hosted on [GitHub](https://github.com/ufz/ogs). See the developer guide page on [Code Reviews]({{< ref "code-reviews" >}}) for more info on how OGS uses GitHub for collaborative development. ::: {.win} -Download and install git from the [git homepage](http://git-scm.com/download/win). The default installer options are fine. This install a new command line called *Git Bash* which should be used for all git operations. +Download and install git from the [git homepage](http://git-scm.com/download/win). Use the default installer options but also enable `Enable symbolic links` under the *Configuring extra options* page. + + + +This install a new command line called *Git Bash* which should be used for all git operations. Let Git know who you are: @@ -241,7 +245,7 @@ Install Conan with Python's pip: pip3 install --user conan ``` -This installed `conan` to `.local/bin` in your home directory. Make sure to have this directory in your `PATH`! +This installed `conan` to `.local/bin` (or `C:\Users\[username]\AppData\Roaming\Python\Python37\Scripts` on Windows) in your home directory. Make sure to have this directory in your `PATH`! Check on a newly opened command line if Conan was installed successfully: -- GitLab