summaryrefslogtreecommitdiffstats
path: root/tools/grit
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Next round of SCons changes:sgk@google.com2008-11-141-1/+5
| | | | | | | | | | | | | | | | | | | * Add 'gdm_fp' to the $LIBS setting in base\using_base.scons (to be removed when that library moves into base\third_party). * Have the grit Scanner search the Repository() copy of the source file (necessary now that $TARGET_ROOT has changed). * Change all the SConscript files underneath chrome\test and chrome\tools to *.scons files, including updating their contents with the current patterns. * Add dependencies of the local_settings_*.res files on the corresponding google_chrome_string_*.rc files, so they get generated properly. * Add generation of the chrome_exe.res resource file. * Comment out some unnecessary .lib settings in the base construction environment. Review URL: http://codereview.chromium.org/10745 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5480 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes for Visual Studio solution + project file generation:sgk@google.com2008-11-141-3/+15
| | | | | | | | | | | | * Fix the grit tool so it works with Repository() directories (and tap gspencer to upstream the changes). * Fix the evaluation of $PRE_EVALUATE_DIRS, which was interfering with sucking up the source files for listing in the .vcproj files. * Set AlwaysBuild() on the project files so they're always evaluated for up-to-dateness when 'all_solutions' is the target. Review URL: http://codereview.chromium.org/10725 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5440 0039d316-1c4b-4281-b951-d872f2087c98
* Run GRIT on all platforms.tc@google.com2008-10-171-1/+1
| | | | | | | | | | | | | * RCFLAGS may not exist in SCons environment. Use empty list if absent. * Accumulate generated files in grit_files and run RES on win32 only. Patch by Seo Sanghyeon <sanxiyn@gmail.com> originally from http://codereview.chromium.org/7247/show Review URL: http://codereview.chromium.org/7614 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3517 0039d316-1c4b-4281-b951-d872f2087c98
* Have grit only try to output errors in ascii (replace chars > 127 withtc@google.com2008-08-291-1/+2
| | | | | | | | ?). Helps the scons build work. BUG=1350947 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1539 0039d316-1c4b-4281-b951-d872f2087c98
* Use a more compact license header in source files.license.bot2008-08-2480-2257/+320
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1287 0039d316-1c4b-4281-b951-d872f2087c98
* Remove the third_party/gnu directory, switching scripts that use unix like ↵erg@google.com2008-08-071-2/+2
| | | | | | | | tools to cygwin. BUGS=1313603 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@539 0039d316-1c4b-4281-b951-d872f2087c98
* Add tools to the repository.initial.commit2008-07-2786-0/+13634
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17 0039d316-1c4b-4281-b951-d872f2087c98