Commit db3e910b authored by Florian Müllner's avatar Florian Müllner

build: Say good-bye to intltool

intltool is unmaintained nowadays while upstream gettext gained
support for everything we used it for, so make the switch.

https://bugzilla.gnome.org/show_bug.cgi?id=769077
parent 0ff77736
ABOUT-NLS
Makefile Makefile
Makefile.in Makefile.in
Makefile.in.in Makefile.in.in
aclocal.m4
autom4te.cache/
config/
configure configure
config.log config.log
config.status config.status
aclocal.m4
autom4te.cache/
data/*.json data/*.json
po/gnome-shell-extensions.pot m4/
po/*.header
po/*.sed
po/*.sin
po/Makevars.template
po/POTFILES po/POTFILES
po/Rules-quot
po/gnome-shell-extensions.pot
po/stamp-it po/stamp-it
staging/ staging/
zip-files/ zip-files/
...@@ -17,7 +25,5 @@ zip-files/ ...@@ -17,7 +25,5 @@ zip-files/
*.gmo *.gmo
metadata.json metadata.json
*.desktop *.desktop
*.desktop.in
*.gschema.xml
*.gschema.valid *.gschema.valid
*.session *.session
...@@ -12,7 +12,9 @@ GETTEXT_PACKAGE=gnome-shell-extensions ...@@ -12,7 +12,9 @@ GETTEXT_PACKAGE=gnome-shell-extensions
AC_SUBST(GETTEXT_PACKAGE) AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
[The prefix for our gettext translation domains.]) [The prefix for our gettext translation domains.])
IT_PROG_INTLTOOL(0.26)
AM_GNU_GETTEXT_VERSION([0.19.6])
AM_GNU_GETTEXT([external])
PKG_PROG_PKG_CONFIG([0.22]) PKG_PROG_PKG_CONFIG([0.22])
......
include $(top_srcdir)/include.mk include $(top_srcdir)/include.mk
sessiondir = $(datadir)/gnome-session/sessions sessiondir = $(datadir)/gnome-session/sessions
session_in_in_files = gnome-classic.session.desktop.in.in session_in_files = gnome-classic.session.desktop.in
session_in_files = $(session_in_in_files:.session.desktop.in.in=.session.desktop.in)
session_DATA = $(session_in_files:.session.desktop.in=.session) session_DATA = $(session_in_files:.session.desktop.in=.session)
xsessiondir = $(datadir)/xsessions xsessiondir = $(datadir)/xsessions
...@@ -39,17 +38,15 @@ theme_sources = \ ...@@ -39,17 +38,15 @@ theme_sources = \
$(SASS) --sourcemap=none --update -f -q $<; \ $(SASS) --sourcemap=none --update -f -q $<; \
fi fi
gsettings_in_files = org.gnome.shell.extensions.classic-overrides.gschema.xml.in gsettings_SCHEMAS = org.gnome.shell.extensions.classic-overrides.gschema.xml
gsettings_SCHEMAS = $(gsettings_in_files:.xml.in=.xml)
@INTLTOOL_XML_NOMERGE_RULE@
@GSETTINGS_RULES@ @GSETTINGS_RULES@
%.desktop.in:%.desktop.in.in %.desktop:%.desktop.in
$(AM_V_GEN) sed \ $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
-e "s|\@bindir\@|$(bindir)|" \
-e "s|\@VERSION\@|$(VERSION)|" \ %.session: %.session.desktop.in
$< > $@ $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
comma:=, comma:=,
empty:= empty:=
...@@ -61,15 +58,11 @@ extension_list:=$(subst $(space),$(comma),$(extensions)) ...@@ -61,15 +58,11 @@ extension_list:=$(subst $(space),$(comma),$(extensions))
-e "s|\@CLASSIC_EXTENSIONS\@|$(extension_list)|g" \ -e "s|\@CLASSIC_EXTENSIONS\@|$(extension_list)|g" \
$< > $@ $< > $@
%.session: %.session.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
@INTLTOOL_DESKTOP_RULE@
EXTRA_DIST = \ EXTRA_DIST = \
$(session_in_in_files) \ $(session_in_files) \
$(xsession_in_files) \ $(xsession_in_files) \
$(mode_in_files) \ $(mode_in_files) \
$(gsettings_in_files) \ $(gsettings_SCHEMAS) \
$(theme_DATA) \ $(theme_DATA) \
$(NULL) $(NULL)
...@@ -77,5 +70,4 @@ CLEANFILES = \ ...@@ -77,5 +70,4 @@ CLEANFILES = \
$(session_DATA) \ $(session_DATA) \
$(xsession_DATA) \ $(xsession_DATA) \
$(mode_DATA) \ $(mode_DATA) \
$(gsettings_SCHEMAS) \
$(NULL) $(NULL)
[Desktop Entry] [Desktop Entry]
_Name=GNOME Classic Name=GNOME Classic
_Comment=This session logs you into GNOME Classic Comment=This session logs you into GNOME Classic
Exec=env GNOME_SHELL_SESSION_MODE=classic gnome-session --session gnome-classic Exec=env GNOME_SHELL_SESSION_MODE=classic gnome-session --session gnome-classic
TryExec=gnome-session TryExec=gnome-session
Icon=
Type=Application Type=Application
DesktopNames=GNOME-Classic;GNOME DesktopNames=GNOME-Classic;GNOME;
[GNOME Session] [GNOME Session]
_Name=GNOME Classic Name=GNOME Classic
RequiredComponents=org.gnome.Shell;gnome-settings-daemon;nautilus-classic; RequiredComponents=org.gnome.Shell;gnome-settings-daemon;nautilus-classic;
...@@ -4,43 +4,43 @@ ...@@ -4,43 +4,43 @@
gettext-domain="gnome-shell-extensions"> gettext-domain="gnome-shell-extensions">
<key name="attach-modal-dialogs" type="b"> <key name="attach-modal-dialogs" type="b">
<default>true</default> <default>true</default>
<_summary>Attach modal dialog to the parent window</_summary> <summary>Attach modal dialog to the parent window</summary>
<_description> <description>
This key overrides the key in org.gnome.mutter when running This key overrides the key in org.gnome.mutter when running
GNOME Shell. GNOME Shell.
</_description> </description>
</key> </key>
<key name="button-layout" type="s"> <key name="button-layout" type="s">
<default>"appmenu:minimize,maximize,close"</default> <default>"appmenu:minimize,maximize,close"</default>
<_summary>Arrangement of buttons on the titlebar</_summary> <summary>Arrangement of buttons on the titlebar</summary>
<_description> <description>
This key overrides the key in org.gnome.desktop.wm.preferences when running GNOME Shell. This key overrides the key in org.gnome.desktop.wm.preferences when running GNOME Shell.
</_description> </description>
</key> </key>
<key name="edge-tiling" type="b"> <key name="edge-tiling" type="b">
<default>true</default> <default>true</default>
<_summary>Enable edge tiling when dropping windows on screen edges</_summary> <summary>Enable edge tiling when dropping windows on screen edges</summary>
<_description> <description>
This key overrides the key in org.gnome.mutter when running GNOME Shell. This key overrides the key in org.gnome.mutter when running GNOME Shell.
</_description> </description>
</key> </key>
<key name="workspaces-only-on-primary" type="b"> <key name="workspaces-only-on-primary" type="b">
<default>true</default> <default>true</default>
<_summary>Workspaces only on primary monitor</_summary> <summary>Workspaces only on primary monitor</summary>
<_description> <description>
This key overrides the key in org.gnome.mutter when running GNOME Shell. This key overrides the key in org.gnome.mutter when running GNOME Shell.
</_description> </description>
</key> </key>
<key name="focus-change-on-pointer-rest" type="b"> <key name="focus-change-on-pointer-rest" type="b">
<default>true</default> <default>true</default>
<_summary>Delay focus changes in mouse mode until the pointer stops moving</_summary> <summary>Delay focus changes in mouse mode until the pointer stops moving</summary>
<_description> <description>
This key overrides the key in org.gnome.mutter when running GNOME Shell. This key overrides the key in org.gnome.mutter when running GNOME Shell.
</_description> </description>
</key> </key>
</schema> </schema>
</schemalist> </schemalist>
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<key name="application-list" type="as"> <key name="application-list" type="as">
<!-- FIXME: should be a(su), when JS supports more of GVariant --> <!-- FIXME: should be a(su), when JS supports more of GVariant -->
<default>[ ]</default> <default>[ ]</default>
<_summary>Application and workspace list</_summary> <summary>Application and workspace list</summary>
<_description>A list of strings, each containing an application id (desktop file name), followed by a colon and the workspace number</_description> <description>A list of strings, each containing an application id (desktop file name), followed by a colon and the workspace number</description>
</key> </key>
</schema> </schema>
</schemalist> </schemalist>
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<schema id="org.gnome.shell.extensions.example" path="/org/gnome/shell/extensions/example/"> <schema id="org.gnome.shell.extensions.example" path="/org/gnome/shell/extensions/example/">
<key name="hello-text" type="s"> <key name="hello-text" type="s">
<default>''</default> <default>''</default>
<_summary>Alternative greeting text.</_summary> <summary>Alternative greeting text.</summary>
<_description>If not empty, it contains the text that will be shown when clicking on the panel.</_description> <description>If not empty, it contains the text that will be shown when clicking on the panel.</description>
</key> </key>
</schema> </schema>
</schemalist> </schemalist>
...@@ -2,15 +2,15 @@ ...@@ -2,15 +2,15 @@
<schema id="org.gnome.shell.extensions.native-window-placement" path="/org/gnome/shell/extensions/native-window-placement/"> <schema id="org.gnome.shell.extensions.native-window-placement" path="/org/gnome/shell/extensions/native-window-placement/">
<key name="use-more-screen" type="b"> <key name="use-more-screen" type="b">
<default>true</default> <default>true</default>
<_summary>Use more screen for windows</_summary> <summary>Use more screen for windows</summary>
<_description>Try to use more screen for placing window thumbnails by adapting to screen aspect ratio, and consolidating <description>Try to use more screen for placing window thumbnails by adapting to screen aspect ratio, and consolidating
them further to reduce the bounding box. This setting applies only with the natural placement strategy.</_description> them further to reduce the bounding box. This setting applies only with the natural placement strategy.</description>
</key> </key>
<key name="window-captions-on-top" type="b"> <key name="window-captions-on-top" type="b">
<default>true</default> <default>true</default>
<_summary>Place window captions on top</_summary> <summary>Place window captions on top</summary>
<_description>If true, place window captions on top the respective thumbnail, overriding shell default of placing it at <description>If true, place window captions on top the respective thumbnail, overriding shell default of placing it at
the bottom. Changing this setting requires restarting the shell to have any effect.</_description> the bottom. Changing this setting requires restarting the shell to have any effect.</description>
</key> </key>
</schema> </schema>
</schemalist> </schemalist>
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
path="/org/gnome/shell/extensions/screenshot-window-sizer/"> path="/org/gnome/shell/extensions/screenshot-window-sizer/">
<key type="as" name="cycle-screenshot-sizes"> <key type="as" name="cycle-screenshot-sizes">
<default><![CDATA[['<Alt><Control>s']]]></default> <default><![CDATA[['<Alt><Control>s']]]></default>
<_summary>Cycle Screenshot Sizes</_summary> <summary>Cycle Screenshot Sizes</summary>
</key> </key>
</schema> </schema>
</schemalist> </schemalist>
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<schema id="org.gnome.shell.extensions.user-theme" path="/org/gnome/shell/extensions/user-theme/"> <schema id="org.gnome.shell.extensions.user-theme" path="/org/gnome/shell/extensions/user-theme/">
<key name="name" type="s"> <key name="name" type="s">
<default>""</default> <default>""</default>
<_summary>Theme name</_summary> <summary>Theme name</summary>
<_description>The name of the theme, to be loaded from ~/.themes/name/gnome-shell</_description> <description>The name of the theme, to be loaded from ~/.themes/name/gnome-shell</description>
</key> </key>
</schema> </schema>
</schemalist> </schemalist>
...@@ -9,19 +9,19 @@ ...@@ -9,19 +9,19 @@
<key name="grouping-mode" <key name="grouping-mode"
enum="org.gnome.shell.extensions.window-list.GroupingMode"> enum="org.gnome.shell.extensions.window-list.GroupingMode">
<default>'never'</default> <default>'never'</default>
<_summary>When to group windows</_summary> <summary>When to group windows</summary>
<_description> <description>
Decides when to group windows from the same application on the Decides when to group windows from the same application on the
window list. Possible values are "never", "auto" and "always". window list. Possible values are "never", "auto" and "always".
</_description> </description>
</key> </key>
<key name="show-on-all-monitors" type="b"> <key name="show-on-all-monitors" type="b">
<default>false</default> <default>false</default>
<_summary>Show the window list on all monitors</_summary> <summary>Show the window list on all monitors</summary>
<_description> <description>
Whether to show the window list on all connected monitors or Whether to show the window list on all connected monitors or
only on the primary one. only on the primary one.
</_description> </description>
</key> </key>
</schema> </schema>
</schemalist> </schemalist>
# Makefile variables for PO directory in any package using GNU gettext.
# Usually the message domain is the same as the package name.
DOMAIN = $(PACKAGE)
# These two variables depend on the location of this directory.
subdir = po
top_builddir = ..
# These options get passed to xgettext.
XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ \
--keyword=C_:1c,2 --keyword=NC_:1c,2 \
--keyword=g_dngettext:2,3 \
--flag=g_dngettext:2:pass-c-format \
--flag=g_strdup_printf:1:c-format \
--flag=g_string_printf:2:c-format \
--flag=g_string_append_printf:2:c-format \
--flag=g_error_new:3:c-format \
--flag=g_set_error:4:c-format \
--flag=g_markup_printf_escaped:1:c-format \
--flag=g_log:3:c-format \
--flag=g_print:1:c-format \
--flag=g_printerr:1:c-format \
--flag=g_printf:1:c-format \
--flag=g_fprintf:2:c-format \
--flag=g_sprintf:2:c-format \
--flag=g_snprintf:3:c-format
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
# package. (Note that the msgstr strings, extracted from the package's
# sources, belong to the copyright holder of the package.) Translators are
# expected to transfer the copyright for their translations to this person
# or entity, or to disclaim their copyright. The empty string stands for
# the public domain; in this case the translators are expected to disclaim
# their copyright.
COPYRIGHT_HOLDER = Translation copyright holder
# This is the email address or URL to which the translators shall report
# bugs in the untranslated strings:
# - Strings which are not entire sentences, see the maintainer guidelines
# in the GNU gettext documentation, section 'Preparing Strings'.
# - Strings which use unclear terms or require additional context to be
# understood.
# - Strings which make invalid assumptions about notation of date, time or
# money.
# - Pluralisation problems.
# - Incorrect English spelling.
# - Incorrect formatting.
# It can be your email address, or a mailing list address where translators
# can write to without being subscribed, or the URL of a web page through
# which the translators can contact you.
MSGID_BUGS_ADDRESS = http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&keywords=I18N+L10N&component=extensions
# This is the list of locale categories, beyond LC_MESSAGES, for which the
# message catalogs shall be used. It is usually empty.
EXTRA_LOCALE_CATEGORIES =
# Ignore the timestamp of the .pot file, as git clones do not have
# deterministic timestamps, and .po files are updated by translators
# (only) in GNOME projects.
PO_DEPENDS_ON_POT = no
# This tells whether or not to forcibly update $(DOMAIN).pot and
# regenerate PO files on "make dist". Possible values are "yes" and
# "no". Set this to no if the POT file and PO files are maintained
# externally.
DIST_DEPENDS_ON_UPDATE_PO = no
data/gnome-classic.desktop.in data/gnome-classic.desktop.in
data/gnome-classic.session.desktop.in.in data/gnome-classic.session.desktop.in
data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in data/org.gnome.shell.extensions.classic-overrides.gschema.xml
extensions/alternate-tab/prefs.js extensions/alternate-tab/prefs.js
extensions/apps-menu/extension.js extensions/apps-menu/extension.js
extensions/auto-move-windows/extension.js extensions/auto-move-windows/extension.js
extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml
extensions/auto-move-windows/prefs.js extensions/auto-move-windows/prefs.js
extensions/drive-menu/extension.js extensions/drive-menu/extension.js
extensions/example/extension.js extensions/example/extension.js
extensions/example/org.gnome.shell.extensions.example.gschema.xml.in extensions/example/org.gnome.shell.extensions.example.gschema.xml
extensions/example/prefs.js extensions/example/prefs.js
extensions/native-window-placement/extension.js extensions/native-window-placement/extension.js
extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml
extensions/places-menu/extension.js extensions/places-menu/extension.js
extensions/places-menu/placeDisplay.js extensions/places-menu/placeDisplay.js
extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml.in extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml
extensions/user-theme/extension.js extensions/user-theme/extension.js
extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml
extensions/window-list/extension.js extensions/window-list/extension.js
extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml
extensions/window-list/prefs.js extensions/window-list/prefs.js
extensions/windowsNavigator/extension.js extensions/windowsNavigator/extension.js
extensions/workspace-indicator/extension.js extensions/workspace-indicator/extension.js
......
gschemas_in = $(gschemaname).gschema.xml.in gsettings_SCHEMAS = $(gschemaname).gschema.xml
@INTLTOOL_XML_NOMERGE_RULE@ %.desktop:%.desktop.in
$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
gsettings_SCHEMAS = $(gschemas_in:.xml.in=.xml)
@GSETTINGS_RULES@ @GSETTINGS_RULES@
CLEANFILES += $(gschemas_in:.xml.in=.valid) $(gsettings_SCHEMAS) CLEANFILES += $(gsettings_SCHEMAS:.xml=.valid)
EXTRA_DIST += $(gschemas_in) EXTRA_DIST += $(gsettings_SCHEMAS)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment