Skip to content

Commit

Permalink
Revert to GA CMake 3.17.3 from RC CMake 3.18.0-rc2 and update Makefil…
Browse files Browse the repository at this point in the history
…e to Release 1.0A from Dev
  • Loading branch information
rhastie committed Jun 25, 2020
1 parent 59a8b85 commit d37a2b7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive && apt-get install -
apt-get clean -y --no-install-recommends && \
apt-get autoclean -y --no-install-recommends

## Get and Make CMake version 3.18.0 (latest when Dockerfile developed) - Adjust as necessary
RUN cd /home/ && wget --no-check-certificate https://cmake.org/files/v3.18/cmake-3.18.0-rc2.tar.gz && \
tar xvf cmake-3.18.0-rc2.tar.gz && rm cmake-3.18.0-rc2.tar.gz && cd /home/cmake-3.18.0-rc2 && \
## Get and Make CMake version 3.17.3 (latest GA when Dockerfile developed) - Adjust as necessary
RUN cd /home/ && wget --no-check-certificate https://cmake.org/files/v3.17/cmake-3.17.3.tar.gz && \
tar xvf cmake-3.17.3.tar.gz && rm cmake-3.17.3.tar.gz && cd /home/cmake-3.17.3 && \
./bootstrap && \
if [ -n "$makemt" ]; then echo "Making multi-threaded with $makemt jobs"; make -j$makemt; else echo "Making single-threaded"; make; fi && \
make install
Expand Down Expand Up @@ -100,7 +100,7 @@ RUN cd /home/nmos-js/Development && \
## Move executables, libraries and clean up container as much as possible
RUN cd /home/nmos-cpp/Development/build && \
cp nmos-cpp-node nmos-cpp-registry /home && \
cd /home && rm -rf .git conan cmake-3.18.0-rc2 nmos-cpp nmos-js nmos-web-router
cd /home && rm -rf .git conan cmake-3.17.3 nmos-cpp nmos-js nmos-web-router

## Re-build container for optimised runtime environment using clean Ubuntu Bionic release
FROM ubuntu:bionic
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
NAME = nmos-cpp
# grab the abrev commit SHA from Dockerfile
VERSION = 0.1S-$(shell sed -n 's/.*NMOS_CPP_VERSION=\(.......\).*/\1/p' Dockerfile)
VERSION = 1.0A-$(shell sed -n 's/.*NMOS_CPP_VERSION=\(.......\).*/\1/p' Dockerfile)
# Get number of processors available and add 1
NPROC = $(shell echo $(shell nproc)+1 | bc)

Expand Down

0 comments on commit d37a2b7

Please sign in to comment.