Skip to content

Commit

Permalink
ICU-21405 BRS 68.2 Version update and regenerate configure for v68.2
Browse files Browse the repository at this point in the history
  • Loading branch information
erik0686 authored and sffc committed Dec 9, 2020
1 parent 18ec692 commit 0768b26
Show file tree
Hide file tree
Showing 13 changed files with 32 additions and 32 deletions.
6 changes: 3 additions & 3 deletions icu4c/readme.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<html lang="en-US" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
<head>
<title>ReadMe for ICU 68.1</title>
<title>ReadMe for ICU 68.2</title>
<meta name="COPYRIGHT" content=
"Copyright (C) 2016 and later: Unicode, Inc. and others. License &amp; terms of use: http://www.unicode.org/copyright.html"/>
<!-- meta name="COPYRIGHT" content=
Expand Down Expand Up @@ -33,7 +33,7 @@ <h1>
<span class="only-rc">Release Candidate</span>
<!-- <span class="only-milestone">(Milestone Release)</span> -->
<span class="only-milestone">(Preview Release)</span>
<abbr title="International Components for Unicode">ICU</abbr> 68.1 ReadMe
<abbr title="International Components for Unicode">ICU</abbr> 68.2 ReadMe
</h1>

<!-- Most of the time we shouldn't need to comment/uncomment this paragraph, just change the body class -->
Expand All @@ -47,7 +47,7 @@ <h1>
<p class="note only-rc">This is a release candidate version of ICU4C.
It is not recommended for production use.</p>

<p>Last updated: 2020-Oct-01<br/>
<p>Last updated: 2020-Dec-02<br/>
Copyright &copy; 2016 and later: Unicode, Inc. and others. License &amp; terms of use:
<a href="http://www.unicode.org/copyright.html">http://www.unicode.org/copyright.html</a><br/>
Copyright &copy; 1997-2016 International Business Machines Corporation and others.
Expand Down
6 changes: 3 additions & 3 deletions icu4c/source/common/unicode/uvernum.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
* This value will change in the subsequent releases of ICU
* @stable ICU 2.6
*/
#define U_ICU_VERSION_MINOR_NUM 1
#define U_ICU_VERSION_MINOR_NUM 2

/** The current ICU patchlevel version as an integer.
* This value will change in the subsequent releases of ICU
Expand Down Expand Up @@ -139,7 +139,7 @@
* This value will change in the subsequent releases of ICU
* @stable ICU 2.4
*/
#define U_ICU_VERSION "68.1"
#define U_ICU_VERSION "68.2"

/**
* The current ICU library major version number as a string, for library name suffixes.
Expand All @@ -158,7 +158,7 @@
/** Data version in ICU4C.
* @internal ICU 4.4 Internal Use Only
**/
#define U_ICU_DATA_VERSION "68.1"
#define U_ICU_DATA_VERSION "68.2"
#endif /* U_HIDE_INTERNAL_API */

/*===========================================================================
Expand Down
18 changes: 9 additions & 9 deletions icu4c/source/configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for ICU 68.1.
# Generated by GNU Autoconf 2.69 for ICU 68.2.
#
# Report bugs to <http://icu-project.org/bugs>.
#
Expand Down Expand Up @@ -582,8 +582,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='ICU'
PACKAGE_TARNAME='International Components for Unicode'
PACKAGE_VERSION='68.1'
PACKAGE_STRING='ICU 68.1'
PACKAGE_VERSION='68.2'
PACKAGE_STRING='ICU 68.2'
PACKAGE_BUGREPORT='http://icu-project.org/bugs'
PACKAGE_URL='http://icu-project.org'

Expand Down Expand Up @@ -1364,7 +1364,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures ICU 68.1 to adapt to many kinds of systems.
\`configure' configures ICU 68.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1430,7 +1430,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of ICU 68.1:";;
short | recursive ) echo "Configuration of ICU 68.2:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1568,7 +1568,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
ICU configure 68.1
ICU configure 68.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2314,7 +2314,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by ICU $as_me 68.1, which was
It was created by ICU $as_me 68.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -8544,7 +8544,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by ICU $as_me 68.1, which was
This file was extended by ICU $as_me 68.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -8598,7 +8598,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
ICU config.status 68.1
ICU config.status 68.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down
4 changes: 2 additions & 2 deletions icu4c/source/data/misc/icuver.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
// ***************************************************************************
icuver:table(nofallback){
CLDRVersion{"38"}
DataVersion{"68.1.0.0"}
ICUVersion{"68.1.0.0"}
DataVersion{"68.2.0.0"}
ICUVersion{"68.2.0.0"}
}
6 changes: 3 additions & 3 deletions icu4j/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#*******************************************************************************
api.report.version = 68
api.report.prev.version = 67
release.file.ver = 68_1
api.doc.version = 68.1
maven.pom.ver = 68.1
release.file.ver = 68_2
api.doc.version = 68.2
maven.pom.ver = 68.2

2 changes: 1 addition & 1 deletion icu4j/eclipse-build/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
#* Copyright (C) 2010-2016, International Business Machines Corporation and *
#* others. All Rights Reserved. *
#*******************************************************************************
icu4j.plugin.impl.version.string=68.1.0
icu4j.plugin.impl.version.string=68.2.0
copyright.eclipse=(C) 2016 and later: Unicode, Inc. and others. License & terms of use: http://www.unicode.org/copyright.html
icu4j.data.version.number=68
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ public int compareTo(VersionInfo other)
UNICODE_12_1 = getInstance(12, 1, 0, 0);
UNICODE_13_0 = getInstance(13, 0, 0, 0);

ICU_VERSION = getInstance(68, 1, 0, 0);
ICU_VERSION = getInstance(68, 2, 0, 0);
ICU_DATA_VERSION = ICU_VERSION;
UNICODE_VERSION = UNICODE_13_0;

Expand Down
2 changes: 1 addition & 1 deletion icu4j/main/shared/build/common.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

# Version numbers, etc.
icu4j.spec.version = 68
icu4j.impl.version = 68.1
icu4j.impl.version = 68.2
icu4j.data.version = 68
default.exec.env = JavaSE-1.7

Expand Down
4 changes: 2 additions & 2 deletions icu4j/main/shared/data/icudata.jar
Git LFS file not shown
4 changes: 2 additions & 2 deletions icu4j/main/shared/data/icutzdata.jar
Git LFS file not shown
4 changes: 2 additions & 2 deletions icu4j/main/shared/data/testdata.jar
Git LFS file not shown
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
package com.ibm.icu.dev.test.util;

public class DebugUtilitiesData extends Object {
public static final String ICU4C_VERSION="68.1";
public static final String ICU4C_VERSION="68.2";
public static final int UDebugEnumType = 0;
public static final int UCalendarDateFields = 1;
public static final int UCalendarMonths = 2;
Expand Down
4 changes: 2 additions & 2 deletions tools/cldr/cldr-to-icu/build-icu-data.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@
<property name="specialsDir" value="${basedir}/../../../icu4c/source/data/xml"/>

<!-- Default value for ICU version (icuver.txt). Update this for each release. -->
<property name="icuVersion" value="68.1.0.0"/>
<property name="icuVersion" value="68.2.0.0"/>

<!-- Default value for ICU data version (icuver.txt). Update this for each release. -->
<property name="icuDataVersion" value="68.1.0.0"/>
<property name="icuDataVersion" value="68.2.0.0"/>

<!-- An override for the CLDR version string (icuver.txt and others). This will be
extracted from the CLDR library used for building the data if not set here. -->
Expand Down

0 comments on commit 0768b26

Please sign in to comment.