[gimp] build, gitlab-ci: generated files should be in the build dir.
- From: Jehan <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] build, gitlab-ci: generated files should be in the build dir.
- Date: Fri, 18 Jun 2021 18:42:16 +0000 (UTC)
commit 0e4263d80063accc84b23f9a02c35bc330dfdf36
Author: Jehan <jehan girinstud io>
Date: Fri Jun 18 20:40:04 2021 +0200
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.
.gitlab-ci.yml | 4 ++--
build/windows/gitlab-ci/installer-gimp-msys2.sh | 3 +++
build/windows/installer/lang/Makefile.am | 4 ++--
3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 186703ef99..8e9ba15818 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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) ##
diff --git a/build/windows/gitlab-ci/installer-gimp-msys2.sh b/build/windows/gitlab-ci/installer-gimp-msys2.sh
index cce0c6fd09..b69bff73ac 100644
--- a/build/windows/gitlab-ci/installer-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/installer-gimp-msys2.sh
@@ -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/'`
diff --git a/build/windows/installer/lang/Makefile.am b/build/windows/installer/lang/Makefile.am
index 430be93d6f..dcf5c792eb 100644
--- a/build/windows/installer/lang/Makefile.am
+++ b/build/windows/installer/lang/Makefile.am
@@ -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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]