From 555a61a06861dd1f708624d922faa7a1c23a39fd Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Tue, 19 Aug 2003 17:39:26 +0000 Subject: [PATCH] ICU-3190 Prevent the constant rebuilding of ICU when it isn't needed. X-SVN-Rev: 12872 --- icu4c/source/common/common.rc | 50 +++++++++++++++++++++++++---- icu4c/source/common/msvcres.h | 11 +++++++ icu4c/source/extra/ustdio/ustdio.rc | 48 ++++++++++++++++++++++----- icu4c/source/i18n/i18n.rc | 46 ++++++++++++++++++++++---- icu4c/source/layout/layout.rc | 50 +++++++++++++++++++++++++---- icu4c/source/layoutex/layoutex.rc | 50 +++++++++++++++++++++++++---- 6 files changed, 219 insertions(+), 36 deletions(-) create mode 100644 icu4c/source/common/msvcres.h diff --git a/icu4c/source/common/common.rc b/icu4c/source/common/common.rc index bf9c32fe26c..c3d9323b713 100644 --- a/icu4c/source/common/common.rc +++ b/icu4c/source/common/common.rc @@ -1,25 +1,50 @@ -//Do not edit with Microsoft Developer Studio because it will modify this -//script in the wrong way. +// Do not edit with Microsoft Developer Studio Resource Editor. +// It will permanently substitute version numbers that are intended to be +// picked up by the pre-processor during each build. // Copyright (c) 2001-2003 International Business Machines // Corporation and others. All Rights Reserved. // +#include "msvcres.h" + #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// // // Generated from the TEXTINCLUDE 2 resource. // -#include "winresrc.h" - +#include ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// +// LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #pragma code_page(1252) -#include "unicode\uversion.h" +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "msvcres.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include \0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + ///////////////////////////////////////////////////////////////////////////// // @@ -55,7 +80,6 @@ BEGIN #else VALUE "OriginalFilename", "icuuc" U_ICU_VERSION_SHORT ".dll\0") #endif - VALUE "PrivateBuild", "\0" VALUE "ProductName", "International Components for Unicode\0" VALUE "ProductVersion", CommaVersionString(U_ICU_VERSION_MAJOR_NUM, U_ICU_VERSION_MINOR_NUM, U_ICU_VERSION_PATCHLEVEL_NUM, 0) @@ -70,3 +94,15 @@ END ///////////////////////////////////////////////////////////////////////////// + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/icu4c/source/common/msvcres.h b/icu4c/source/common/msvcres.h new file mode 100644 index 00000000000..1bd84b07450 --- /dev/null +++ b/icu4c/source/common/msvcres.h @@ -0,0 +1,11 @@ +//{{NO_DEPENDENCIES}} +// Copyright (c) 2003 International Business Machines +// Corporation and others. All Rights Reserved. +// +// Used by common.rc and other .rc files. +//Do not edit with Microsoft Developer Studio because it will modify this +//header the wrong way. This is here to prevent Visual Studio .NET from +//unnessarily building the resource files when it's not needed. +// +#include "unicode/uversion.h" + diff --git a/icu4c/source/extra/ustdio/ustdio.rc b/icu4c/source/extra/ustdio/ustdio.rc index 7274956c1b4..63597aa3fa4 100644 --- a/icu4c/source/extra/ustdio/ustdio.rc +++ b/icu4c/source/extra/ustdio/ustdio.rc @@ -1,29 +1,50 @@ -// Version Resource file for ICU usdtio library. - // Do not edit with Microsoft Developer Studio Resource Editor. // It will permanently substitute version numbers that are intended to be // picked up by the pre-processor during each build. // Copyright (c) 2001-2003 International Business Machines // Corporation and others. All Rights Reserved. // +#include "../../common/msvcres.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// // // Generated from the TEXTINCLUDE 2 resource. // -#include "winresrc.h" - +#include ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// +// LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #pragma code_page(1252) -#include "unicode\uversion.h" +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "../../common/msvcres.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include \0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + ///////////////////////////////////////////////////////////////////////////// // @@ -51,7 +72,7 @@ BEGIN BEGIN VALUE "Comments", "http://oss.software.ibm.com/icu/\0" VALUE "CompanyName", "IBM Corporation and others\0" - VALUE "FileDescription", "IBM ICU ustdio DLL\0" + VALUE "FileDescription", "IBM ICU I/O DLL\0" VALUE "FileVersion", CommaVersionString(U_ICU_VERSION_MAJOR_NUM, U_ICU_VERSION_MINOR_NUM, U_ICU_VERSION_PATCHLEVEL_NUM, 0) VALUE "LegalCopyright", U_COPYRIGHT_STRING "\0" #ifdef _DEBUG @@ -59,7 +80,6 @@ BEGIN #else VALUE "OriginalFilename", "icuio" U_ICU_VERSION_SHORT ".dll\0") #endif - VALUE "PrivateBuild", "\0" VALUE "ProductName", "International Components for Unicode\0" VALUE "ProductVersion", CommaVersionString(U_ICU_VERSION_MAJOR_NUM, U_ICU_VERSION_MINOR_NUM, U_ICU_VERSION_PATCHLEVEL_NUM, 0) @@ -74,3 +94,15 @@ END ///////////////////////////////////////////////////////////////////////////// + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/icu4c/source/i18n/i18n.rc b/icu4c/source/i18n/i18n.rc index f41fc69ac5c..120a13fbe0d 100644 --- a/icu4c/source/i18n/i18n.rc +++ b/icu4c/source/i18n/i18n.rc @@ -1,29 +1,50 @@ -// Version Resource file for ICU I18N library. - // Do not edit with Microsoft Developer Studio Resource Editor. // It will permanently substitute version numbers that are intended to be // picked up by the pre-processor during each build. // Copyright (c) 2001-2003 International Business Machines // Corporation and others. All Rights Reserved. // +#include "../common/msvcres.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// // // Generated from the TEXTINCLUDE 2 resource. // -#include "winresrc.h" - +#include ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// +// LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #pragma code_page(1252) -#include "unicode\uversion.h" +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "../common/msvcres.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include \0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + ///////////////////////////////////////////////////////////////////////////// // @@ -59,7 +80,6 @@ BEGIN #else VALUE "OriginalFilename", "icuin" U_ICU_VERSION_SHORT ".dll\0") #endif - VALUE "PrivateBuild", "\0" VALUE "ProductName", "International Components for Unicode\0" VALUE "ProductVersion", CommaVersionString(U_ICU_VERSION_MAJOR_NUM, U_ICU_VERSION_MINOR_NUM, U_ICU_VERSION_PATCHLEVEL_NUM, 0) @@ -74,3 +94,15 @@ END ///////////////////////////////////////////////////////////////////////////// + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/icu4c/source/layout/layout.rc b/icu4c/source/layout/layout.rc index 017bac90d40..4298b05aab0 100644 --- a/icu4c/source/layout/layout.rc +++ b/icu4c/source/layout/layout.rc @@ -1,25 +1,50 @@ -//Do not edit with Microsoft Developer Studio because it will modify this -//script in the wrong way. +// Do not edit with Microsoft Developer Studio Resource Editor. +// It will permanently substitute version numbers that are intended to be +// picked up by the pre-processor during each build. // Copyright (c) 2001-2003 International Business Machines // Corporation and others. All Rights Reserved. // +#include "../common/msvcres.h" + #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// // // Generated from the TEXTINCLUDE 2 resource. // -#include "winresrc.h" - +#include ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// +// LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #pragma code_page(1252) -#include "unicode\uversion.h" +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "../common/msvcres.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include \0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + ///////////////////////////////////////////////////////////////////////////// // @@ -55,7 +80,6 @@ BEGIN #else VALUE "OriginalFilename", "icule" U_ICU_VERSION_SHORT ".dll\0") #endif - VALUE "PrivateBuild", "\0" VALUE "ProductName", "International Components for Unicode\0" VALUE "ProductVersion", CommaVersionString(U_ICU_VERSION_MAJOR_NUM, U_ICU_VERSION_MINOR_NUM, U_ICU_VERSION_PATCHLEVEL_NUM, 0) @@ -70,3 +94,15 @@ END ///////////////////////////////////////////////////////////////////////////// + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/icu4c/source/layoutex/layoutex.rc b/icu4c/source/layoutex/layoutex.rc index 45e4ca5d749..2e1c359c5eb 100644 --- a/icu4c/source/layoutex/layoutex.rc +++ b/icu4c/source/layoutex/layoutex.rc @@ -1,25 +1,50 @@ -//Do not edit with Microsoft Developer Studio because it will modify this -//script in the wrong way. +// Do not edit with Microsoft Developer Studio Resource Editor. +// It will permanently substitute version numbers that are intended to be +// picked up by the pre-processor during each build. // Copyright (c) 2001-2003 International Business Machines // Corporation and others. All Rights Reserved. // +#include "../common/msvcres.h" + #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// // // Generated from the TEXTINCLUDE 2 resource. // -#include "winresrc.h" - +#include ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// +// LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #pragma code_page(1252) -#include "unicode\uversion.h" +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "../common/msvcres.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include \0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + ///////////////////////////////////////////////////////////////////////////// // @@ -55,7 +80,6 @@ BEGIN #else VALUE "OriginalFilename", "iculx" U_ICU_VERSION_SHORT ".dll\0") #endif - VALUE "PrivateBuild", "\0" VALUE "ProductName", "International Components for Unicode\0" VALUE "ProductVersion", CommaVersionString(U_ICU_VERSION_MAJOR_NUM, U_ICU_VERSION_MINOR_NUM, U_ICU_VERSION_PATCHLEVEL_NUM, 0) @@ -70,3 +94,15 @@ END ///////////////////////////////////////////////////////////////////////////// + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED +