commit 01f3d8a5

sago007 · 2018-05-13 19:00
01f3d8a5469e407dba44d1acc7d385db5ca3c324 patch · browse files
parent d2ba3cf5cec0969435a4dc33a3d76677a9ca9f89

Made the standalone build work again

Changed files

M	source/misc/docker/Dockerfile.Ubuntu12.04build_Standalone before
M	source/misc/standalone/build_standalone.sh before

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

@@ -21,5 +21,7 @@ ENV BLOCKATTACK_VERSION 2.2.0-SNAPSHOT

RUN cd /staging/blockattack-game && \

./packdata.sh && \

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

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

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

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

cmake -D Boost_USE_STATIC_LIBS=ON -D INSTALL_DATA_DIR=. -D CMAKE_INSTALL_PREFIX=. -D STANDALONE=1 . && make

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

@@ -50,7 +50,9 @@ ssh blockattack_build rm -f /staging/blockattack-game/CMakeCache.txt

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 source/misc/travis_help/utf8_v2_3_4/source/utf8.h source/code/sago/ && \

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

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

cmake -D Boost_USE_STATIC_LIBS=ON -D INSTALL_DATA_DIR=. -D CMAKE_INSTALL_PREFIX=. -D STANDALONE=1 . && make clean && make"

OUTPUT=$(pwd)/source/misc/standalone/staging/$ARCHIVENAME/