Skip to content

Commit

Permalink
moose-environment, package_version update
Browse files Browse the repository at this point in the history
Add support for Catalina.
Update to GCC 9.2/LLVM 9.
Update to Modules 4.3.1.
Add VTK-Mesa support (offscreen rendering).
  • Loading branch information
milljm committed Nov 1, 2019
1 parent fcb0199 commit 1e74c30
Show file tree
Hide file tree
Showing 8 changed files with 60 additions and 10 deletions.
12 changes: 6 additions & 6 deletions framework/doc/packages_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ conda_vtk: 8.2
pip_pylint: 1.6.5
pip_livereload: 2.5.1
moose_packages:
osx10.15: moose-environment_osx-catalina_20191025_x86_64.pkg
osx10.14: moose-environment_osx-mojave_20191025_x86_64.pkg
osx10.15: moose-environment_osx-catalina_20191031_x86_64.pkg
osx10.14: moose-environment_osx-mojave_20191031_x86_64.pkg
osx10.13: moose-environment_osx-highsierra_20191024_x86_64.pkg
osx10.12: moose-environment_osx-sierra_20191024_x86_64.pkg
ubuntu16: moose-environment_ubuntu-16.04_20191025_x86_64.deb
ubuntu18: moose-environment_ubuntu-18.04_20191025_x86_64.deb
fedora30: moose-environment_fedora-30_20191025_x86_64.rpm
centos7: moose-environment_centos-7.7.1908_20191025_x86_64.rpm
ubuntu16: moose-environment_ubuntu-16.04_20191031_x86_64.deb
ubuntu18: moose-environment_ubuntu-18.04_20191031_x86_64.deb
fedora30: moose-environment_fedora-30_20191031_x86_64.rpm
centos7: moose-environment_centos-7.7.1908_20191031_x86_64.rpm
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
## Modify your Zsh Profile

During the installation of the moose-environment package, you have two opportunities to allow the installer to modify your zsh profile. This will allow the moose-environment module system and compiler stack to be made available by default with every new terminal window opened.

- The first is available after clicking 'Customize' during the install. While in this pane, check the option "MOOSE Environment", and then continue by clicking 'Install'.

- The second is after the installer has completed, where you will be presented with a pop-up window alerting you to either allow the installer to make this change, or to do nothing. If you choose 'Cancel' at this point, know that you are now responsible for altering your zsh profile yourself. In order to make the module system available, you must instruct your zsh profile to source the following file:

```bash
source /opt/moose/environments/moose_profile
```

Once sourced, you can then load an appropriate compiler stack for MOOSE-based development:

```bash
module load moose-dev-clang
```

!alert note title= Finalize Installation
Once the installer has completed, and/or you chose to modify your zsh profile yourself, you must close any opened terminal windows, and re-open them to use the MOOSE environment.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

## Modify your Bash Profile

During the installation of one of the above moose-environment packages, you have two opportunities to allow the installer to modify your bash profile. This will allow the moose-environment module system and compiler stack to be made available by default with every new terminal window opened.
During the installation of the moose-environment package, you have two opportunities to allow the installer to modify your bash profile. This will allow the moose-environment module system and compiler stack to be made available by default with every new terminal window opened.

- The first is available after clicking 'Customize' during the install. While in this pane, check the option "MOOSE Environment", and then continue by clicking 'Install'.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

!include getting_started/installation/macos_catalina_pre_req.md

!include getting_started/installation/macos_bash_profile.md
!include getting_started/installation/catalina_profile.md

!include getting_started/installation/install_moose.md
24 changes: 24 additions & 0 deletions modules/doc/content/help/catalina_caveats.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
## MacOS Catalina Caveats id=catalinacaveats

- GCC is not completely functional.

- [There appears to be an issue/bug with Xcode](https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90835), which prevents many GNU sources from compiling while not using the Xcode IDE. However, there is a work-around. But unfortunately it requires some know-how on your part. The `stdlib.h` header file located at `/usr/include` within the basepath of `xcrun --show-sdk-path`, needs to be patched. The following represents the required change:

```diff
diff --git a/usr/include/stdlib.h b/usr/include/stdlib.h
index 035e6c0..035bb92 100644
--- a/usr/include/stdlib.h
+++ b/usr/include/stdlib.h
@@ -58,8 +58,8 @@
#ifndef _STDLIB_H_
#define _STDLIB_H_

-#include <Availability.h>
#include <sys/cdefs.h>
+#include <Availability.h>

#include <_types.h>
#if !defined(_ANSI_SOURCE)
```

- Basically, we want to swap the includes, so that `#include <sys/cdefs.h>` is included before `#include <Availability.h>`. Keep in mind, this change will need to be executed each time Catalina goes through an Xcode update. At the time of this writing, the latest Xcode (11.2) is affected.
4 changes: 4 additions & 0 deletions modules/doc/content/help/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,7 @@
## Some/All of my tests fail

- Please see our [Failing Tests](help/troubleshooting.md#failingtests) troubleshooting section.

## GCC not completly functional warning

- Please see our [MacOS Catalina Caveats](help/troubleshooting.md#catalinacaveats) section.
2 changes: 2 additions & 0 deletions modules/doc/content/help/troubleshooting.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ The content you find here, is a collection of issues commonly experienced by all
!include help/build_issues.md

!include help/failing_tests.md

!include help/catalina_caveats.md
4 changes: 2 additions & 2 deletions package_version
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# moose-environment package version (https://github.com/idaholab/package_builder)
# https://github.com/idaholab/package_builder/pull/209
repo-hash:e0fec5c11f9fe7484714c8fc1a69886941624b2f
# https://github.com/idaholab/package_builder/pull/212
repo-hash:882d2a67a19038452c90736d6caa24222ce5cd3b

0 comments on commit 1e74c30

Please sign in to comment.