Title: [146017] trunk/Source
- Revision
- 146017
- Author
- [email protected]
- Date
- 2013-03-17 11:10:25 -0700 (Sun, 17 Mar 2013)
Log Message
[GTK] Fix and improve dist hooks for translations
https://bugs.webkit.org/show_bug.cgi?id=112519
Reviewed by Carlos Garcia Campos.
Source/WebCore:
* GNUmakefile.am: move translation-related rules and lists to the po directory's
GNUmakefile.am.
Source/WebCore/platform/gtk/po:
* GNUmakefile.am: move dist-related rules here; also move translation-related files
to this file's EXTRA_DIST, making sure to only list the files we actually want
shipped, so junk such as .orig, .rej and backup files do not end up in the tarball.
Source/WebKit/gtk:
* GNUmakefile.am: removed left-over translation files from EXTRA_DIST
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (146016 => 146017)
--- trunk/Source/WebCore/ChangeLog 2013-03-17 18:06:05 UTC (rev 146016)
+++ trunk/Source/WebCore/ChangeLog 2013-03-17 18:10:25 UTC (rev 146017)
@@ -1,3 +1,13 @@
+2013-03-17 Gustavo Noronha Silva <[email protected]>
+
+ [GTK] Fix and improve dist hooks for translations
+ https://bugs.webkit.org/show_bug.cgi?id=112519
+
+ Reviewed by Carlos Garcia Campos.
+
+ * GNUmakefile.am: move translation-related rules and lists to the po directory's
+ GNUmakefile.am.
+
2013-03-17 Emil A Eklund <[email protected]>
Move font-family applying code to StyleBuilder
Modified: trunk/Source/WebCore/GNUmakefile.am (146016 => 146017)
--- trunk/Source/WebCore/GNUmakefile.am 2013-03-17 18:06:05 UTC (rev 146016)
+++ trunk/Source/WebCore/GNUmakefile.am 2013-03-17 18:10:25 UTC (rev 146017)
@@ -637,7 +637,6 @@
$(wildcard $(srcdir)/Source/WebCore/inspector/*.idl) \
$(wildcard $(srcdir)/Source/WebCore/loader/appcache/*.idl) \
$(wildcard $(srcdir)/Source/WebCore/page/*.idl) \
- $(wildcard $(srcdir)/Source/WebCore/platform/gtk/po/*) \
$(wildcard $(srcdir)/Source/WebCore/plugins/*.idl) \
$(wildcard $(srcdir)/Source/WebCore/storage/*.idl) \
$(wildcard $(srcdir)/Source/WebCore/svg/*.idl) \
Modified: trunk/Source/WebCore/platform/gtk/po/ChangeLog (146016 => 146017)
--- trunk/Source/WebCore/platform/gtk/po/ChangeLog 2013-03-17 18:06:05 UTC (rev 146016)
+++ trunk/Source/WebCore/platform/gtk/po/ChangeLog 2013-03-17 18:10:25 UTC (rev 146017)
@@ -1,3 +1,14 @@
+2013-03-17 Gustavo Noronha Silva <[email protected]>
+
+ [GTK] Fix and improve dist hooks for translations
+ https://bugs.webkit.org/show_bug.cgi?id=112519
+
+ Reviewed by Carlos Garcia Campos.
+
+ * GNUmakefile.am: move dist-related rules here; also move translation-related files
+ to this file's EXTRA_DIST, making sure to only list the files we actually want
+ shipped, so junk such as .orig, .rej and backup files do not end up in the tarball.
+
2013-03-15 Gustavo Noronha Silva <[email protected]>
Unreviewed, build fix. Also gather translatable strings from WebKit2 files.
Modified: trunk/Source/WebCore/platform/gtk/po/GNUmakefile.am (146016 => 146017)
--- trunk/Source/WebCore/platform/gtk/po/GNUmakefile.am 2013-03-17 18:06:05 UTC (rev 146016)
+++ trunk/Source/WebCore/platform/gtk/po/GNUmakefile.am 2013-03-17 18:10:25 UTC (rev 146017)
@@ -145,6 +145,12 @@
$(ALL_MOFILES) \
$(top_builddir)/Source/WebCore/platform/gtk/po/$(DOMAIN).pot
+EXTRA_DIST += \
+ $(srcdir)/Source/WebCore/platform/gtk/po/ChangeLog \
+ $(srcdir)/Source/WebCore/platform/gtk/po/POTFILES.in \
+ $(srcdir)/Source/WebCore/platform/gtk/po/README \
+ $(wildcard $(srcdir)/Source/WebCore/platform/gtk/po/*.po)
+
DISTCLEANFILES += \
$(ALL_MOFILES) \
$(top_builddir)/Source/WebCore/platform/gtk/po/$(DOMAIN).pot
@@ -232,3 +238,7 @@
rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
done; \
done
+
+install-data-local: po-install-data-local
+installdirs-data-local: po-installdirs-data-local
+uninstall-local: po-uninstall-local
Modified: trunk/Source/WebKit/gtk/ChangeLog (146016 => 146017)
--- trunk/Source/WebKit/gtk/ChangeLog 2013-03-17 18:06:05 UTC (rev 146016)
+++ trunk/Source/WebKit/gtk/ChangeLog 2013-03-17 18:10:25 UTC (rev 146017)
@@ -1,3 +1,12 @@
+2013-03-17 Gustavo Noronha Silva <[email protected]>
+
+ [GTK] Fix and improve dist hooks for translations
+ https://bugs.webkit.org/show_bug.cgi?id=112519
+
+ Reviewed by Carlos Garcia Campos.
+
+ * GNUmakefile.am: removed left-over translation files from EXTRA_DIST
+
2013-03-15 Nate Chapin <[email protected]>
Hide MainResourceLoader from the outside world
Modified: trunk/Source/WebKit/gtk/GNUmakefile.am (146016 => 146017)
--- trunk/Source/WebKit/gtk/GNUmakefile.am 2013-03-17 18:06:05 UTC (rev 146016)
+++ trunk/Source/WebKit/gtk/GNUmakefile.am 2013-03-17 18:10:25 UTC (rev 146017)
@@ -416,7 +416,6 @@
$(WebKit)/docs/webkitenvironment.xml \
$(WebKit)/docs/webkitgtk-overrides.txt \
$(WebKit)/webkitmarshal.list \
- $(WebKit)/po/* \
$(WebKit)/resources/* \
$(WebKit)/tests/resources/* \
$(WebKit)/tests/test_utils.h
@@ -645,8 +644,3 @@
$(top_builddir)/Source/WebKit/gtk/@WEBKITGTK_PC_NAME@-@[email protected] \
$(top_builddir)/Source/WebKit/gtk/org.webkitgtk-@[email protected] \
$(top_builddir)/Source/WebKit/gtk/webkit/webkitversion.h
-
-install-data-local: po-install-data-local
-installdirs-data-local: po-installdirs-data-local
-uninstall-local: po-uninstall-local
-
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
