AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-6920 update version number to 4.4, and attempt to update windows files automatically

Browse Source 
X-SVN-Rev: 27583
This commit is contained in:
Steven R. Loomis 2010-02-17 22:18:24 +00:00
parent 6df15e57a3
commit 55150bd679
14 changed files with 111 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
icu4c/source/Makefile.in
View File

@ -65,7 +65,7 @@ EXTRA_DATA =
install-recursive clean clean-local clean-recursive distclean \
distclean-local distclean-recursive doc dist dist-local dist-recursive \
check check-local check-recursive clean-recursive-with-twist install-icu \
doc install-doc tests icu4j-data icu4j-data-install
doc install-doc tests icu4j-data icu4j-data-install update-windows-makefiles
## Clear suffix list
.SUFFIXES :
@ -229,7 +229,7 @@ config.status: $(srcdir)/configure $(srcdir)/common/unicode/uvernum.h
@echo
@echo
@echo "*** config.status has become stale ***"
@echo " 'configure' and/or 'uversion.h' have changed, please"
@echo " 'configure' and/or 'uvernum.h' have changed, please"
@echo " do 'runConfigureICU' (or 'configure') again, as per"
@echo " the readme.html."
@echo
@ -249,3 +249,19 @@ icu4j-data-install icu4j-data: all tests
@echo ICU4J_ROOT=$(ICU4J_ROOT)
@$(MAKE) -C test/testdata $@
@$(MAKE) -C data $@
WINDOWS_UPDATEFILES=$(srcdir)/data/makedata.mak $(shell find $(srcdir) -name '*.vcproj')
WINDOWS_UPDATEFILES_SED=config/windows-update.sed
update-windows-makefiles: config.status
@echo Updating Windows Makefiles for ICU $(VERSION)
CONFIG_FILES=$(WINDOWS_UPDATEFILES_SED) CONFIG_HEADERS= $(SHELL) ./config.status
@for file in $(WINDOWS_UPDATEFILES); do \
echo "Updating $$file"; \
mv "$${file}" "$${file}.bak" && \
sed -f $(WINDOWS_UPDATEFILES_SED) < "$${file}.bak" > "$${file}" && \
rm "$${file}.bak"; \
done;
$(RMV) $(WINDOWS_UPDATEFILES_SED)
@echo Please check over the changes carefully before checking them in.

8
icu4c/source/common/common.vcproj
View File

@ -75,7 +75,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin\icuuc43.dll"
OutputFile="..\..\bin\icuuc44.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
ProgramDatabaseFile=".\..\..\lib\icuuc.pdb"
@ -165,7 +165,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin64\icuuc43.dll"
OutputFile="..\..\bin64\icuuc44.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
ProgramDatabaseFile=".\..\..\lib64\icuuc.pdb"
@ -257,7 +257,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin\icuuc43d.dll"
OutputFile="..\..\bin\icuuc44d.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
@ -351,7 +351,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin64\icuuc43d.dll"
OutputFile="..\..\bin64\icuuc44d.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
GenerateDebugInformation="true"

37
icu4c/source/common/unicode/uvernum.h
View File

