ICU-6866 merge r25946 and r25942
X-SVN-Rev: 25947
diff --git a/icu4c.css b/icu4c.css
index c6caae5..aacacb8 100644
--- a/icu4c.css
+++ b/icu4c.css
@@ -292,6 +292,19 @@
padding: 3px;
}
+table.rtable tr.broken td {
+ background-color: #fbb;
+ border: 1px dashed gray;
+ padding: 3px;
+ font-weight: bold;
+}
+
+table.rtable tr.rarely td {
+ background-color: #efe9c2;
+ padding: 3px;
+ font-style: italic;
+}
+
/* APIChangeReport specific things */
.row0 {
diff --git a/readme.html b/readme.html
index 8b4b0ea..8b3c089 100644
--- a/readme.html
+++ b/readme.html
@@ -525,155 +525,185 @@
<h3><a name="HowToBuildSupported" href="#HowToBuildSupported" id=
"HowToBuildSupported">Supported Platforms</a></h3>
- <table class="docTable" summary=
+ <table class="rtable" summary=
"ICU can be built on many platforms.">
<caption>
- Here is a status of functionality of ICU on several different platforms.
+ Here is the status of building ICU on several different platforms.
</caption>
- <tr>
- <th scope="col">Operating system</th>
+
+ <tr>
+ <td>AIX 6.1 (power, 64-bit)</td>
+ <td>VisualAge 9</td>
+ <td class="works">Frequently Tested</td>
- <th scope="col">Compiler</th>
+ </tr>
+
+ <tr>
+ <td>HP/UX 11iv3 (ia64, 64-bit)</td>
+ <td>aCC A.06.15</td>
+ <td class="works">Frequently Tested</td>
- <th scope="col">Testing frequency</th>
- </tr>
+ </tr>
+
+ <tr>
+ <td>Red Hat Enterprise Linux 5 (x86, 32-bit)</td>
+ <td>gcc 4.1.2</td>
+ <td class="works">Frequently Tested</td>
- <tr>
- <td>Windows Vista SP1 (32 bit)</td>
+ </tr>
+
+ <tr>
+ <td>Red Hat Enterprise Linux 5 (x86, 64-bit)</td>
+ <td>gcc 4.1.2</td>
+ <td class="works">Frequently Tested</td>
- <td>Microsoft Visual C++ 2005 (8.0)</td>
+ </tr>
+
+ <tr>
+ <td>Solaris 10 (sparc, 64-bit)</td>
+ <td>Sun Studio 12</td>
+ <td class="works">Frequently Tested</td>
- <td>Reference platform</td>
- </tr>
- <tr>
- <td>Windows Server 2003 (64 bit)</td>
+ </tr>
+
+ <tr>
+ <td>Windows Vista SP1 (x86, 32-bit)</td>
+ <td>MS Visual Studio 9</td>
+ <td class="works">Frequently Tested</td>
- <td>Microsoft Visual C++ 2005 (8.0)</td>
+ </tr>
+
+ <tr>
+ <td>AIX 5.2 (power, 64-bit)</td>
+ <td>VisualAge 6</td>
+ <td class="works">Frequently Tested</td>
- <td>Reference platform</td>
- </tr>
+ </tr>
+
+ <tr>
+ <td>AIX 5.3 (power, 64-bit)</td>
+ <td>VisualAge 8</td>
+ <td class="works">Frequently Tested</td>
- <tr>
- <td>Red Hat Enterprise Linux 5 (x86, 32 bit)</td>
+ </tr>
+
+ <tr>
+ <td>AIX 6.1 (power, 64-bit)</td>
+ <td>gcc 4.2.4</td>
+ <td class="works">Frequently Tested</td>
- <td>gcc 4.1.2</td>
+ </tr>
+
+ <tr>
+ <td>HP/UX 11i (hppa, 64-bit)</td>
+ <td>aCC A.03.85</td>
+ <td class="works">Frequently Tested</td>
- <td>Reference platform</td>
- </tr>
+ </tr>
+
+ <tr>
+ <td>MacOSX 10.5 Leopard (x86, 32-bit)</td>
+ <td>gcc 4.0.1</td>
+ <td class="works">Frequently Tested</td>
- <tr>
- <td>AIX 6.1 (Power, 64-bit)</td>
+ </tr>
+
+ <tr>
+ <td>MacOSX 10.5 Leopard (x86, 64-bit)</td>
+ <td>gcc 4.0.1</td>
+ <td class="works">Frequently Tested</td>
- <td>IBM VisualAge 9</td>
+ </tr>
+
+ <tr>
+ <td>Red Hat Enterprise Linux 4.2 (x86, 32-bit)</td>
+ <td>gcc 3.4.6</td>
+ <td class="works">Frequently Tested</td>
- <td>Reference platform</td>
- </tr>
+ </tr>
+
+ <tr>
+ <td>Red Hat Enterprise Linux 4u7 (x86, 32-bit)</td>
+ <td>gcc 4.2.4</td>
+ <td class="works">Frequently Tested</td>
- <tr>
- <td>Solaris 10 (Sparc, 32-bit, SunOS 5.10)</td>
+ </tr>
+
+ <tr>
+ <td>Solaris 10 (sparc, 64-bit)</td>
+ <td>gcc 4.2.1</td>
+ <td class="works">Frequently Tested</td>
- <td>Sun Studio 12 <!--(Sun C++ 5.8)--></td>
+ </tr>
+
+ <tr>
+ <td>SuSE 10 (x86, 64-bit)</td>
+ <td>gcc</td>
+ <td class="works">Frequently Tested</td>
- <td>Reference platform</td>
- </tr>
+ </tr>
+
+ <tr>
+ <td>Windows 2000 Professional (x86, 32-bit)</td>
+ <td>MS Visual Studio 2003 via Cygwin</td>
+ <td class="works">Frequently Tested</td>
- <tr>
- <td>HP-UX IIiv3 (Itanium, 64-bit)</td>
+ </tr>
+
+ <tr>
+ <td>Windows 2000 Professional (x86, 32-bit)</td>
+ <td>gcc via Cygwin</td>
+ <td class="works">Frequently Tested</td>
- <td>aCC A.6.14</td>
+ </tr>
+
+ <tr>
+ <td>Windows Server 2003 (x86, 64-bit)</td>
+ <td>MS Visual Studio 8 via Cygwin</td>
+ <td class="works">Frequently Tested</td>
- <td>Reference platform</td>
- </tr>
- <tr>
- <td>AIX 5.3</td>
+ </tr>
+
+ <tr>
+ <td>Windows Server 2008 (x86, 64-bit)</td>
+ <td>MS Visual Studio 9</td>
+ <td class="works">Frequently Tested</td>
- <td>IBM XL C/C++ 8.0</td>
+ </tr>
+
+ <tr>
+ <td>Windows XP Professional (x86, 32-bit)</td>
+ <td>MS Visual Studio 9</td>
+ <td class="works">Frequently Tested</td>
- <td>Regularly tested</td>
- </tr>
- <tr>
- <td>Windows XP</td>
+ </tr>
+
+ <tr class="broken">
+ <td>Red Hat Enterprise Linux 5 (x86, 32-bit)</td>
+ <td>icc 11.0</td>
+ <td class="broken">Broken <b><a href="http://bugs.icu-project.org/trac/ticket/6894">#6894</a></b></td>
+
+ </tr>
+
+ <tr class="broken">
+ <td>SuSe Linux 7.2 (x86, 32-bit)</td>
+ <td>icc 9.0</td>
+ <td class="broken">Broken <b><a href="http://bugs.icu-project.org/trac/ticket/6888">#6888</a></b></td>
- <td>Microsoft Visual C++ 2005 (8.0)</td>
+ </tr>
+
+ <tr class="broken">
+ <td>Windows Server 2008 (x86, 64-bit)</td>
+ <td>MS Visual Studio 9 via Cygwin</td>
+ <td class="broken">Broken <b><a href="http://bugs.icu-project.org/trac/ticket/6890">#6890</a></b></td>
- <td>Regularly tested</td>
- </tr>
+ </tr>
+
- <tr>
- <td>Red Hat Enterprise Linux 4 Update 4</td>
+<!-- end IBM lab data -->
- <td>gcc 3.4.4</td>
-
- <td>Regularly tested</td>
- </tr>
-
- <tr>
- <td>AIX 5.2</td>
-
- <td>Visual Age C++ 6.0</td>
-
- <td>Regularly tested</td>
- </tr>
-
- <tr>
- <td>Solaris 9 (SunOS 5.9)</td>
-
- <td>Sun Studio 8 (Sun C++ 5.5)</td>
-
- <td>Regularly tested</td>
- </tr>
-
- <tr>
- <td>HP-UX 11.11 (PA-RISC)</td>
-
- <td>aCC A.03.50<br />
- cc B.11.11.08</td>
-
- <td>Regularly tested</td>
- </tr>
-
- <tr>
- <td>Windows 2000 with Cygwin</td>
-
- <td>Microsoft Visual C++ 2003 (7.1)</td>
-
- <td>Regularly tested</td>
- </tr>
-
- <tr>
- <td>Windows Server 2008 x64</td>
-
- <td>Microsoft Visual C++ 2005 (8.0)</td>
-
- <td>Regularly tested</td>
- </tr>
-
- <tr>
- <td>Mac OS X (10.4)</td>
-
- <td>gcc 4.0.1</td>
-
- <td>Regularly tested</td>
- </tr>
-
- <tr>
- <td>Solaris 10</td>
-
- <td>gcc 4.0.3</td>
-
- <td>Regularly tested</td>
- </tr>
-
- <tr>
- <td>SUSE Linux Enterprise Server 9 SP1</td>
-
- <td>Intel C++ Compiler 9.0</td>
-
- <td>Regularly tested</td>
- </tr>
-
- <tr>
+ <tr class="rarely">
<td>z/OS 1.7</td>
<td>cxx 1.7</td>
@@ -681,7 +711,7 @@
<td>Rarely tested</td>
</tr>
- <tr>
+ <tr class="rarely">
<td>Cygwin</td>
<td>gcc 3.4.4</td>
@@ -689,7 +719,7 @@
<td>Rarely tested</td>
</tr>
- <tr>
+ <tr class="rarely">
<td>IBM i family (IBM i, i5/OS, OS/400)</td>
<td>iCC</td>
@@ -697,15 +727,8 @@
<td>Rarely tested</td>
</tr>
- <tr>
- <td>Windows Vista x64</td>
- <td>Microsoft Visual C++ 2005 (8.0)</td>
-
- <td>Rarely tested</td>
- </tr>
-
- <tr>
+ <tr class="rarely">
<td>MinGW</td>
<td>gcc</td>
@@ -713,7 +736,7 @@
<td>Rarely tested</td>
</tr>
- <tr>
+ <tr class="rarely">
<td>NetBSD, OpenBSD, FreeBSD</td>
<td>gcc</td>
@@ -721,7 +744,7 @@
<td>Rarely tested</td>
</tr>
- <tr>
+ <tr class="rarely">
<td>SUSE Linux Enterprise Server 9 (PowerPC)</td>
<td>IBM XL C/C++ 8.0</td>
@@ -729,7 +752,7 @@
<td>Rarely tested</td>
</tr>
- <tr>
+ <tr class="rarely">
<td>QNX</td>
<td>gcc</td>
@@ -737,15 +760,15 @@
<td>Rarely tested</td>
</tr>
- <tr>
- <td>BeOS</td>
+ <tr class="rarely">
+ <td>BeOS/Haiku</td>
<td>gcc</td>
<td>Rarely tested</td>
</tr>
- <tr>
+ <tr class="rarely">
<td>SGI/IRIX</td>
<td>MIPSpro CC</td>
@@ -753,7 +776,7 @@
<td>Rarely tested</td>
</tr>
- <tr>
+ <tr class="rarely">
<td>Tru64 (OSF)</td>
<td>Compaq's cxx compiler</td>
@@ -761,7 +784,7 @@
<td>Rarely tested</td>
</tr>
- <tr>
+ <tr class="rarely">
<td>MP-RAS</td>
<td>NCR MP-RAS C/C++ Compiler</td>
diff --git a/source/data/build.xml b/source/data/build.xml
index f5349a4..bbbe47d 100644
--- a/source/data/build.xml
+++ b/source/data/build.xml
@@ -213,6 +213,7 @@
<alias from="iw_IL" to="he_IL" />
<alias from="no" to="nb" />
<alias from="no_NO" to="nb_NO" />
+ <alias from="pa_IN" to="pa_Guru_IN" />
<alias from="sh" to="sr_Latn" />
<alias from="sh_BA" to="sr_Latn_BA" />
<alias from="sh_CS" to="sr_Latn_RS" />
diff --git a/source/data/coll/colfiles.mk b/source/data/coll/colfiles.mk
index f794fe7..2547c2b 100644
--- a/source/data/coll/colfiles.mk
+++ b/source/data/coll/colfiles.mk
@@ -28,10 +28,10 @@
# Aliases which do not have a corresponding xx.xml file (see icu-config.xml & build.xml)
COLLATION_SYNTHETIC_ALIAS = de_.txt de__PHONEBOOK.txt es_.txt es__TRADITIONAL.txt\
hi_.txt hi__DIRECT.txt in.txt in_ID.txt iw.txt\
- iw_IL.txt no.txt no_NO.txt sh.txt sh_BA.txt\
- sh_YU.txt sr_BA.txt sr_ME.txt sr_RS.txt zh_.txt\
- zh_CN.txt zh_HK.txt zh_MO.txt zh_SG.txt zh_TW.txt\
- zh_TW_STROKE.txt zh__PINYIN.txt
+ iw_IL.txt no.txt no_NO.txt pa_IN.txt sh.txt\
+ sh_BA.txt sh_YU.txt sr_BA.txt sr_ME.txt sr_RS.txt\
+ zh_.txt zh_CN.txt zh_HK.txt zh_MO.txt zh_SG.txt\
+ zh_TW.txt zh_TW_STROKE.txt zh__PINYIN.txt
# All aliases (to not be included under 'installed'), but not including root.
@@ -62,14 +62,13 @@
ms.txt ms_BN.txt ms_MY.txt mt_MT.txt nb_NO.txt\
nl.txt nl_BE.txt nl_NL.txt nn_NO.txt om_ET.txt\
om_KE.txt pa_Arab.txt pa_Arab_PK.txt pa_Guru.txt pa_Guru_IN.txt\
- pa_IN.txt pl_PL.txt ps_AF.txt pt.txt pt_BR.txt\
- pt_PT.txt ro_RO.txt ru_RU.txt ru_UA.txt si_LK.txt\
- sk_SK.txt sl_SI.txt sq_AL.txt sr_Cyrl.txt sr_Cyrl_BA.txt\
- sr_Cyrl_ME.txt sr_Cyrl_RS.txt sr_Latn_BA.txt sr_Latn_ME.txt sr_Latn_RS.txt\
- sv_FI.txt sv_SE.txt ta_IN.txt te_IN.txt th_TH.txt\
- tr_TR.txt uk_UA.txt ur_IN.txt ur_PK.txt vi_VN.txt\
- zh_Hans.txt zh_Hans_CN.txt zh_Hans_SG.txt zh_Hant_HK.txt zh_Hant_MO.txt\
- zh_Hant_TW.txt
+ pl_PL.txt ps_AF.txt pt.txt pt_BR.txt pt_PT.txt\
+ ro_RO.txt ru_RU.txt ru_UA.txt si_LK.txt sk_SK.txt\
+ sl_SI.txt sq_AL.txt sr_Cyrl.txt sr_Cyrl_BA.txt sr_Cyrl_ME.txt\
+ sr_Cyrl_RS.txt sr_Latn_BA.txt sr_Latn_ME.txt sr_Latn_RS.txt sv_FI.txt\
+ sv_SE.txt ta_IN.txt te_IN.txt th_TH.txt tr_TR.txt\
+ uk_UA.txt ur_IN.txt ur_PK.txt vi_VN.txt zh_Hans.txt\
+ zh_Hans_CN.txt zh_Hans_SG.txt zh_Hant_HK.txt zh_Hant_MO.txt zh_Hant_TW.txt
# Ordinary resources
diff --git a/source/data/coll/pa.txt b/source/data/coll/pa.txt
index 6e0f4e9..67d998f 100644
--- a/source/data/coll/pa.txt
+++ b/source/data/coll/pa.txt
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/collation/pa.xml
*/
pa{
- Version{"1.28"}
+ Version{"1.29"}
collations{
standard{
Sequence{" [normalization on ]"}
diff --git a/source/data/coll/pa_IN.txt b/source/data/coll/pa_IN.txt
index 1a2c7a0..942837c 100644
--- a/source/data/coll/pa_IN.txt
+++ b/source/data/coll/pa_IN.txt
@@ -6,12 +6,6 @@
// * Source File:<path>/icu-config.xml & build.xml
// *
// ***************************************************************************
-/**
- * validSubLocale of "pa"
- */
pa_IN{
- /**
- * so genrb doesn't issue warnings
- */
- ___{""}
+ "%%ALIAS"{"pa_Guru_IN"}
}
