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

ICU-7435 fix icu-config and installation (user experience)

Browse Source 
X-SVN-Rev: 27720
This commit is contained in:
Steven R. Loomis 2010-02-27 06:38:11 +00:00
parent 5c95e88036
commit ce239c9d1f
4 changed files with 104 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
icu4c/source/config/Makefile.inc.in
View File

@ -1,6 +1,6 @@
## -*-makefile-*-
#******************************************************************************
# Copyright (C) 1999-2008, International Business Machines
# Copyright (C) 1999-2010, International Business Machines
# Corporation and others. All Rights Reserved.
#******************************************************************************
# This Makefile.inc is designed to be included into projects which make use
@ -113,7 +113,8 @@ ICULIBS_LAYOUTEX = -l$(ICUPREFIX)lx$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
ICULIBS_BASE = $(LIBS) -L$(libdir)
# for icu-config to test with
ICULIBS_COMMON_LIB_NAME = ${LIBICU}uc${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}
ICULIBS_COMMON_LIB_NAME = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}
ICULIBS_COMMON_LIB_NAME_A = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}.${A}
# ICULIBS is the set of libraries your application should link
# with usually. Many applications will want to add $(ICULIBS_I18N) as well.

9
icu4c/source/config/icu-config-bottom
View File

@ -3,7 +3,8 @@
## Copyright (c) 2002-2010, International Business Machines Corporation and
## others. All Rights Reserved.
ICUUC_FILE=${libdir}/${ICULIBS_COMMON_LIB_NAME}
ICUUC_FILE="${libdir}/${ICULIBS_COMMON_LIB_NAME}"
ICUUC_FILE_A="${libdir}/${ICULIBS_COMMON_LIB_NAME_A}"
# echo ENABLE RPATH $ENABLE_RPATH and RPATHLDFLAGS=${RPATH_LDFLAGS}
if [ "x$PKGDATA_MODE" = "x" ]; then
@ -93,7 +94,7 @@ usage()
## Check the sanity of current variables
sanity()
{
if [ ! -f ${ICUUC_FILE} ] && [ ${IGNORE_ICUUC_FILE_CHECK} = "no" ] && [ ${SANITY} = "sane" ];
if [ ! -f "${ICUUC_FILE}" -a ! -f "${ICUUC_FILE_A}" ] && [ ${IGNORE_ICUUC_FILE_CHECK} = "no" ] && [ ${SANITY} = "sane" ];
then
echo "### $ME: Can't find ${ICUUC_FILE} - ICU prefix is wrong." 1>&2
echo "### Try the --prefix= option " 1>&2
@ -284,8 +285,8 @@ do
--detect-prefix)
HERE=`echo $0 | sed -e "s/$ME//g"`
if [ -f $HERE/../lib/${ICULIBS_COMMON_LIB_NAME} ]; then
prefix=$HERE/..
if [ -f "${HERE}/../lib/${ICULIBS_COMMON_LIB_NAME}" -o -f "${HERE}/../lib/${ICULIBS_COMMON_LIB_NAME_A}" ]; then
prefix="${HERE}/.."
echo "## Using --prefix=${prefix}" 1>&2
fi
loaddefs

4
icu4c/source/data/Makefile.in
View File

@ -115,6 +115,8 @@ distclean : distclean-local
dist:
check: all
-include Makefile.local
distclean-local: clean
$(RMV) Makefile
@ -163,7 +165,7 @@ endif
packagedata: icupkg.inc $(PKGDATA_LIST) build-local
ifneq ($(ENABLE_STATIC),)
ifeq ($(PKGDATA_MODE),dll)
$(PKGDATA_INVOKE) $(PKGDATA) -e $(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBSTATICNAME) -m static $(PKGDATA_LIST)
$(PKGDATA_INVOKE) $(PKGDATA) -e $(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBSTATICNAME) -m static $(PKGDATA_VERSIONING) $(PKGDATA_LIST)
endif
endif
ifneq ($(ICUDATA_SOURCE_IS_NATIVE_TARGET),YES)

106
icu4c/source/tools/pkgdata/pkgdata.cpp
View File

