mirror of https://github.com/GNOME/gimp.git
build, configure.ac: misc Windows installer translations build improvements
In configure.ac, add --enable-windows-installer option (off by default), which should be set to generate the necessary files for the installer translations during the build. Using this option is only supported when building from git, since the installer files are not included in source tarballs. Rename setup.isl.desktop.in to setup.isl.in, and instruct intltool to treat it as an .ini file explicitly. Delete generated message files during make clean.
This commit is contained in:
Ell
parent
de24c0279d
commit
1f27ee6219
|
|
@ -1,5 +1,9 @@
|
|||
if BUILD_WINDOWS_INSTALLER
|
||||
installer = installer
|
||||
endif
|
||||
|
||||
SUBDIRS = \
|
||||
installer
|
||||
$(installer)
|
||||
|
||||
EXTRA_DIST = \
|
||||
gimprc.rule \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
isl_in_files = \
|
||||
setup.isl.desktop.in
|
||||
isl_files = $(isl_in_files:.isl.desktop.in=.isl)
|
||||
setup.isl.in
|
||||
isl_files = $(isl_in_files:.isl.in=.isl)
|
||||
|
||||
stamp_files = \
|
||||
stamp-isl
|
||||
|
|
@ -35,7 +35,16 @@ stamp-isl: setup.isl Makefile.am
|
|||
done && \
|
||||
echo timestamp > stamp-isl
|
||||
|
||||
setup.isl: setup.isl.desktop.in $(wildcard $(top_srcdir)/po-windows-installer/*.po) Makefile.am
|
||||
setup.isl: setup.isl.in $(wildcard $(top_srcdir)/po-windows-installer/*.po) Makefile.am
|
||||
$(AM_V_GEN) $(INTLTOOL_MERGE) $(top_srcdir)/po-windows-installer $< $(@) -d -u -c $(top_builddir)/po-windows-installer/.intltool-merge-cache
|
||||
|
||||
all-local: $(stamp_files)
|
||||
|
||||
clean-local:
|
||||
@ \
|
||||
for lang in $(languages); do \
|
||||
code=`echo $$lang | cut -d: -f1`; \
|
||||
isl="$(srcdir)/$$code.setup.isl"; \
|
||||
echo " RM $$isl"; \
|
||||
rm -f "$$isl"; \
|
||||
done
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
; run make to generate the language-specific .setup.isl files
|
||||
; to generate the language-specific .setup.isl files,
|
||||
; configure with --enable-windows-installer, and run make.
|
||||
|
||||
[Messages]
|
||||
;InfoBefore page is used instead of license page because the GPL only concerns distribution, not use, and as such doesn't have to be accepted
|
||||
22
configure.ac
22
configure.ac
|
|
@ -2270,6 +2270,28 @@ AC_ARG_ENABLE(gtk-doc-app, [ --enable-gtk-doc-app build developer documentat
|
|||
AM_CONDITIONAL(ENABLE_GTK_DOC_APP, test "x$enable_gtk_doc_app" = xyes)
|
||||
|
||||
|
||||
#############################
|
||||
# Check for Windows installer
|
||||
#############################
|
||||
|
||||
AC_MSG_CHECKING([if building the Windows installer])
|
||||
AC_ARG_ENABLE(windows-installer,
|
||||
[ --enable-windows-installer
|
||||
generate files needed for the Windows installer
|
||||
(default=no)],,
|
||||
enable_windows_installer=no)
|
||||
|
||||
if test "x$enable_windows_installer" != xno; then
|
||||
if test ! -e "$srcdir/build/windows/installer/lang/setup.isl.in"; then
|
||||
AC_MSG_RESULT([no (not building from git)])
|
||||
AC_MSG_ERROR([Building the Windows installer is only supported when building from git.])
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_MSG_RESULT([$enable_windows_installer])
|
||||
AM_CONDITIONAL(BUILD_WINDOWS_INSTALLER, test "x$enable_windows_installer" != xno)
|
||||
|
||||
|
||||
#########################################
|
||||
# Allow to configure the GIMP environment
|
||||
#########################################
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
app
|
||||
build/windows/installer/lang/setup.isl.desktop.in
|
||||
build/windows/installer/lang/setup.isl.in
|
||||
data/tags
|
||||
data/tips
|
||||
desktop
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
app
|
||||
build/windows/installer/lang/setup.isl.desktop.in
|
||||
build/windows/installer/lang/setup.isl.in
|
||||
data/tags
|
||||
data/tips
|
||||
desktop
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
app
|
||||
build/windows/installer/lang/setup.isl.desktop.in
|
||||
build/windows/installer/lang/setup.isl.in
|
||||
data/tags
|
||||
data/tips
|
||||
desktop
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
app
|
||||
build/windows/installer/lang/setup.isl.desktop.in
|
||||
build/windows/installer/lang/setup.isl.in
|
||||
data/tags
|
||||
data/tips
|
||||
desktop
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
app
|
||||
build/windows/installer/lang/setup.isl.desktop.in
|
||||
build/windows/installer/lang/setup.isl.in
|
||||
data/tips
|
||||
desktop
|
||||
desktop/gimp.desktop.in
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
app
|
||||
build/windows/installer/lang/setup.isl.desktop.in
|
||||
build/windows/installer/lang/setup.isl.in
|
||||
data/tags
|
||||
desktop
|
||||
desktop/gimp.desktop.in
|
||||
|
|
|
|||
|
|
@ -3,4 +3,4 @@
|
|||
|
||||
[encoding: UTF-8]
|
||||
|
||||
build/windows/installer/lang/setup.isl.desktop.in
|
||||
[type: gettext/ini] build/windows/installer/lang/setup.isl.in
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
app/widgets/gtkscalebutton.c
|
||||
build/windows/installer/lang/setup.isl.desktop.in
|
||||
build/windows/installer/lang/setup.isl.in
|
||||
data/tags/gimp-tags-default.xml.in
|
||||
data/tips/gimp-tips.xml.in
|
||||
desktop/gimp.desktop.in
|
||||
|
|
|
|||
Loading…
Reference in New Issue