Commit 8ab2f6c3 authored by Dion Haefner's avatar Dion Haefner

tweaked installation

parent d3f18aaa
...@@ -12,7 +12,7 @@ stages: ...@@ -12,7 +12,7 @@ stages:
main_job: main_job:
script: script:
- ./dune-common/bin/dunecontrol --only=dorie all - ./dune-common/bin/dunecontrol --only=dorie all
- ./dune-common/bin/dunecontrol --only=dorie make install - export PATH=/opt/dune/dorie/build-cmake/bin:$PATH
- ARGS="--output-on-failure" ./dune-common/bin/dunecontrol --only=dorie make test - ARGS="--output-on-failure" ./dune-common/bin/dunecontrol --only=dorie make test
stage: main stage: main
...@@ -21,6 +21,6 @@ update_dune_job: ...@@ -21,6 +21,6 @@ update_dune_job:
- ./dune-common/bin/dunecontrol update || true - ./dune-common/bin/dunecontrol update || true
- ./dune-common/bin/dunecontrol exec "rm -rf build-cmake" - ./dune-common/bin/dunecontrol exec "rm -rf build-cmake"
- ./dune-common/bin/dunecontrol all - ./dune-common/bin/dunecontrol all
- ./dune-common/bin/dunecontrol make install - export PATH=/opt/dune/dorie/build-cmake/bin:$PATH
- ARGS="--output-on-failure" ./dune-common/bin/dunecontrol --only=dorie make test - ARGS="--output-on-failure" ./dune-common/bin/dunecontrol --only=dorie make test
stage: main stage: main
...@@ -76,7 +76,7 @@ Depending on your system configuration, there will be more packages necessary to ...@@ -76,7 +76,7 @@ Depending on your system configuration, there will be more packages necessary to
| [dune-python](https://gitlab.dune-project.org/quality/dune-python) | releases/2.4 | [dune-python](https://gitlab.dune-project.org/quality/dune-python) | releases/2.4
| [dune-testtools](https://gitlab.dune-project.org/quality/dune-testtools) | releases/2.4 | [dune-testtools](https://gitlab.dune-project.org/quality/dune-testtools) | releases/2.4
If you also want to build the documentation, you will additionally need to install Doxygen. If you also want to build the documentation, you will additionally need to install Doxygen, Sphinx and Breathe.
### Manual Installation on Ubuntu ### Manual Installation on Ubuntu
The following instructions follow the basic installation on a fresh Ubuntu system and are similarly executed to create the DORiE Docker image. The following instructions follow the basic installation on a fresh Ubuntu system and are similarly executed to create the DORiE Docker image.
...@@ -84,14 +84,15 @@ The following instructions follow the basic installation on a fresh Ubuntu syste ...@@ -84,14 +84,15 @@ The following instructions follow the basic installation on a fresh Ubuntu syste
1. Install third party packages: 1. Install third party packages:
apt update apt update
apt install autoconf bison cmake doxygen flex gcc-5 g++-5 gfortran-5 \ apt install autoconf bison cmake flex gcc-5 g++-5 gfortran-5 \
git libatlas-base-dev libfftw3-dev libfftw3-mpi-dev \ git libatlas-base-dev libfftw3-dev libfftw3-mpi-dev \
libfreetype6-dev libhdf5-mpi-dev libopenmpi-dev libpng-dev \ libfreetype6-dev libhdf5-mpi-dev libopenmpi-dev libpng-dev \
libsuperlu-dev libxft-dev python3-dev python3-pip libsuperlu-dev libxft-dev python-dev python-pip python-sphinx \
python-breathe doxygen
2. Install the necessary Python packages using `pip`: 2. Install the necessary Python packages using `pip`:
python3 -m pip install virtualenv python -m pip install virtualenv
3. Clone the specified version of UG into a suitable folder on your machine. Install it by calling 3. Clone the specified version of UG into a suitable folder on your machine. Install it by calling
......
...@@ -6,7 +6,6 @@ endfunction() ...@@ -6,7 +6,6 @@ endfunction()
set(python_paths "") set(python_paths "")
install_python_package("doc" python_paths)
install_python_package("utilities" python_paths) install_python_package("utilities" python_paths)
install_python_package("parscraper" python_paths) install_python_package("parscraper" python_paths)
add_subdirectory(parfield/wrapper) add_subdirectory(parfield/wrapper)
......
alabaster
Babel
breathe
docutils
Jinja2
MarkupSafe
Pygments
pytz
six
snowballstemmer
Sphinx
sphinx-rtd-theme
wheel
#!/usr/bin/env python
# -*- coding: utf-8 -*-
import sys
from setuptools import setup
# do nothing, just install requirements
setup(name='dorie.doc')
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment