Unbranch grit

[GoogleCodeExporter]

Internal to Google, there is a separate branch of grit with several features 
that the open-source grit is missing.  The open-source grit, which was branched 
away from the internal trunk a few years ago, also has several features that 
are not in the internal branch.

This bug tracks the work being done to add any important features from the 
internal branch to the open-source grit (this project) and make the open-source 
grit able to replace the Google-internal version of grit, so that grit may be 
maintained in just this one place.

Original issue reported on code.google.com by joi@chromium.org on 28 Mar 2012 at 1:27

[GoogleCodeExporter]

I have been looking at strategies for merging the branches.  It looks like the 
easiest approach will be to take each change on the internal branch since the 
Chromium branch was forked away from it, and apply the parts of it that apply 
to the open source project manually.

There will be a series of changes naming the date of the internal commit, the 
original contributors of the patch(es) it was based on, and a brief description 
of the changes.

As I do this, I am testing by running unit tests at each step, and also by 
building the following Chrome targets on my Linux box, and comparing the output 
to a known-good version of out/Debug:  policy_templates chrome_extra_resources 
chrome_resources chrome_strings platform_locale_settings theme_resources 
devtools_resources content_resources content_shell_resources net_resources 
gfx_resources ui_resources ui_resources_2x ui_resour\
ces_standard webkit_resources webkit_strings

Original comment by joi@chromium.org on 29 Mar 2012 at 3:44

[GoogleCodeExporter]

r19: Make first_ids_file an optional attribute of the .grd file.

Remove the default path for resource_ids; the default now is no first
IDs file.  This is part of unbranching grit, since I believe Chrome is
the only project to use a first_ids file.

To resolve landing sequence requirements, this change leaves the
default path in grit_info.py and allows overriding the path via a flag
to grit build, but once a WebKit-side change to WebKit.grd has landed,
both of these can be removed and the only way to specify a first_ids
file will be via each .grd file.

BUG=http://code.google.com/p/grit-i18n/issues/detail?id=4
Review URL: https://chromiumcodereview.appspot.com/9802029

r20: Add c_format as a format option.

This is a merge of an internal change from 2007/09/21, original
contributor Brandon Farrell.

BUG=http://code.google.com/p/grit-i18n/issues/detail?id=4
Review URL: https://chromiumcodereview.appspot.com/9924009

r21: Improve <if> node handling, unit tests. Add Psyco support. Add ability
to specify that a given include file is generated by a build step,
which may be used by some dependency analyzers to locate the file in
the build output directory.

This is a merge of internal changes from 2007/09/26, 2007/09/30, and
2007/10/02.  Original contributors Jon Perkins and Joi Sigurdsson.

BUG=http://code.google.com/p/grit-i18n/issues/detail?id=4
Review URL: https://chromiumcodereview.appspot.com/9918015

r22: Whitespace folding for descriptions and optionally for HTML.

This is a merge of an internal changes released 2007/10/04.  Original
contributors Jon Perkins and Joi Sigurdsson.

BUG=http://code.google.com/p/grit-i18n/issues/detail?id=4
Review URL: https://chromiumcodereview.appspot.com/9903023

r23: Make sure path to resource_ids file is relative.  An earlier change
that made the path absolute caused some Mac bots to barf on update.

BUG=none
Review URL: https://chromiumcodereview.appspot.com/9956017

r24: Introduce the ability to run post-translation commands on structures,
to allow for things like html tidy.

Add support for XML files for the igoogle type of muppet gadgets.

This is a merge of a internal changes released 2007/11/20.  Original
changes by Jon Perkins and Rajesh Chandrashekaran.

BUG=http://code.google.com/p/grit-i18n/issues/detail?id=4
Review URL: https://chromiumcodereview.appspot.com/9956015

r25: Add encoding to MuppetStrings. rc2grd improvements. Language 
charset/directive
improvements. Fix for <if> nodes.

This is a merge of internal changes released 2007/12/01, 2008/02/19, 2008/03/03
and 2008/04/29.  Original authors Joi Sigurdsson, Marc-Antoine Parent, Stefan
Kuhne, Vivek Rao and Xiyuan Xia.

BUG=http://code.google.com/p/grit-i18n/issues/detail?id=4
Review URL: https://chromiumcodereview.appspot.com/9958014

r26: Allow substitution of messages as variables in other messages.

This is part of a manual merge of changes released to the internal branch
2008/06/11.  Original author is Marc-Antoine Parent.

In addition to the merge, bring in all language directive mappings and codepage
mappings from the latest internal version of grit to avoid warnings related to
unknown output languages.  While updating the mapping, fix the name of the fake-
bidi language.  Finally, to help debug differences in data_pack files, add a
simple ASCII converter to data_pack.py

BUG=http://code.google.com/p/grit-i18n/issues/detail?id=4
Review URL: https://chromiumcodereview.appspot.com/9965022

r27: Allow duplicate Ids for a field that does not generate them in the resource
header. Allow to define system ids in the identifiers elements. Make it easier
to add system identifers. Add URLs for language resources.

This is a manual merge of changes released to the internal branch on 2008/6/13.
Original authors Marc-Antoine Parent and David Dorwin.

BUG=http://code.google.com/p/grit-i18n/issues/detail?id=4
Review URL: https://chromiumcodereview.appspot.com/9958065

r28: Allow IfNode nesting in _IsValidChild.

This is a manual merge of a change released to the internal branch on
2008/07/30. Original author Marc-Antoine Parent.

BUG=http://code.google.com/p/grit-i18n/issues/detail?id=4
Review URL: https://chromiumcodereview.appspot.com/9969054

r29: Add support for <\!--message-no-break--> in tr_html, causing the next
normally-splitting entity to not split translatable sections.

This is a manual merge of a change released 2008/08/13 to the internal
branch. Original author Lucas Eckels.

BUG=http://code.google.com/p/grit-i18n/issues/detail?id=4
Review URL: https://chromiumcodereview.appspot.com/9956065

r30: Fixing a bug in GRIT where messages with substitutions would
not get matched with their translations.

Also adding a catch-all so that messages containing only
whitespace do not get sent to the Translation Console.

Also, fix relative paths so unit tests can be run directly.

This is a manual merge of changes released 2008/09/02 to the
Google-internal version of grit.  Original author Joi Sigurdsson.

BUG=http://code.google.com/p/grit-i18n/issues/detail?id=4
Review URL: https://chromiumcodereview.appspot.com/9958067

Original comment by j...@google.com on 3 Apr 2012 at 4:13

[GoogleCodeExporter]

See r31, r32, r33.

Original comment by j...@google.com on 4 Apr 2012 at 12:58

[GoogleCodeExporter]

Forgot to close this way back; final unbranching revisions were r49, r50, r59.

Original comment by joi@chromium.org on 21 Jan 2013 at 2:46

• Changed state: Fixed