diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-21 13:51:41 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-21 13:51:41 +0000 |
| commit | 5ff238bc23e3839bd332e8808b44f78245caf33d (patch) | |
| tree | 0e8e71ff7c40de5a0145c22446de2782b4eeeeaf /chrome_frame/resources | |
| parent | 8ddb57924349567a94419878536c781cd7791847 (diff) | |
| download | chromium_src-5ff238bc23e3839bd332e8808b44f78245caf33d.zip chromium_src-5ff238bc23e3839bd332e8808b44f78245caf33d.tar.gz chromium_src-5ff238bc23e3839bd332e8808b44f78245caf33d.tar.bz2 | |
Fix the tangled ball of poo that was our resource scripts. We previously had two version info resources, one of which got updated correctly during incremental builds, the other of which was used. Bring this down to the conventional one and make sure it gets updated.
BUG=Version information didn't get updated through incremental builds.
TEST=Now it does.
Review URL: http://codereview.chromium.org/3974001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63355 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/resources')
| -rw-r--r-- | chrome_frame/resources/tlb_resource.rc | 38 |
1 files changed, 4 insertions, 34 deletions
diff --git a/chrome_frame/resources/tlb_resource.rc b/chrome_frame/resources/tlb_resource.rc index b16c9d4..96464d4 100644 --- a/chrome_frame/resources/tlb_resource.rc +++ b/chrome_frame/resources/tlb_resource.rc @@ -6,6 +6,10 @@ // Seemingly innocuous edits totally destroy registration of the DLL. // Edit at your own peril. +#ifdef APSTUDIO_INVOKED +# error Don't open this in the GUI, it'll be massacred on save. +#endif // APSTUDIO_INVOKED + #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -25,44 +29,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) #endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""winres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "1 TYPELIB ""chrome_tab.tlb""\r\n" - "\0" -END -#else -#include "chrome_tab_version.rc" -#endif // APSTUDIO_INVOKED - #endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - -#ifndef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // // Generated from the TEXTINCLUDE 3 resource. // 1 TYPELIB "chrome_tab.tlb" - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED |