summaryrefslogtreecommitdiffstats
path: root/tools/grit
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Allow grit to run in parallel with scons by forking child processestc@google.com2009-02-251-4/+11
| | | | | | | | | for each grit builder. This speeds up the build a bit. Review URL: http://codereview.chromium.org/27118 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10401 0039d316-1c4b-4281-b951-d872f2087c98
* fix call to os.makedirstc@google.com2009-02-251-1/+1
| | | | | | | | | | | it's in the os module, not os.path. tbr=deanm Review URL: http://codereview.chromium.org/27114 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10312 0039d316-1c4b-4281-b951-d872f2087c98
* Final step in converting all grit includes to have grit in the path.tc@google.com2009-02-242-22/+5
| | | | | | | | | | | | Fixes some linux/mac issues that were pending and fix up the scons build to expect the file in the grit subdir. BUG=7537 Review URL: http://codereview.chromium.org/28035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10306 0039d316-1c4b-4281-b951-d872f2087c98
* Update include paths for grit files. Go ahead and resorttc@google.com2009-02-222-2/+2
| | | | | | | | the headers too. Review URL: http://codereview.chromium.org/21472 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10167 0039d316-1c4b-4281-b951-d872f2087c98
* step 1 on getting strings in linux: create a locale_settings.grdtc@google.com2009-02-182-5/+14
| | | | | | | | | | | | | | | | | | based on locale_settings_en-US.rc. We don't use this anywhere yet, just putting things in place. - Fix preprocessor defines in grit vcproj files (needs to be defined everywhere) and update grit_localized_resources.rules to pass the preprocessor define to grit. - Add generated .h files to chrome_strings.vcproj so people can ctrl+alt+a open them. - Update GRIT so it knows how to substitute [GRITLANGCODE] in strings to the locale value. Review URL: http://codereview.chromium.org/20440 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9922 0039d316-1c4b-4281-b951-d872f2087c98
* Another pass at fixing grit includesjoshia@google.com2009-02-171-1/+1
| | | | | | | | TBR=tony@chromium.org Review URL: http://codereview.chromium.org/20428 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9891 0039d316-1c4b-4281-b951-d872f2087c98
* Add relative include path for grit includesjoshia@google.com2009-02-171-1/+1
| | | | | | | | TBR=tony@chromium.org Review URL: http://codereview.chromium.org/20422 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9880 0039d316-1c4b-4281-b951-d872f2087c98
* Fix scons build for non-official builds.tc@google.com2009-02-121-0/+2
| | | | | | | | | | We were trying to include all resources, even those hidden behind an preprocessor #if. Review URL: http://codereview.chromium.org/20311 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9680 0039d316-1c4b-4281-b951-d872f2087c98
* Second try of landing chrome_resources project. Changes from last time:tc@google.com2009-02-124-2/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | - fix scons dependencies by adding a target for grit/theme_resources.h - fix mac build by adding grit to unittest include path - fix check deps by adding rules for /grit dir. Create a chrome_resources.vcproj that holds grd files that hold non-string resources. Put browser_resources.grd into this vcproj. Port theme_resources.rc/theme_resources.h to theme_resources.grd and put it in the vcproj too. I did a find/replace on the theme_resources include line. Modify grit so header files go in grit_generated_resources/grit/ so the include path can be cleaner. I'll migrate the others in follow up patches. theme_resources.rc had a conditional include of distribution_resources.rc so I had to add support for preprocessor defines to visual studio. Review URL: http://codereview.chromium.org/24011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9664 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "Create a chrome_resources.vcproj that holds grd files that hold"tc@google.com2009-02-123-38/+2
| | | | | | | | | | This reverts commit r9631. TBR=deanm Review URL: http://codereview.chromium.org/23023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9634 0039d316-1c4b-4281-b951-d872f2087c98
* Create a chrome_resources.vcproj that holds grd files that holdtc@google.com2009-02-123-2/+38
| | | | | | | | | | | | | | | | | | | | | non-string resources. Put browser_resources.grd into this vcproj. Port theme_resources.rc/theme_resources.h to theme_resources.grd and put it in the vcproj too. I did a find/replace on the theme_resources include line. Modify grit so header files go in grit_generated_resources/grit/ so the include path can be cleaner. I'll migrate the others in follow up patches. theme_resources.rc had a conditional include of distribution_resources.rc so I had to add support for preprocessor defines to visual studio. Review URL: http://codereview.chromium.org/20247 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9631 0039d316-1c4b-4281-b951-d872f2087c98
* Only run one grit builder at a time under scons.tc@google.com2009-02-102-14/+4
| | | | | | | | | | | GRIT is not thread safe, we shouldn't be running multiple copies at one time. This is causing the header files to have duplicates when it shouldn't. I also removed some code in build.py which tried to prevent an identical regenerated header file from being used (so stuff doesn't rebuild unnecessarily). This code isn't necessary for our build since VS/xcode/scons handles the dependency for us (i.e., this isn't a blanket prebuild step). Review URL: http://codereview.chromium.org/21191 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9488 0039d316-1c4b-4281-b951-d872f2087c98
* Move browser_resources.rc into a a grd file. While I'm at it,tc@google.com2009-02-093-4/+133
| | | | | | | | | | | | I removed the flatten_html visual studio rule and just rolled the functionality directly into GRIT. The sln change is to have browser depend on browser_resources (now needed for browser_resources.h). Review URL: http://codereview.chromium.org/21148 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9418 0039d316-1c4b-4281-b951-d872f2087c98
* Add a Repack tool to scons. This is used to compile linux resourcestc@google.com2009-02-061-1/+1
| | | | | | | | | | | | together (kind of like the windows RES builder). I also moved the GRIT builder into the chromium site_scons since we import it in lots of places. This seems cleaner. Review URL: http://codereview.chromium.org/21115 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9331 0039d316-1c4b-4281-b951-d872f2087c98
* fix webkit hammer buildtc@google.com2009-02-051-1/+3
| | | | | | | | | TBR=evan Review URL: http://codereview.chromium.org/21108 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9275 0039d316-1c4b-4281-b951-d872f2087c98
* Some cleanup on the GRIT scons builder.tc@google.com2009-02-052-25/+41
| | | | | | | | | | | | | | - Cause the builder to have nicer output by removing a stray print in rc_header.py and adding a custom print function to the build action. - Fix the source scanner by hooking it up directly to the Builder, scanning for include dependencies and adding dependencies on the grit python source. Review URL: http://codereview.chromium.org/21102 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9271 0039d316-1c4b-4281-b951-d872f2087c98
* Convert webkit_glue::GetLocalizedString to return a string16tc@google.com2009-02-051-2/+4
| | | | | | | | | | instead of a wstring. Convert the linux data pack files to pack message strings as utf16 instead of utf8. Review URL: http://codereview.chromium.org/20060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9193 0039d316-1c4b-4281-b951-d872f2087c98
* Include webkit strings in test shell data pack.tc@google.com2009-01-223-5/+18
| | | | | | | | | | This adds <message> node to the types of GRIT nodes that we can stuff into a data package file and removes a test shell hack. Review URL: http://codereview.chromium.org/18478 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8431 0039d316-1c4b-4281-b951-d872f2087c98
* fix build on windowstc@google.com2009-01-161-0/+1
| | | | | | | | | | we don't actually want to run this code on windows. TBR=evanm Review URL: http://codereview.chromium.org/18171 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8223 0039d316-1c4b-4281-b951-d872f2087c98
* Have net_resources.grd generate a .pak file too. Since the tldtc@google.com2009-01-163-3/+20
| | | | | | | | | | | data is generated and included in the .pak file, we need to add a dependency in the SCons build. Making the corresponding changes to mac/win is harder, so punting for now. Review URL: http://codereview.chromium.org/18127 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8220 0039d316-1c4b-4281-b951-d872f2087c98
* Add data pack file format to the grit output type and enable it for ↵tc@google.com2009-01-166-3/+120
| | | | | | | | | | | | | | | | | | webkit_resources.grd. This only adds support for <include> nodes. <message> nodes are forthcoming. The design doc describing the format is here: http://dev.chromium.org/developers/design-documents/linuxresourcesandlocalizedstrings I hooked into the <release> tag because we need to generate an index at the beginning of the file. The index contains the position of all the resources, so we walk the file at that point. This currently only handles <include> tags, but will be extended to handle <message> as well. Review URL: http://codereview.chromium.org/18215 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8147 0039d316-1c4b-4281-b951-d872f2087c98
* Remove grit hack and inline a 30x30 red square for atc@google.com2009-01-132-4/+0
| | | | | | | | | data resource that we were loading from disk. This should get compiled out in chrome. Rebaseline one test. Review URL: http://codereview.chromium.org/18008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7966 0039d316-1c4b-4281-b951-d872f2087c98
* Move webkit_resources.rc to webkit_resources.grd. Addtc@google.com2009-01-132-0/+4
| | | | | | | | | | | | | | | | | webkit_resources.vcproj which creates the .rc files and have webkit glue depend on it. I had to add a flag to grit that allows a resource to be in the header, but not in the .rc file. We do this for a test_shell only resource that is not compiled in. SCons build also works on windows. I still need to update the other .sln files and mac build. Review URL: http://codereview.chromium.org/17466 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7910 0039d316-1c4b-4281-b951-d872f2087c98
* Add using_generated_resources.scons to the build. Thistc@google.com2009-01-061-0/+15
| | | | | | | | | | | is the same as using_generated_resources.vsprops. Replace existing paths with this scons file if the SConscript file has already been converted to the using_ format. Review URL: http://codereview.chromium.org/14902 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7583 0039d316-1c4b-4281-b951-d872f2087c98
* Some more GRIT refactoring.tc@google.com2009-01-053-3/+34
| | | | | | | | | | | | | | | | | | Moved the grit .vsprops file from chrome/tools/build/win/ to /tools/grit/build and renamed to using_generated_resources.vsprops. Updated non-chrome projects to use the this new vsprops file. Created a new .rules file and renamed the old one. Now there are grit_resources.rules and grit_localized_resources.rules. The latter is what we use now, but I'll be adding some grd files that use the former in a follow up change. This is just vsprops reshuffling for now. I'll also add a using_generated_resources.scons in a follow up change. Review URL: http://codereview.chromium.org/14901 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7560 0039d316-1c4b-4281-b951-d872f2087c98
* Remove version number from Python shebang.evanm@google.com2008-12-161-1/+1
| | | | | | | | On special request from someone trying to purge python2.2 from code indexed internally at Google. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7071 0039d316-1c4b-4281-b951-d872f2087c98
* Have GRIT generate files into a common directory.tc@google.com2008-12-122-54/+58
| | | | | | | | | | | | | | | Joi has convinced me that GRIT should generate platform specific resources files. This is easier than parsing .rc files because GRIT effectively has an .rc parser. To that end, we need to convert some existing .rc files to .grd files (e.g., net_resources.rc and webkit_resources.rc). Rather than having every grd file output to a different place and -I all the different paths, have GRIT generate all files into one directory. This directory is grit_derived_sources. Review URL: http://codereview.chromium.org/13776 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6940 0039d316-1c4b-4281-b951-d872f2087c98
* Use the public SCons API to create the GRIT Builder and Action,sgk@google.com2008-11-181-9/+6
| | | | | | | not by reaching directly into the SCons internals. Review URL: http://codereview.chromium.org/11242 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5629 0039d316-1c4b-4281-b951-d872f2087c98
* Change GRIT rules to support 8 new Indic languages.mal@chromium.org2008-11-181-0/+16
| | | | | | | | | | | | NOTE: I don't know what affect this change has (!!). This is a blind change. Because all the other supported locales have entries here, I added the new locales. R= tony Review URL: http://codereview.chromium.org/10969 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5602 0039d316-1c4b-4281-b951-d872f2087c98
generated by cgit v1.1 at 2025-02-01 21:56:04 +0000