commit 6704a929

sago007 · 2018-05-13 14:40
6704a929af0090574a7805395c3736c2a6e58693 patch · browse files
parent a4b0e8d115e8ae2215e91babe67a2eec8402b894

Updated version

Changed files

M	source/misc/docker/Dockerfile.Fedora25build before
M	source/misc/docker/Dockerfile.Ubuntu12.04build_Standalone before
M	source/misc/docker/Dockerfile.Ubuntu14.04build before
M	source/misc/docker/Dockerfile.Ubuntu14.04build_Standalone before
M	source/misc/docker/Dockerfile.Ubuntu14.04build_Standalone32 before
M	source/misc/standalone/build_standalone.sh before

diff --git a/source/misc/docker/Dockerfile.Fedora25build b/source/misc/docker/Dockerfile.Fedora25build index 5bc6b25..b411203 100644 --- a/source/misc/docker/Dockerfile.Fedora25build +++ b/source/misc/docker/Dockerfile.Fedora25build

@@ -15,7 +15,7 @@ zip \

COPY . /staging/blockattack-game

-ENV BLOCKATTACK_VERSION 2.1.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.2.0-SNAPSHOT

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/source/misc/docker/Dockerfile.Ubuntu12.04build_Standalone b/source/misc/docker/Dockerfile.Ubuntu12.04build_Standalone index 971a4e6..cf767ed 100644 --- a/source/misc/docker/Dockerfile.Ubuntu12.04build_Standalone +++ b/source/misc/docker/Dockerfile.Ubuntu12.04build_Standalone

@@ -16,7 +16,7 @@ RUN /compile_requirements.sh

COPY . /staging/blockattack-game

-ENV BLOCKATTACK_VERSION 2.1.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.2.0-SNAPSHOT

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/source/misc/docker/Dockerfile.Ubuntu14.04build b/source/misc/docker/Dockerfile.Ubuntu14.04build index 382e88f..8c88789 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.2.0-SNAPSHOT

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/source/misc/docker/Dockerfile.Ubuntu14.04build_Standalone b/source/misc/docker/Dockerfile.Ubuntu14.04build_Standalone index 8fee1a3..ba37a20 100644 --- a/source/misc/docker/Dockerfile.Ubuntu14.04build_Standalone +++ b/source/misc/docker/Dockerfile.Ubuntu14.04build_Standalone

@@ -7,7 +7,7 @@ RUN /compile_requirements.sh

COPY . /staging/blockattack-game

-ENV BLOCKATTACK_VERSION 2.1.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.2.0-SNAPSHOT

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/source/misc/docker/Dockerfile.Ubuntu14.04build_Standalone32 b/source/misc/docker/Dockerfile.Ubuntu14.04build_Standalone32 index eace8f6..7277016 100644 --- a/source/misc/docker/Dockerfile.Ubuntu14.04build_Standalone32 +++ b/source/misc/docker/Dockerfile.Ubuntu14.04build_Standalone32

@@ -7,7 +7,7 @@ RUN /compile_requirements.sh

COPY . /staging/blockattack-game

-ENV BLOCKATTACK_VERSION 2.1.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.2.0-SNAPSHOT

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/source/misc/standalone/build_standalone.sh b/source/misc/standalone/build_standalone.sh index 4896e34..10d6470 100755 --- a/source/misc/standalone/build_standalone.sh +++ b/source/misc/standalone/build_standalone.sh

@@ -47,7 +47,7 @@ ssh blockattack_build rm -rf /staging/blockattack-game

scp -r . blockattack_build:/staging/blockattack-game

ssh blockattack_build rm -f /staging/blockattack-game/CMakeCache.txt

-ssh blockattack_build "BLOCKATTACK_VERSION=2.1.0-SNAPSHOT && cd /staging/blockattack-game && \

+ssh blockattack_build "BLOCKATTACK_VERSION=2.2.0-SNAPSHOT && cd /staging/blockattack-game && \

./packdata.sh && \

cp source/misc/travis_help/utf8_v2_3_4/source/utf8.h source/code/ && \

cp -r source/misc/travis_help/utf8_v2_3_4/source/utf8 source/code/ && \