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 
(cherry-picked from commit 3effecdb06)
This commit is contained in:
pentarctagon 2018-04-27 08:49:16 -05:00 • committed by Pentarctagon
parent 6da9f62685
commit ff0009aa52
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

@ -547,9 +547,11 @@ if(ENABLE_POT_UPDATE_TARGET)
endif(ENABLE_POT_UPDATE_TARGET)
# get languages
file(READ po/LINGUAS LINGUAS)
string(REPLACE "\n" "" LINGUAS ${LINGUAS})
separate_arguments(LINGUAS)
if(NLS)
file(READ po/LINGUAS LINGUAS)
string(REPLACE "\n" "" LINGUAS ${LINGUAS})
separate_arguments(LINGUAS)
endif(NLS)
#
# 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"
fi
else
if [ "$NLS" != "true" ]; then
echo "po/" >> .dockerignore
fi
echo "FROM wesnoth/wesnoth:$LTS-$BRANCH" > 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"