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

ICU-9437 genuca permit UCA version != UCD version for boot-strapping

Browse Source 
X-SVN-Rev: 32061
This commit is contained in:
Markus Scherer 2012-07-24 21:10:23 +00:00
parent 540194df06
commit ff29cbdfe4
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/unicode/c/genuca/genuca.cpp
View File

@ -459,7 +459,7 @@ static void writeOutInverseData(InverseUCATableHeader *data,
UDataInfo invUcaInfo;
uprv_memcpy(&invUcaInfo, &invUcaDataInfo, sizeof(UDataInfo));
u_getUnicodeVersion(invUcaInfo.dataVersion);
uprv_memcpy(invUcaInfo.dataVersion, UCAVersion, U_MAX_VERSION_LENGTH);
pData=udata_create(outputDir, INVC_DATA_TYPE, INVC_DATA_NAME, &invUcaInfo,
copyright, status);
@ -704,9 +704,10 @@ UCAElements *readAnElement(FILE *data, tempUCATable *t, UCAConstants *consts, Le
char ucd[U_MAX_VERSION_STRING_LENGTH];
u_versionToString(UCAVersion, uca);
u_versionToString(UCDVersion, ucd);
fprintf(stderr, "error: UCA version %s != UCD version %s (temporarily change the FractionalUCA.txt UCA version during Unicode version upgrade)\n", uca, ucd);
*status = U_INVALID_FORMAT_ERROR;
return NULL;
// Warning, not error, to permit bootstrapping during a version upgrade.
fprintf(stderr, "warning: UCA version %s != UCD version %s (temporarily change the FractionalUCA.txt UCA version during Unicode version upgrade)\n", uca, ucd);
// *status = U_INVALID_FORMAT_ERROR;
// return NULL;
}
} else if (what_to_do == READLEADBYTETOSCRIPTS) { //vt[cnt].what_to_do == READLEADBYTETOSCRIPTS
pointer = buffer + vtLen;
@ -1072,7 +1073,7 @@ void writeOutData(UCATableHeader *data,
long dataLength;
UDataInfo ucaInfo;
uprv_memcpy(&ucaInfo, &ucaDataInfo, sizeof(UDataInfo));
u_getUnicodeVersion(ucaInfo.dataVersion);
uprv_memcpy(ucaInfo.dataVersion, UCAVersion, U_MAX_VERSION_LENGTH);
pData=udata_create(outputDir, UCA_DATA_TYPE, UCA_DATA_NAME, &ucaInfo,
copyright, status);