summaryrefslogtreecommitdiffstats
path: root/tools/grit
Commit message (Collapse)AuthorAgeFilesLines
* grit: Set first_id XML attribute as a string.estade@chromium.org2010-07-171-1/+1
| | | | | | | | | BUG=none TEST=compile works again (not sure why it was only failing for me and a few others) Review URL: http://codereview.chromium.org/3018006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52772 0039d316-1c4b-4281-b951-d872f2087c98
* Assign resource ids from a central file.tony@chromium.org2010-07-137-10/+245
| | | | | | | | | | | This allows us to control resource id assignment across all grd files so we can avoid id collisions. BUG=48625 Review URL: http://codereview.chromium.org/2961002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52211 0039d316-1c4b-4281-b951-d872f2087c98
* Allow data_packages outputs to include flattened items withouttony@chromium.org2010-07-082-7/+20
| | | | | | | | | | | | | | | | | | rc_all outputs. This fixes a bug where the code to flatten an html file was in the rc_all output step. So if a data_package output came before the rc_all output in the grd file, we would get a build error. Just refactor the code to flatten for both output types (but only flatten once). BUG=48253 TEST=build completes succesfully Review URL: http://codereview.chromium.org/2889001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51868 0039d316-1c4b-4281-b951-d872f2087c98
* Modified grit to support <if expr="..."> tags within included html files. ↵zelidrag@chromium.org2010-07-033-8/+59
| | | | | | | | | | | Removed ChromeOS-specific sub-pages from options by using the newly added if tag. Changed <!--include file="..."--> tag to <include src="...">. BUG=chromium-os:4450 TEST=make sure that chromeos specific pages don't show in chrome:options for other platforms Review URL: http://codereview.chromium.org/2872028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51578 0039d316-1c4b-4281-b951-d872f2087c98
* Rename chrome://theme/resource to chrome://theme/IDR_RESOURCEarv@chromium.org2010-07-011-5/+2
| | | | | | | | | BUG=47881 TEST=Unit tests Review URL: http://codereview.chromium.org/2805050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51444 0039d316-1c4b-4281-b951-d872f2087c98
* Split options page code/html into its own set of files.zelidrag@chromium.org2010-06-301-0/+9
| | | | | | | | | | | | Changed grit to support generic <!--include file="..."--> tag in html files to support the scenario above. TEST=make sure chrome:options page still shows correctly BUG=chromium-os:4429 Review URL: http://codereview.chromium.org/2835009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51203 0039d316-1c4b-4281-b951-d872f2087c98
* Move the resources used by net-internals into a pak file.tony@chromium.org2010-06-114-3/+16
| | | | | | | | | | We don't use this yet, but the plan is to move everything in the resources directory into here. BUG=42770 Review URL: http://codereview.chromium.org/2667001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49507 0039d316-1c4b-4281-b951-d872f2087c98
* Make ChromeOS's options dialog wider for it and da.xiyuan@chromium.org2010-06-094-5/+30
| | | | | | | | | | | | - Add "pp_if", "pp_ifdef" support to xtb's <if> expr; - Use that to specify a wider width for options dialog for ChromeOS on it and da; BUG=none TEST=Verify options dialog tab headers are not truncaated on ChromeOS for it and da. Review URL: http://codereview.chromium.org/2655003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49256 0039d316-1c4b-4281-b951-d872f2087c98
* Fix grit unittests.tony@chromium.org2010-05-203-2/+4
| | | | | | | | | | | | | | The two rc unittests are failing because it appears the data files checked into svn don't match. It's easier to change the tests because the data is in a different (internal only) repo. AFAICT, this has been broken forever. The other fix is because a test became more correct after r43930, but the test was passing anyway. Review URL: http://codereview.chromium.org/2131013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47756 0039d316-1c4b-4281-b951-d872f2087c98
* NTP - Refactor the most visited code to uncouple it from the rest of the NTP.arv@chromium.org2010-04-301-16/+45
| | | | | | | | | | | The goal of this refactoring is to allow splitting the different parts of the NTP into different reusable components. BUG=None TEST=Manually Review URL: http://codereview.chromium.org/1695022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46021 0039d316-1c4b-4281-b951-d872f2087c98
* Enforce the restriction that placeholder names can only containtony@chromium.org2010-04-081-1/+1
| | | | | | | | | | caps, numbers and underscores. BUG=37254 Review URL: http://codereview.chromium.org/1527013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43930 0039d316-1c4b-4281-b951-d872f2087c98
* Remove a bunch of output generated by grit during the build. Fortony@chromium.org2010-04-083-8/+10
| | | | | | | | | | | | | | a chromium build, this should produce no output. For official builds, we print warnings about untranslated strings. This is the first step in trying to have grit produce useful warning messages. BUG=39417 Review URL: http://codereview.chromium.org/1518018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43900 0039d316-1c4b-4281-b951-d872f2087c98
* Switch from he.xtb to iw.xtb because the translation console istony@chromium.org2010-03-261-1/+4
| | | | | | | | deprecating 'he' in favor of 'iw'. Review URL: http://codereview.chromium.org/1332001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42713 0039d316-1c4b-4281-b951-d872f2087c98
* Fix a bug that surfaced when two nodes with the same ID havetony@chromium.org2010-01-281-1/+2
| | | | | | | | | | | | | use_name_for_id=true set. We want to ignore the nodes that don't apply for this platform. Fixing on trunk first then will copy to the 306 branch with drover. BUG=32868 Review URL: http://codereview.chromium.org/552176 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37381 0039d316-1c4b-4281-b951-d872f2087c98
* Only generate grit header id values for messages that aretony@chromium.org2009-09-241-3/+6
| | | | | | | | used. This fixes a bug were we skip numbers in a header file. Review URL: http://codereview.chromium.org/233004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27087 0039d316-1c4b-4281-b951-d872f2087c98
* Remove MSVC build files that grit used to use. These havetony@chromium.org2009-09-184-148/+0
| | | | | | | | | long since been replaced by generated files from gyp. Review URL: http://codereview.chromium.org/213013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26581 0039d316-1c4b-4281-b951-d872f2087c98
* Altering grit so that it clobbers all outputs even on windows.bradnelson@chromium.org2009-09-042-6/+99
| | | | | | | | | | | | | | | | | | | | Previously headers were handled differently only as an optimization. This thwarts vstudio + gyp. Adding a grit_info python stub so that gyp can get an accurate list of inputs and outputs from a grd file. Currently only using it for the inputs, because there's no good way in gyp to have rules invoke a !@( expansion once per rule instance. This change will over-specify dependencies for these modules, but it will at least not under-specify them anymore. BUG=24836 TEST=None Review URL: http://codereview.chromium.org/197007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25499 0039d316-1c4b-4281-b951-d872f2087c98
* Updatetony@chromium.org2009-09-041-0/+4
| | | | | | | | | | | | | | grit to replace \n to actual new lines in data pack files. Windows' MessageBox automatically converts \n to a new line, but GTK+ doesn't. BUG=20943 Review URL: http://codereview.chromium.org/196007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25408 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 24094, caused a build break.maruel@chromium.org2009-08-242-11/+2
| | | | | | | | | TBR=mnaganov BUG=none TEST=none Review URL: http://codereview.chromium.org/174319 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24096 0039d316-1c4b-4281-b951-d872f2087c98
* DevTools l10n: merge Inspector's and DevTools's strings; also, disable l10n ↵mnaganov@chromium.org2009-08-242-2/+11
| | | | | | | | | | | until mgr agreeement. BUG=none TEST=none Review URL: http://codereview.chromium.org/173267 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24094 0039d316-1c4b-4281-b951-d872f2087c98
* GRIT: add support for 'js_map_format' needed for DevTools l10n.mnaganov@chromium.org2009-08-107-5/+176
| | | | | | | | | WebKit Inspector is localized using a JS file containing the following map: localizedStrings[<english text>] = <translated text>; Review URL: http://codereview.chromium.org/164066 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22900 0039d316-1c4b-4281-b951-d872f2087c98
* Add <if> blocks to xtb files in the simplest possible way. This currentlytc@google.com2009-07-221-1/+18
| | | | | | | | | | | | only supports checking the OS, but we can add more information if necessary. BUG=16884 Review URL: http://codereview.chromium.org/159148 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21249 0039d316-1c4b-4281-b951-d872f2087c98
* Instead of try:-except:-finally:, use nested try:-except: withinsgk@google.com2009-06-191-28/+29
| | | | | | | | | try:-finally: so builds will work without forced upgrades to Python 2.5. BUG=12818 TEST=successful build Review URL: http://codereview.chromium.org/140005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18848 0039d316-1c4b-4281-b951-d872f2087c98
* Convert to gyp generation of chrome_resources and chrome_strings.sgk@chromium.org2009-06-043-5/+5
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/119128 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17609 0039d316-1c4b-4281-b951-d872f2087c98
* Revert last checkin to fix resources in Release builds.sgk@chromium.org2009-06-033-5/+5
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/119075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17468 0039d316-1c4b-4281-b951-d872f2087c98
* Convert to gyp generation of chrome_resources and chrome_strings.sgk@chromium.org2009-06-033-5/+5
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/119061 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17467 0039d316-1c4b-4281-b951-d872f2087c98
* Fix branded resource buiding.jrg@chromium.org2009-05-291-2/+8
| | | | | | | | | | | One visible change: new tab page has Google icon, not Chromium. Gyp doesn't have a set environment variable facility; hence the addition of a command line option to grit. Review URL: http://codereview.chromium.org/113974 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17148 0039d316-1c4b-4281-b951-d872f2087c98
* Have the grit rules depend on the .pak files.tc@google.com2009-05-062-2/+2
| | | | | | | | | | | chrome_resources and chrome_strings was continually rebuilding because it depended on the .h file, but the .h file doesn't get written if there are no changes. The .pak file always gets written. Review URL: http://codereview.chromium.org/115035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15432 0039d316-1c4b-4281-b951-d872f2087c98
* Doesn't fix anything at all but make it clearer.maruel@chromium.org2009-05-061-28/+28
| | | | | | Review URL: http://codereview.chromium.org/109051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15375 0039d316-1c4b-4281-b951-d872f2087c98
* Move the shared JS and CSS out of the HTML files and into separate files.arv@chromium.org2009-05-051-5/+36
| | | | | | Review URL: http://codereview.chromium.org/99151 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15323 0039d316-1c4b-4281-b951-d872f2087c98
* Only skip the GRIT header writing on Windows. This will causetc@google.com2009-05-011-5/+6
| | | | | | | | | | | | | | resource only changes to rebuild lots of stuff on Mac and Linux, but since most of this is happening on Windows anyway, only optimize for Windows. This should make second builds faster since all the dependencies are up to date. Review URL: http://codereview.chromium.org/99265 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15023 0039d316-1c4b-4281-b951-d872f2087c98
* Changes in preparation for webkit switch to gyp.bradnelson@google.com2009-04-291-1/+1
| | | | | | | | These won't get gated live without a change to all.gyp, so landing them separately. Review URL: http://codereview.chromium.org/100146 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14822 0039d316-1c4b-4281-b951-d872f2087c98
* First cut at adding a map between strings names and resource ids.tc@google.com2009-04-244-1/+127
| | | | | | | | | | | | | This creates a mapping for all the entries in the theme_resources.grd file and adds a static method for querying the mapping. BUG=10639 Review URL: http://codereview.chromium.org/92085 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14443 0039d316-1c4b-4281-b951-d872f2087c98
* grit: cut down on chattiness.evan@chromium.org2009-04-142-5/+10
| | | | | | | | | - We don't need to print the copyright every time we run. - Don't print empty lines when there are no warnings. Review URL: http://codereview.chromium.org/67085 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13691 0039d316-1c4b-4281-b951-d872f2087c98
* This adds link[rel=icon] elements to the DOM UI html files for downloads and arv@chromium.org2009-04-101-3/+6
| | | | | | | | | | | | history. It also adds code to inline the resources for <link rel="icon"> elements BUG=9805 Review URL: http://codereview.chromium.org/66041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13550 0039d316-1c4b-4281-b951-d872f2087c98
* Remove the checked-in scons configuration files.sgk@google.com2009-04-011-15/+0
| | | | | | Review URL: http://codereview.chromium.org/53121 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12982 0039d316-1c4b-4281-b951-d872f2087c98
* This fixes a few GRIT issues:tc@google.com2009-03-273-7/+24
| | | | | | | | | | | | | | - The generated header files had the wrong paths specified in the vcproj files. - Have the .h files generate to a temp file and overwrite the real .h files if they changed from the last run. This prevents recompiling when only a resource is changed. - Change the output file to the .rc file because otherwise the vcproj file would recompile every time because the .h file wasn't changing. Since the .rc file gets written all the time, this isn't a problem. On a side note, you still have to re-link to get the resources in chrome.dll. I imagine if you turn on incremental linking, this would be pretty fast. BUG=7967 Review URL: http://codereview.chromium.org/53028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12630 0039d316-1c4b-4281-b951-d872f2087c98
* Switching net over to use gyp on windows.bradnelson@google.com2009-03-181-1/+1
| | | | | | Review URL: http://codereview.chromium.org/48108 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11942 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes CRLF and trailing white spaces.maruel@chromium.org2009-03-0572-918/+918
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10982 0039d316-1c4b-4281-b951-d872f2087c98
* Use grit to generate locale rc files and remove the old locale rc files from ↵tc@google.com2009-03-053-55/+20
| | | | | | | | | | | | | | the tree. I made a small change to grit so we can use our resource ID as the translation ID making it a bit easier to read. The old locale_settings*.rc files would #include the google_strings.rc or chromium_strings.rc. Instead, I added it to the vcproj file using $(CHROMIUM_BUILD) to grab the right file. This required changing the output names in the grd files. TBR=deanm Review URL: http://codereview.chromium.org/39152 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10955 0039d316-1c4b-4281-b951-d872f2087c98
* fix python2.6 warnings in grittc@google.com2009-03-044-7/+9
| | | | | | | | | | | remove one assert as it's not correct BUG=8298,8299 Review URL: http://codereview.chromium.org/40073 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10922 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "Use grit to generate locale rc files and remove the old locale rc ↵tc@google.com2009-03-032-19/+4
| | | | | | | | | | | files from the tree." Revert "window_ is null during BrowserWindow creation. Assume full screen" Revert "Move SupportsWindowFeature from BrowserView to Browser so" git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10814 0039d316-1c4b-4281-b951-d872f2087c98
* Use grit to generate locale rc files and remove the old locale rc files from ↵tc@google.com2009-03-032-4/+19
| | | | | | | | | | | | | the tree. I made a small change to grit so we can use our resource ID as the translation ID making it a bit easier to read. I also used a script to convert the existing .rc files to .xtb files. Review URL: http://codereview.chromium.org/28327 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10809 0039d316-1c4b-4281-b951-d872f2087c98
* Properly handle errors in GRIT in the scons build.tc@google.com2009-02-271-29/+37
| | | | | | | | | | This lets the child process exit even if there are errors and causes the main scons process to identify these errors as build failures. Review URL: http://codereview.chromium.org/28282 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10652 0039d316-1c4b-4281-b951-d872f2087c98
* Add os support to grit so we can conditionally include resources based ontc@google.com2009-02-271-0/+3
| | | | | | | | | platform. Review URL: http://codereview.chromium.org/28237 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10556 0039d316-1c4b-4281-b951-d872f2087c98
* Fix a bug where the flattened HTML file was not gettingtc@google.com2009-02-261-4/+3
| | | | | | | | | included in data pack files. Review URL: http://codereview.chromium.org/28222 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10525 0039d316-1c4b-4281-b951-d872f2087c98
* fix the grd scanner to only include files that we're usingtc@google.com2009-02-261-5/+2
| | | | | | | | | bug=8139 Review URL: http://codereview.chromium.org/28225 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10519 0039d316-1c4b-4281-b951-d872f2087c98
* Fix scons build where the internal theme files don't exist.tc@google.com2009-02-261-1/+6
| | | | | | | Review URL: http://codereview.chromium.org/28218 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10515 0039d316-1c4b-4281-b951-d872f2087c98
* Fix grit include dependencies in the scons build.tc@google.com2009-02-262-14/+4
| | | | | | | | | | | | | | | Re-enable the scons code that walks a grd file and adds its dependencies as build dependencies. This requires that all our dependencies are files in our source tree (which is what motivated getting rid of the tld data as a generated resource). I had to fix up the terms of service for this. Also remove some code that disabled .pak file generation on windows which was broken because it couldn't find the tld data. Review URL: http://codereview.chromium.org/28194 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10494 0039d316-1c4b-4281-b951-d872f2087c98
* Enable the .pak files on mac builds also.thomasvl@chromium.org2009-02-261-2/+3
| | | | | | Review URL: http://codereview.chromium.org/27153 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10446 0039d316-1c4b-4281-b951-d872f2087c98