@ -115,9 +115,9 @@ static int32_t pkg_createWithoutAssemblyCode(UPKGOptions *o, const char *targetD
static int32_t pkg_createWithAssemblyCode(const char *targetDir, const char mode, const char *gencFilePath);
static int32_t pkg_generateLibraryFile(const char *targetDir, const char mode, const char *objectFile, char *command = NULL);
static int32_t pkg_archiveLibrary(const char *targetDir, const char *version, UBool reverseExt);
static void createFileNames(const char mode, const char *version_major, const char *version, const char *libName, const UBool reverseExt);
static void createFileNames(UPKGOptions *o, const char mode, const char *version_major, const char *version, const char *libName, const UBool reverseExt);
static int32_t pkg_getOptionsFromICUConfig(UOption *option);
static int32_t pkg_getOptionsFromICUConfig(UBool verbose, UOption *option);
static int runCommand(const char* command);
enum {
@ -285,7 +285,7 @@ main(int argc, char* argv[]) {
#ifndef WINDOWS_WITH_MSVC
if(!options[BLDOPT].doesOccur && uprv_strcmp(options[MODE].value, "common") != 0) {
if (pkg_getOptionsFromICUConfig(&options[BLDOPT]) != 0) {
if (pkg_getOptionsFromICUConfig(options[VERBOSE].doesOccur, &options[BLDOPT]) != 0) {
fprintf(stderr, " required parameter is missing: -O is required for static and shared builds.\n");
fprintf(stderr, "Run '%s --help' for help.\n", progname);
return 1;
@ -381,6 +381,7 @@ main(int argc, char* argv[]) {
o.verbose = options[VERBOSE].doesOccur;
#ifndef WINDOWS_WITH_MSVC /* on UNIX, we'll just include the file... */
if (options[BLDOPT].doesOccur) {
o.options = options[BLDOPT].value;
@ -502,6 +503,10 @@ static int32_t pkg_executeOptions(UPKGOptions *o) {
uprv_strcat(targetDir, PKGDATA_FILE_SEP_STRING);
uprv_strcat(targetDir, o->shortName);
}
if(o->verbose) {
fprintf(stdout, "# Install: Files mode, copying files to %s..\n", targetDir);
}
result = pkg_installFileMode(targetDir, o->srcDir, o->fileListFiles->str);
}
return result;
@ -519,6 +524,9 @@ static int32_t pkg_executeOptions(UPKGOptions *o) {
uprv_strcat(datFileNamePath, datFileName);
if(o->verbose) {
fprintf(stdout, "# Writing package file %s ..\n", datFileNamePath);
}
result = writePackageDatFile(datFileNamePath, o->comment, o->srcDir, o->fileListFiles->str, NULL, U_CHARSET_FAMILY ? 'e' : U_IS_BIG_ENDIAN ? 'b' : 'l');
if (result != 0) {
fprintf(stderr,"Error writing package dat file.\n");
@ -540,6 +548,10 @@ static int32_t pkg_executeOptions(UPKGOptions *o) {
/* Move the dat file created to the target directory. */
result = rename(datFileNamePath, targetFileNamePath);
if(o->verbose) {
fprintf(stdout, "# Moving package file to %s ..\n", targetFileNamePath);
}
if (result != 0) {
fprintf(stderr, "Unable to move dat file (%s) to target location (%s).\n", datFileNamePath, targetFileNamePath);
}
@ -567,8 +579,19 @@ static int32_t pkg_executeOptions(UPKGOptions *o) {
return -1;
}
if(o->verbose) {
fprintf(stdout, "# pkgDataFlags=");
for(int32_t i=0;i<PKGDATA_FLAGS_SIZE && pkgDataFlags[i][0];i++) {
fprintf(stdout, "%c \"%s\"", (i>0)?',':' ',pkgDataFlags[i]);
}
fprintf(stdout, "\n");
}
#ifndef WINDOWS_WITH_MSVC
/* Read in options file. */
if(o->verbose) {
fprintf(stdout, "# Reading options file %s\n", o->options);
}
parseFlagsFile(o->options, pkgDataFlags, SMALL_BUFFER_MAX_SIZE, (int32_t)PKGDATA_FLAGS_SIZE, &status);
if (U_FAILURE(status)) {
fprintf(stderr,"Unable to open or read \"%s\" option file. status = %s\n", o->options, u_errorName(status));
@ -595,18 +618,29 @@ static int32_t pkg_executeOptions(UPKGOptions *o) {
}
#endif
/* Using the base libName and version number, generate the library file names. */
createFileNames(mode, version_major, o->version, o->libName, reverseExt);
createFileNames(o, mode, version_major, o->version, o->libName, reverseExt);
if (o->version != 0 && o->rebuild == FALSE) {
if ((o->version!=NULL || (mode==MODE_STATIC)) && o->rebuild == FALSE) {
/* Check to see if a previous built data library file exists and check if it is the latest. */
sprintf(checkLibFile, "%s%s", targetDir, libFileNames[LIB_FILE_VERSION]);
if (T_FileStream_file_exists(checkLibFile)) {
if (isFileModTimeLater(checkLibFile, o->srcDir, TRUE) && isFileModTimeLater(checkLibFile, o->options)) {
if (o->install != NULL) {
result = pkg_installLibrary(o->install, targetDir);
if(o->verbose) {
fprintf(stdout, "# Installing already-built library into %s\n", o->install);
}
result = pkg_installLibrary(o->install, targetDir);
} else {
if(o->verbose) {
printf("# Not rebuilding %s - up to date.\n", checkLibFile);
}
}
return result;
} else if (o->verbose && (o->install!=NULL)) {
fprintf(stdout, "# Not installing up-to-date library %s into %s\n", checkLibFile, o->install);
}
} else if(o->verbose && (o->install!=NULL)) {
fprintf(stdout, "# Not installing missing %s into %s\n", checkLibFile, o->install);
}
}
@ -616,8 +650,14 @@ static int32_t pkg_executeOptions(UPKGOptions *o) {
if (pkgDataFlags[GENCCODE_ASSEMBLY_TYPE][0] != 0) {
const char* genccodeAssembly = pkgDataFlags[GENCCODE_ASSEMBLY_TYPE];
if(o->verbose) {
fprintf(stdout, "# Generating assembly code %s of type %s ..\n", gencFilePath, genccodeAssembly);
}
/* Offset genccodeAssembly by 3 because "-a " */
if (checkAssemblyHeaderName(genccodeAssembly+3)) {
if (genccodeAssembly &&
(uprv_strlen(genccodeAssembly)>3) &&
checkAssemblyHeaderName(genccodeAssembly+3)) {
writeAssemblyCode(datFileNamePath, o->tmpDir, o->entryName, NULL, gencFilePath);
result = pkg_createWithAssemblyCode(targetDir, mode, gencFilePath);
@ -625,13 +665,22 @@ static int32_t pkg_executeOptions(UPKGOptions *o) {
fprintf(stderr, "Error generating assembly code for data.\n");
return result;
} else if (mode == MODE_STATIC) {
return result;
if(o->install != NULL) {
if(o->verbose) {
fprintf(stdout, "# Installing static library into %s\n", o->install);
}
result = pkg_installLibrary(o->install, targetDir);
}
return result;
}
} else {
fprintf(stderr,"Assembly type \"%s\" is unknown.\n", genccodeAssembly);
return -1;
}
} else {
if(o->verbose) {
fprintf(stdout, "# Writing object code to %s ..\n", gencFilePath);
}
#ifdef CAN_WRITE_OBJ_CODE
writeObjectCode(datFileNamePath, o->tmpDir, o->entryName, NULL, NULL, gencFilePath);
#ifdef U_LINUX
@ -650,6 +699,9 @@ static int32_t pkg_executeOptions(UPKGOptions *o) {
#ifndef U_WINDOWS
if(mode != MODE_STATIC) {
/* Certain platforms uses archive library. (e.g. AIX) */
if(o->verbose) {
fprintf(stdout, "# Creating data archive library file ..\n");
}
result = pkg_archiveLibrary(targetDir, o->version, reverseExt);
if (result != 0) {
fprintf(stderr, "Error creating data archive library file.\n");
@ -666,6 +718,9 @@ static int32_t pkg_executeOptions(UPKGOptions *o) {
} /* !MODE_STATIC */
/* Install the libraries if option was set. */
if (o->install != NULL) {
if(o->verbose) {
fprintf(stdout, "# Installing library file to %s ..\n", o->install);
}
result = pkg_installLibrary(o->install, targetDir);
if (result != 0) {
fprintf(stderr, "Error installing the data library.\n");
@ -681,10 +736,15 @@ static int32_t pkg_executeOptions(UPKGOptions *o) {
* Given the base libName and version numbers, generate the libary file names and store it in libFileNames.
* Depending on the configuration, the library name may either end with version number or shared object suffix.
*/
static void createFileNames(const char mode, const char *version_major, const char *version, const char *libName, UBool reverseExt) {
static void createFileNames(UPKGOptions *o, const char mode, const char *version_major, const char *version, const char *libName, UBool reverseExt) {
sprintf(libFileNames[LIB_FILE], "%s%s",
pkgDataFlags[LIBPREFIX],
libName);
if(o->verbose) {
fprintf(stdout, "# libFileName[LIB_FILE] = %s\n", libFileNames[LIB_FILE]);
}
if (version != NULL) {
#ifdef U_CYGWIN
sprintf(libFileNames[LIB_FILE_CYGWIN], "cyg%s%s.%s",
@ -718,6 +778,9 @@ static void createFileNames(const char mode, const char *version_major, const ch
reverseExt ? version : pkgDataFlags[SO_EXT],
reverseExt ? pkgDataFlags[SO_EXT] : version);
if(o->verbose) {
fprintf(stdout, "# libFileName[LIB_FILE_VERSION] = %s\n", libFileNames[LIB_FILE_VERSION]);
}
#ifdef U_CYGWIN
/* Cygwin only deals with the version major number. */
@ -727,6 +790,9 @@ static void createFileNames(const char mode, const char *version_major, const ch
if(mode == MODE_STATIC) {
sprintf(libFileNames[LIB_FILE_VERSION], "%s.%s", libFileNames[LIB_FILE], pkgDataFlags[A_EXT]);
libFileNames[LIB_FILE_VERSION_MAJOR][0]=0;
if(o->verbose) {
fprintf(stdout, "# libFileName[LIB_FILE_VERSION] = %s (static)\n", libFileNames[LIB_FILE_VERSION]);
}
}
}
@ -1288,7 +1354,10 @@ static int32_t pkg_createWindowsDLL(const char mode, const char *gencFilePath, U
/* Check if dll file and lib file exists and that it is not newer than genc file. */
if (!o->rebuild && (T_FileStream_file_exists(dllFilePath) && isFileModTimeLater(dllFilePath, gencFilePath)) &&
(T_FileStream_file_exists(libFilePath) && isFileModTimeLater(libFilePath, gencFilePath))) {
return 0;
if(o->verbose) {
printf("# Not rebuilding %s - up to date.\n", gencFilePath);
}
return 0;
}
sprintf(cmd, "%s\"%s\" %s\"%s\" \"%s\" \"%s\"",
@ -1423,7 +1492,7 @@ static void loadLists(UPKGOptions *o, UErrorCode *status)
for(l = o->fileListFiles; l; l = l->next) {
if(o->verbose) {
fprintf(stdout, "# Reading %s..\n", l->str);
fprintf(stdout, "# pkgdata: Reading %s..\n", l->str);
}
/* TODO: stdin */
in = T_FileStream_open(l->str, "r"); /* open files list */
@ -1514,9 +1583,9 @@ static void loadLists(UPKGOptions *o, UErrorCode *status)
}
/* Try calling icu-config directly to get the option file. */
static int32_t pkg_getOptionsFromICUConfig(UOption *option) {
static int32_t pkg_getOptionsFromICUConfig(UBool verbose, UOption *option) {
#if U_HAVE_POPEN
FILE *p;
FILE *p = NULL;
size_t n;
static char buf[512] = "";
char cmdBuf[1024];
@ -1528,10 +1597,17 @@ static int32_t pkg_getOptionsFromICUConfig(UOption *option) {
if(U_SUCCESS(status)) {
uprv_strncat(cmdBuf, U_FILE_SEP_STRING, 1024);
uprv_strncat(cmdBuf, cmd, 1024);
if(verbose) {
fprintf(stdout, "# Calling icu-config: %s\n", cmdBuf);
}
p = popen(cmdBuf, "r");
}
if(p == NULL) {
if(verbose) {
fprintf(stdout, "# Calling icu-config: %s\n", cmd);
}
p = popen(cmd, "r");
}
@ -1570,6 +1646,10 @@ static int32_t pkg_getOptionsFromICUConfig(UOption *option) {
return -1;
}
if(verbose) {
fprintf(stdout, "# icu-config said: %s\n", buf);
}
option->value = buf;
option->doesOccur = TRUE;