build, gitlab-ci: generated files should be in the build dir.

Also update the CI script to copy the generated language files before
creating the installer so that the gimp3264.iss script finds them.
This commit is contained in:
Jehan
2021-06-18 20:40:04 +02:00
parent 602add8c45
commit 0e4263d800
3 changed files with 7 additions and 4 deletions

View File

@ -301,7 +301,7 @@ gimp-win64-native:
expire_in: 1 day
paths:
- _install-w64
- build/windows/installer/lang/
- _build-w64/build/windows/installer/lang/
cache:
paths:
- _ccache/
@ -332,7 +332,7 @@ packaging-win64-native:
expire_in: 1 day
paths:
- gimp-w64
- build/windows/installer/lang/
- _build-w64/build/windows/installer/lang/
needs: ["gimp-win64-native"]
## WINDOWS 32-bit CI (native MSYS2) ##

View File

@ -27,6 +27,9 @@ wget https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Uno
wget https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Unofficial/Vietnamese.isl
cd -
# Copy generated language files into the source directory.
cp _build-w64/build/windows/installer/lang/*isl build/windows/installer/lang
# Construct now the installer.
MAJOR_VERSION=`grep 'm4_define(\[gimp_major_version' configure.ac |sed 's/m4_define(\[gimp_major_version.*\[\([0-9]*\)\].*/\1/'`
MINOR_VERSION=`grep 'm4_define(\[gimp_minor_version' configure.ac |sed 's/m4_define(\[gimp_minor_version.*\[\([0-9]*\)\].*/\1/'`

View File

@ -51,7 +51,7 @@ stamp-isl: setup.isl Makefile.am
code=`echo $$lang | cut -d: -f1`; \
prefix=`echo $$lang | cut -d: -f2 | sed 's/[][]/\\\\\\0/g'`; \
encoding=`echo $$lang | cut -d: -f3`; \
isl="$(srcdir)/$$code.setup.isl"; \
isl="$(builddir)/$$code.setup.isl"; \
echo " GEN $$isl"; \
sed '/^\w\+'"$$prefix"'=/{s/\(.\)'"$$prefix"'/\1/;n};/^\w.*=/d' $< | \
iconv -c -f UTF-8 -t $$encoding > "$$isl"; \
@ -67,7 +67,7 @@ clean-local:
@ \
for lang in $(languages); do \
code=`echo $$lang | cut -d: -f1`; \
isl="$(srcdir)/$$code.setup.isl"; \
isl="$(builddir)/$$code.setup.isl"; \
echo " RM $$isl"; \
rm -f "$$isl"; \
done