@ -12,7 +12,26 @@
* Created by: Vladimir Weinstein
* Updated by: Steven R. Loomis
*
* Gets included by utypes.h and Windows .rc files
* Gets included by uversion.h and other files.
*
* IMPORTANT: When updating version, the following things need to be done:
* source/common/unicode/uvernum.h - this file: update major, minor,
* patchlevel, suffix, version, short version constants, namespace,
* renaming macro, and copyright
*
* The following files need to be updated as well, which can be done
* by running the UNIX makefile target 'update-windows-makefiles' in icu/source.
*
*
* source/common/common.vcproj - update 'Output file name' on the link tab so
* that it contains the new major/minor combination
* source/i18n/i18n.vcproj - same as for the common.vcproj
* source/layout/layout.vcproj - same as for the common.vcproj
* source/layoutex/layoutex.vcproj - same
* source/stubdata/stubdata.vcproj - same as for the common.vcproj
* source/io/io.vcproj - same as for the common.vcproj
* source/data/makedata.mak - change U_ICUDATA_NAME so that it contains
* the new major/minor combination and the Unicode version.
*/
#ifndef UVERNUM_H
@ -23,7 +42,7 @@
* @stable ICU 2.4
*/
#define U_COPYRIGHT_STRING \
" Copyright (C) 2009, International Business Machines Corporation and others. All Rights Reserved. "
" Copyright (C) 2010, International Business Machines Corporation and others. All Rights Reserved. "
/** The current ICU major version as an integer.
* This value will change in the subsequent releases of ICU
@ -35,13 +54,13 @@
* This value will change in the subsequent releases of ICU
* @stable ICU 2.6
*/
#define U_ICU_VERSION_MINOR_NUM 3
#define U_ICU_VERSION_MINOR_NUM 4
/** The current ICU patchlevel version as an integer.
* This value will change in the subsequent releases of ICU
* @stable ICU 2.4
*/
#define U_ICU_VERSION_PATCHLEVEL_NUM 4
#define U_ICU_VERSION_PATCHLEVEL_NUM 0
/** The current ICU build level version as an integer.
* This value is for use by ICU clients. It defaults to 0.
@ -55,7 +74,7 @@
* This value will change in the subsequent releases of ICU
* @stable ICU 2.6
*/
#define U_ICU_VERSION_SUFFIX _43
#define U_ICU_VERSION_SUFFIX _44
/** Glued version suffix function for renamers
* This value will change in the subsequent releases of ICU.
@ -64,7 +83,7 @@
* @draft ICU 4.2
*/
#ifndef U_ICU_ENTRY_POINT_RENAME
#define U_ICU_ENTRY_POINT_RENAME(x) x ## _43
#define U_ICU_ENTRY_POINT_RENAME(x) x ## _44
#endif
/** The current ICU library version as a dotted-decimal string. The patchlevel
@ -72,18 +91,18 @@
* This value will change in the subsequent releases of ICU
* @stable ICU 2.4
*/
#define U_ICU_VERSION "4.3.4"
#define U_ICU_VERSION "4.4"
/** The current ICU library major/minor version as a string without dots, for library name suffixes.
* This value will change in the subsequent releases of ICU
* @stable ICU 2.6
*/
#define U_ICU_VERSION_SHORT "43"
#define U_ICU_VERSION_SHORT "44"
/** Data version in ICU4C.
* @internal ICU 4.4 Internal Use Only
**/
#define U_ICU_DATA_VERSION "4.3.4"
#define U_ICU_DATA_VERSION "4.4"
/*===========================================================================
* ICU collation framework version information

18
icu4c/source/common/unicode/uversion.h
View File

@ -25,24 +25,6 @@
#ifndef UVERSION_H
#define UVERSION_H
/**
* IMPORTANT: When updating version, the following things need to be done:
* source/common/unicode/uversion.h - this file: update major, minor,
* patchlevel, suffix, version, short version constants, namespace,
* and copyright
* source/common/common.vcproj - update 'Output file name' on the link tab so
* that it contains the new major/minor combination
* source/i18n/i18n.vcproj - same as for the common.vcproj
* source/layout/layout.vcproj - same as for the common.vcproj
* source/layoutex/layoutex.vcproj - same
* source/stubdata/stubdata.vcproj - same as for the common.vcproj
* source/io/io.vcproj - same as for the common.vcproj
* source/data/makedata.mak - change U_ICUDATA_NAME so that it contains
* the new major/minor combination
* source/tools/genren/genren.pl - use this script according to the README
* in that folder
*/
#include "unicode/umachine.h"
/* Actual version info lives in uvernum.h */

6
icu4c/source/config/windows-update.sed.in Normal file
View File

@ -0,0 +1,6 @@
# Copyright (C) 2010 IBM Corporation and Others. All Rights Reserved
# sed script for updating windows .mak and .vcproj files
s%^U_ICUDATA_NAME=.*%U_ICUDATA_NAME=icudt@LIB_VERSION_MAJOR@%
s%^UNICODE_VERSION=.*%UNICODE_VERSION=@UNICODE_VERSION@%
s%\(icu[a-zA-Z]*\)[0-9][0-9]\(d\.dll\)%\1@LIB_VERSION_MAJOR@\2%g
s%\(icu[a-zA-Z]*\)[0-9][0-9]\(\.dll\)%\1@LIB_VERSION_MAJOR@\2%g

22
icu4c/source/configure vendored
View File

