Skip to content

Commit

Permalink
Merge pull request #1741 from bennibbelink/release-build-default
Browse files Browse the repository at this point in the history
Default to Release build
  • Loading branch information
gonuke committed Apr 30, 2024
2 parents 7a77532 + 1d0eaee commit 7966963
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ Since last release
* Updated minor documentation about updating CHANGELOG.rst, fix formatting for rendering
hyperlinks, and change branch name in README instructions on forking for development (#1715)
* Updated GTest suite to be fetched from GitHub during the build process (#1738)
* Default to building a Release version of Cyclus when installing via the python script (#1741)

**Removed:**

Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ ARG make_cores=2
COPY . /cyclus
WORKDIR /cyclus

RUN python install.py -j ${make_cores} --build-type=Release --allow-milps --code_coverage
RUN python install.py -j ${make_cores} --allow-milps --code_coverage
ENV PATH /root/.local/bin:$PATH
ENV LD_LIBRARY_PATH /root/.local/lib:/root/.local/lib/cyclus
RUN lcov -c -d /cyclus -o initial_coverage.info --gcov-tool ${GCOV} --initial --no-external && \
Expand All @@ -135,7 +135,7 @@ WORKDIR /cyclus

# You may add the option "--cmake-debug" to the following command
# for further CMake debugging.
RUN python install.py -j ${make_cores} --build-type=Release --allow-milps
RUN python install.py -j ${make_cores} --allow-milps
ENV PATH /root/.local/bin:$PATH

FROM cyclus as deb-generation
Expand Down
2 changes: 1 addition & 1 deletion docker/Rocky.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ WORKDIR /cyclus

# You may add the option "--cmake-debug" to the following command
# for further CMake debugging.
RUN python install.py -j ${make_cores} --build-type=Release -D Python3_EXECUTABLE=/usr/bin/python3.11
RUN python install.py -j ${make_cores} -D Python3_EXECUTABLE=/usr/bin/python3.11
ENV PATH /root/.local/bin:$PATH
ENV LD_LIBRARY_PATH /root/.local/lib:/root/.local/lib/cyclus

Expand Down
3 changes: 2 additions & 1 deletion install.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,8 @@ def main():
parser.add_argument('--cmake_prefix_path', help=cmake_prefix_path)

build_type = "the CMAKE_BUILD_TYPE"
parser.add_argument('--build-type', '--build_type', help=build_type)
parser.add_argument('--build-type', '--build_type', help=build_type,
default='Release')

parser.add_argument('--data-model-version', dest='data_model_version', default=None,
help='Sets the core version number.')
Expand Down

0 comments on commit 7966963

Please sign in to comment.