0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't copy the po/ directory into the docker image for non-NLS jobs.

Browse source
This commit is contained in:
pentarctagon 2018-04-27 08:49:16 -05:00 • committed by Pentarctagon
parent ea4d85a06e
commit 3effecdb06
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -546,9 +546,11 @@ if(ENABLE_POT_UPDATE_TARGET)
endif(ENABLE_POT_UPDATE_TARGET) endif(ENABLE_POT_UPDATE_TARGET)
# get languages # get languages
file(READ po/LINGUAS LINGUAS) if(NLS)
string(REPLACE "\n" "" LINGUAS ${LINGUAS}) file(READ po/LINGUAS LINGUAS)
separate_arguments(LINGUAS) string(REPLACE "\n" "" LINGUAS ${LINGUAS})
separate_arguments(LINGUAS)
endif(NLS)
# #
# Include subdirectories # Include subdirectories

4
utils/travis/steps/install.sh
View file

@ -28,6 +28,10 @@ if [ "$TRAVIS_OS_NAME" = "osx" ]; then
export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS" export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
fi fi
else else
if [ "$NLS" != "true" ]; then
echo "po/" >> .dockerignore
fi
echo "FROM wesnoth/wesnoth:$LTS-$BRANCH" > docker/Dockerfile-travis-"$LTS"-"$BRANCH" echo "FROM wesnoth/wesnoth:$LTS-$BRANCH" > docker/Dockerfile-travis-"$LTS"-"$BRANCH"
echo "COPY ./ /home/wesnoth-travis/" >> docker/Dockerfile-travis-"$LTS"-"$BRANCH" echo "COPY ./ /home/wesnoth-travis/" >> docker/Dockerfile-travis-"$LTS"-"$BRANCH"
echo "WORKDIR /home/wesnoth-travis" >> docker/Dockerfile-travis-"$LTS"-"$BRANCH" echo "WORKDIR /home/wesnoth-travis" >> docker/Dockerfile-travis-"$LTS"-"$BRANCH"