commit 479cd7eb

branches: v2.1.X

sago007 · 2017-04-01 11:06
479cd7ebdf5f9372b791e416d91bd301851863f0 patch · browse files
parent 2972b596ab0950e764e3d4bdb7488972069f919c

Removed the SNAPSHOT mark from Docker and CMake

Changed files

M	CMakeLists.txt before
M	source/misc/docker/Dockerfile.Ubuntu14.04build before
M	source/misc/docker/Dockerfile.WindoesBuild before

diff --git a/CMakeLists.txt b/CMakeLists.txt index fe19089..860a8a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt

@@ -3,7 +3,7 @@ project (blockattack)

set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${blockattack_SOURCE_DIR}/source/misc/cmake")

set(BIN_DIR ${blockattack_SOURCE_DIR}/Game)

-SET(CPACK_PACKAGE_VERSION "2.1.0-SNAPSHOT")

+SET(CPACK_PACKAGE_VERSION "2.1.0")

SET(CPACK_PACKAGE_VERSION_MAJOR "2")

SET(CPACK_PACKAGE_VERSION_MINOR "1")

SET(CPACK_PACKAGE_VERSION_PATCH "0")

diff --git a/source/misc/docker/Dockerfile.Ubuntu14.04build b/source/misc/docker/Dockerfile.Ubuntu14.04build index 7cdcdf3..c841376 100644 --- a/source/misc/docker/Dockerfile.Ubuntu14.04build +++ b/source/misc/docker/Dockerfile.Ubuntu14.04build

@@ -6,7 +6,7 @@ RUN mkdir -p /staging/blockattack-game

COPY . /staging/blockattack-game

-ENV BLOCKATTACK_VERSION 2.1.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.1.0

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/source/misc/docker/Dockerfile.WindoesBuild b/source/misc/docker/Dockerfile.WindoesBuild index 9e65974..d00b704 100644 --- a/source/misc/docker/Dockerfile.WindoesBuild +++ b/source/misc/docker/Dockerfile.WindoesBuild

@@ -8,7 +8,7 @@ RUN mkdir -p /output

COPY . /staging/blockattack-game

-ENV BLOCKATTACK_VERSION 2.1.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.1.0

RUN cd /staging/blockattack-game && \

./packdata.sh && \