@ -1947,12 +1947,25 @@ $as_echo_n "checking for ICU version numbers... " >&6; }
geticuversion() {
sed -n 's/^[ ]*#[ ]*define[ ]*U_ICU_VERSION[ ]*"\([^"]*\)".*/\1/p' "$@"
}
getuversion() {
sed -n 's/^[ ]*#[ ]*define[ ]*U_UNICODE_VERSION[ ]*"\([^"]*\)".*/\1/p' "$@"
}
VERSION=`geticuversion $srcdir/common/unicode/uvernum.h`
if test x"$VERSION" = x; then
VERSION=`geticuversion $srcdir/common/unicode/*.h`
if test x"$VERSION" = x; then
{ { $as_echo "$as_me:$LINENO: error: Cannot determine ICU version number from header files" >&5
$as_echo "$as_me: error: Cannot determine ICU version number from header files" >&2;}
{ { $as_echo "$as_me:$LINENO: error: Cannot determine ICU version number from uvernum.h header file" >&5
$as_echo "$as_me: error: Cannot determine ICU version number from uvernum.h header file" >&2;}
{ (exit 1); exit 1; }; }
fi
fi
UNICODE_VERSION=`getuversion $srcdir/common/unicode/uchar.h`
if test x"$UNICODE_VERSION" = x; then
UNICODE_VERSION=`getuversion $srcdir/common/unicode/*.h`
if test x"$UNICODE_VERSION" = x; then
{ { $as_echo "$as_me:$LINENO: error: Cannot determine Unicode version number from uchar.h header file" >&5
$as_echo "$as_me: error: Cannot determine Unicode version number from uchar.h header file" >&2;}
{ (exit 1); exit 1; }; }
fi
fi
@ -1964,10 +1977,9 @@ LIB_VERSION_MAJOR=`echo $LIB_VERSION | sed 's/\..*//'`
{ $as_echo "$as_me:$LINENO: result: release $VERSION, library $LIB_VERSION" >&5
$as_echo "release $VERSION, library $LIB_VERSION" >&6; }
{ $as_echo "$as_me:$LINENO: result: release $VERSION, library $LIB_VERSION, unicode version $UNICODE_VERSION" >&5
$as_echo "release $VERSION, library $LIB_VERSION, unicode version $UNICODE_VERSION" >&6; }
UNICODE_VERSION="5.2"
# Determine the host system

16
icu4c/source/configure.in
View File

@ -21,11 +21,22 @@ AC_MSG_CHECKING(for ICU version numbers)
geticuversion() {
[sed -n 's/^[ ]*#[ ]*define[ ]*U_ICU_VERSION[ ]*"\([^"]*\)".*/\1/p' "$@"]
}
getuversion() {
[sed -n 's/^[ ]*#[ ]*define[ ]*U_UNICODE_VERSION[ ]*"\([^"]*\)".*/\1/p' "$@"]
}
VERSION=`geticuversion $srcdir/common/unicode/uvernum.h`
if test x"$VERSION" = x; then
VERSION=`geticuversion $srcdir/common/unicode/*.h`
if test x"$VERSION" = x; then
AC_MSG_ERROR([Cannot determine ICU version number from header files])
AC_MSG_ERROR([Cannot determine ICU version number from uvernum.h header file])
fi
fi
UNICODE_VERSION=`getuversion $srcdir/common/unicode/uchar.h`
if test x"$UNICODE_VERSION" = x; then
UNICODE_VERSION=`getuversion $srcdir/common/unicode/*.h`
if test x"$UNICODE_VERSION" = x; then
AC_MSG_ERROR([Cannot determine Unicode version number from uchar.h header file])
fi
fi
# Compute a reasonable library version from the release version. This is
@ -36,9 +47,8 @@ LIB_VERSION_MAJOR=`echo $LIB_VERSION | sed 's/\..*//'`
AC_SUBST(VERSION)
AC_SUBST(LIB_VERSION)
AC_SUBST(LIB_VERSION_MAJOR)
AC_MSG_RESULT([release $VERSION, library $LIB_VERSION])
AC_MSG_RESULT([release $VERSION, library $LIB_VERSION, unicode version $UNICODE_VERSION])
UNICODE_VERSION="5.2"
AC_SUBST(UNICODE_VERSION)
# Determine the host system

2
icu4c/source/data/makedata.mak
View File

@ -10,7 +10,7 @@
##############################################################################
# Keep the following in sync with the version - see common/unicode/uversion.h
U_ICUDATA_NAME=icudt43
U_ICUDATA_NAME=icudt44
##############################################################################
U_ICUDATA_ENDIAN_SUFFIX=l
UNICODE_VERSION=5.2

8
icu4c/source/i18n/i18n.vcproj
View File

@ -78,7 +78,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin\icuin43.dll"
OutputFile="..\..\bin\icuin44.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
ProgramDatabaseFile=".\..\..\lib\icuin.pdb"
@ -174,7 +174,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin\icuin43d.dll"
OutputFile="..\..\bin\icuin44d.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
@ -268,7 +268,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin64\icuin43.dll"
OutputFile="..\..\bin64\icuin44.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
ProgramDatabaseFile=".\..\..\lib64\icuin.pdb"
@ -363,7 +363,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin64\icuin43d.dll"
OutputFile="..\..\bin64\icuin44d.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
GenerateDebugInformation="true"

8
icu4c/source/io/io.vcproj
View File

@ -78,7 +78,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin\icuio43.dll"
OutputFile="..\..\bin\icuio44.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
ProgramDatabaseFile=".\..\..\lib\icuio.pdb"
@ -174,7 +174,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin\icuio43d.dll"
OutputFile="..\..\bin\icuio44d.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
@ -268,7 +268,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin64\icuio43.dll"
OutputFile="..\..\bin64\icuio44.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
ProgramDatabaseFile=".\..\..\lib64\icuio.pdb"
@ -366,7 +366,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin64\icuio43d.dll"
OutputFile="..\..\bin64\icuio44d.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
GenerateDebugInformation="true"

8
icu4c/source/layout/layout.vcproj
View File

@ -81,7 +81,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin\icule43d.dll"
OutputFile="..\..\bin\icule44d.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
@ -175,7 +175,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin\icule43.dll"
OutputFile="..\..\bin\icule44.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
ProgramDatabaseFile=".\..\..\lib\icule.pdb"
@ -271,7 +271,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin64\icule43d.dll"
OutputFile="..\..\bin64\icule44d.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
@ -367,7 +367,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin64\icule43.dll"
OutputFile="..\..\bin64\icule44.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
ProgramDatabaseFile=".\..\..\lib64\icule.pdb"

8
icu4c/source/layoutex/layoutex.vcproj
View File

@ -78,7 +78,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin\iculx43.dll"
OutputFile="..\..\bin\iculx44.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
ProgramDatabaseFile=".\..\..\lib\iculx.pdb"
@ -173,7 +173,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin\iculx43d.dll"
OutputFile="..\..\bin\iculx44d.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
@ -266,7 +266,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin64\iculx43.dll"
OutputFile="..\..\bin64\iculx44.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
ProgramDatabaseFile=".\..\..\lib64\iculx.pdb"
@ -363,7 +363,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin64\iculx43d.dll"
OutputFile="..\..\bin64\iculx44d.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
GenerateDebugInformation="true"

8
icu4c/source/stubdata/stubdata.vcproj
View File

@ -79,7 +79,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin\icudt43.dll"
OutputFile="..\..\bin\icudt44.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
GenerateManifest="false"
@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin\icudt43.dll"
OutputFile="..\..\bin\icudt44.dll"
SuppressStartupBanner="true"
GenerateManifest="false"
ProgramDatabaseFile=".\x86\Debug/icudt.pdb"
@ -274,7 +274,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin64\icudt43.dll"
OutputFile="..\..\bin64\icudt44.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
GenerateManifest="false"
@ -374,7 +374,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin64\icudt43.dll"
OutputFile="..\..\bin64\icudt44.dll"
SuppressStartupBanner="true"
GenerateManifest="false"
ProgramDatabaseFile=".\x64\Debug/icudt.pdb"

8
icu4c/source/tools/toolutil/toolutil.vcproj
View File

@ -78,7 +78,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\..\bin\icutu43.dll"
OutputFile="..\..\..\bin\icutu44.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\..\lib"
@ -174,7 +174,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\..\bin\icutu43d.dll"
OutputFile="..\..\..\bin\icutu44d.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\..\lib"
@ -269,7 +269,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\..\bin64\icutu43.dll"
OutputFile="..\..\..\bin64\icutu44.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\..\lib64"
@ -367,7 +367,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\..\bin64\icutu43d.dll"
OutputFile="..\..\..\bin64\icutu44d.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\..\lib64"