ICU-3253 Make it easier for the CygWin/MSVC configuration to work
X-SVN-Rev: 13089
This commit is contained in:
George Rhoten
parent
36251276a3
commit
61a1109990
@ -3,7 +3,7 @@
|
||||
## Copyright (c) 2001-2003, International Business Machines Corporation and
|
||||
## others. All Rights Reserved.
|
||||
##
|
||||
## $Id: mh-cygwin-msvc,v 1.10 2003/08/08 23:53:43 grhoten-oss Exp $
|
||||
## $Id: mh-cygwin-msvc,v 1.11 2003/09/13 08:46:41 grhoten-oss Exp $
|
||||
|
||||
## Commands to generate dependency files
|
||||
GEN_DEPS.c= :
|
||||
@ -16,15 +16,24 @@ SHAREDLIBCPPFLAGS =
|
||||
|
||||
## Additional flags when building libraries and with threads
|
||||
LIBCPPFLAGS =
|
||||
THREADSCPPFLAGS =
|
||||
# /MDd means 'compiles and links a debugable multithreaded program with DLL'
|
||||
#THREADSCFLAGS += /MDd
|
||||
#THREADSCXXFLAGS += /MDd
|
||||
# /MD means 'compiles and links a multithreaded program with DLL'
|
||||
THREADSCFLAGS += /MD
|
||||
THREADSCXXFLAGS += /MD
|
||||
|
||||
# /GF pools strings and places them into read-only memory
|
||||
# TODO: Fix /MD so that multithreading is disabled when requested
|
||||
CFLAGS += /MD /GF
|
||||
CXXFLAGS += /MD /GF
|
||||
CPPFLAGS+=/nologo
|
||||
DEFS+=/D"WIN32"
|
||||
DEFS+=/D"WIN32" /D"U_CYGWIN"
|
||||
LDFLAGS+=/nologo
|
||||
|
||||
# Commands to compile
|
||||
COMPILE.c= $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) /GF /c
|
||||
COMPILE.cc= $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) /GF /c
|
||||
COMPILE.c= $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) /c
|
||||
COMPILE.cc= $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) /c
|
||||
|
||||
# Commands to link
|
||||
LINK.c= LINK.EXE /subsystem:console $(LDFLAGS)
|
||||
@ -52,7 +61,7 @@ OUTOPT = /out:
|
||||
IMPORT_LIB_EXT = .lib
|
||||
|
||||
LIBICU = $(ICUPREFIX)
|
||||
DEFAULT_LIBS =
|
||||
DEFAULT_LIBS = advapi32.lib
|
||||
|
||||
## Link commands to link to ICU libs
|
||||
LIBICUDT= $(top_builddir)/stubdata/$(LIBICU)data$(ICULIBSUFFIX)$(SO_TARGET_VERSION_MAJOR).lib
|
||||
|
||||
@ -380,157 +380,162 @@ int main(int argc, char* argv[])
|
||||
}
|
||||
#endif
|
||||
|
||||
err = U_ZERO_ERROR;
|
||||
for (++argv; --argc; ++argv)
|
||||
err = U_ZERO_ERROR;
|
||||
for (++argv; --argc; ++argv)
|
||||
{
|
||||
arg = getLongPathname(*argv);
|
||||
arg = getLongPathname(*argv);
|
||||
|
||||
/*produces the right destination path for display*/
|
||||
if (destdirlen != 0)
|
||||
/*produces the right destination path for display*/
|
||||
if (destdirlen != 0)
|
||||
{
|
||||
const char *basename;
|
||||
const char *basename;
|
||||
|
||||
/* find the last file sepator */
|
||||
basename = uprv_strrchr(arg, U_FILE_SEP_CHAR);
|
||||
if (basename == NULL) {
|
||||
basename = arg;
|
||||
} else {
|
||||
++basename;
|
||||
}
|
||||
/* find the last file sepator */
|
||||
basename = uprv_strrchr(arg, U_FILE_SEP_CHAR);
|
||||
if (basename == NULL) {
|
||||
basename = uprv_strrchr(arg, U_FILE_ALT_SEP_CHAR);
|
||||
if (basename == NULL) {
|
||||
basename = arg;
|
||||
} else {
|
||||
++basename;
|
||||
}
|
||||
} else {
|
||||
++basename;
|
||||
}
|
||||
|
||||
uprv_strcpy(outBasename, basename);
|
||||
uprv_strcpy(outBasename, basename);
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
uprv_strcpy(outFileName, arg);
|
||||
uprv_strcpy(outFileName, arg);
|
||||
}
|
||||
|
||||
/*removes the extension if any is found*/
|
||||
dot = uprv_strrchr(outBasename, '.');
|
||||
if (dot)
|
||||
/*removes the extension if any is found*/
|
||||
dot = uprv_strrchr(outBasename, '.');
|
||||
if (dot)
|
||||
{
|
||||
*dot = '\0';
|
||||
*dot = '\0';
|
||||
}
|
||||
|
||||
/* the basename without extension is the converter name */
|
||||
uprv_strcpy(cnvName, outBasename);
|
||||
/* the basename without extension is the converter name */
|
||||
uprv_strcpy(cnvName, outBasename);
|
||||
|
||||
if(TOUCHFILE)
|
||||
{
|
||||
uprv_strcpy(touchFileName, outBasename);
|
||||
uprv_strcat(touchFileName, ".cnv");
|
||||
}
|
||||
if(TOUCHFILE)
|
||||
{
|
||||
uprv_strcpy(touchFileName, outBasename);
|
||||
uprv_strcat(touchFileName, ".cnv");
|
||||
}
|
||||
|
||||
if(pkgName != NULL)
|
||||
{
|
||||
/* changes both baename and filename */
|
||||
uprv_strcpy(outBasename, pkgName);
|
||||
uprv_strcat(outBasename, "_");
|
||||
uprv_strcat(outBasename, cnvName);
|
||||
}
|
||||
if(pkgName != NULL)
|
||||
{
|
||||
/* changes both baename and filename */
|
||||
uprv_strcpy(outBasename, pkgName);
|
||||
uprv_strcat(outBasename, "_");
|
||||
uprv_strcat(outBasename, cnvName);
|
||||
}
|
||||
|
||||
|
||||
/*Adds the target extension*/
|
||||
uprv_strcat(outBasename, CONVERTER_FILE_EXTENSION);
|
||||
/*Adds the target extension*/
|
||||
uprv_strcat(outBasename, CONVERTER_FILE_EXTENSION);
|
||||
|
||||
#if DEBUG
|
||||
printf("makeconv: processing %s ...\n", arg);
|
||||
fflush(stdout);
|
||||
#endif
|
||||
localError = U_ZERO_ERROR;
|
||||
mySharedData = createConverterFromTableFile(arg, &localError);
|
||||
localError = U_ZERO_ERROR;
|
||||
mySharedData = createConverterFromTableFile(arg, &localError);
|
||||
|
||||
if (U_FAILURE(localError) || (mySharedData == NULL))
|
||||
if (U_FAILURE(localError) || (mySharedData == NULL))
|
||||
{
|
||||
/* if an error is found, print out an error msg and keep going */
|
||||
fprintf(stderr, "Error creating converter for \"%s\" file for \"%s\" (%s)\n", outFileName, arg,
|
||||
u_errorName(localError));
|
||||
if(U_SUCCESS(err)) {
|
||||
err = localError;
|
||||
}
|
||||
/* if an error is found, print out an error msg and keep going */
|
||||
fprintf(stderr, "Error creating converter for \"%s\" file for \"%s\" (%s)\n", outFileName, arg,
|
||||
u_errorName(localError));
|
||||
if(U_SUCCESS(err)) {
|
||||
err = localError;
|
||||
}
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
/* Make the static data name equal to the file name */
|
||||
if( /*VERBOSE && */ uprv_stricmp(cnvName,mySharedData->staticData->name))
|
||||
{
|
||||
fprintf(stderr, "Warning: %s%s claims to be '%s'\n",
|
||||
/* Make the static data name equal to the file name */
|
||||
if( /*VERBOSE && */ uprv_stricmp(cnvName,mySharedData->staticData->name))
|
||||
{
|
||||
fprintf(stderr, "Warning: %s%s claims to be '%s'\n",
|
||||
cnvName,
|
||||
CONVERTER_FILE_EXTENSION,
|
||||
mySharedData->staticData->name);
|
||||
}
|
||||
}
|
||||
|
||||
uprv_strcpy((char*)mySharedData->staticData->name, cnvName);
|
||||
uprv_strcpy((char*)mySharedData->staticData->name, cnvName);
|
||||
|
||||
if(!uprv_isInvariantString((char*)mySharedData->staticData->name, -1)) {
|
||||
fprintf(stderr,
|
||||
"Error: A converter name must contain only invariant characters.\n"
|
||||
"%s is not a valid converter name.\n",
|
||||
mySharedData->staticData->name);
|
||||
if(U_SUCCESS(err)) {
|
||||
err = U_INVALID_TABLE_FORMAT;
|
||||
}
|
||||
}
|
||||
if(!uprv_isInvariantString((char*)mySharedData->staticData->name, -1)) {
|
||||
fprintf(stderr,
|
||||
"Error: A converter name must contain only invariant characters.\n"
|
||||
"%s is not a valid converter name.\n",
|
||||
mySharedData->staticData->name);
|
||||
if(U_SUCCESS(err)) {
|
||||
err = U_INVALID_TABLE_FORMAT;
|
||||
}
|
||||
}
|
||||
|
||||
if(pkgName == NULL)
|
||||
{
|
||||
uprv_strcpy(cnvNameWithPkg, cnvName);
|
||||
}
|
||||
else
|
||||
{
|
||||
uprv_strcpy(cnvNameWithPkg, pkgName);
|
||||
uprv_strcat(cnvNameWithPkg, "_");
|
||||
uprv_strcat(cnvNameWithPkg, cnvName);
|
||||
}
|
||||
if(pkgName == NULL)
|
||||
{
|
||||
uprv_strcpy(cnvNameWithPkg, cnvName);
|
||||
}
|
||||
else
|
||||
{
|
||||
uprv_strcpy(cnvNameWithPkg, pkgName);
|
||||
uprv_strcat(cnvNameWithPkg, "_");
|
||||
uprv_strcat(cnvNameWithPkg, cnvName);
|
||||
}
|
||||
|
||||
localError = U_ZERO_ERROR;
|
||||
writeConverterData(mySharedData, cnvNameWithPkg, destdir, &localError);
|
||||
((NewConverter *)mySharedData->table)->close((NewConverter *)mySharedData->table);
|
||||
if(TOUCHFILE)
|
||||
{
|
||||
FileStream *q;
|
||||
char msg[1024];
|
||||
localError = U_ZERO_ERROR;
|
||||
writeConverterData(mySharedData, cnvNameWithPkg, destdir, &localError);
|
||||
((NewConverter *)mySharedData->table)->close((NewConverter *)mySharedData->table);
|
||||
if(TOUCHFILE)
|
||||
{
|
||||
FileStream *q;
|
||||
char msg[1024];
|
||||
|
||||
sprintf(msg, "This empty file tells nmake that %s in package %s has been updated.\n",
|
||||
cnvName, pkgName);
|
||||
sprintf(msg, "This empty file tells nmake that %s in package %s has been updated.\n",
|
||||
cnvName, pkgName);
|
||||
|
||||
q = T_FileStream_open(touchFileName, "w");
|
||||
if(q == NULL)
|
||||
{
|
||||
fprintf(stderr, "Error writing touchfile \"%s\"\n", touchFileName);
|
||||
localError = U_FILE_ACCESS_ERROR;
|
||||
}
|
||||
q = T_FileStream_open(touchFileName, "w");
|
||||
if(q == NULL)
|
||||
{
|
||||
fprintf(stderr, "Error writing touchfile \"%s\"\n", touchFileName);
|
||||
localError = U_FILE_ACCESS_ERROR;
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
T_FileStream_write(q, msg, uprv_strlen(msg));
|
||||
T_FileStream_close(q);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
T_FileStream_write(q, msg, uprv_strlen(msg));
|
||||
T_FileStream_close(q);
|
||||
}
|
||||
}
|
||||
|
||||
/* write the information data */
|
||||
uprv_free((UConverterStaticData *)mySharedData->staticData);
|
||||
uprv_free(mySharedData);
|
||||
/* write the information data */
|
||||
uprv_free((UConverterStaticData *)mySharedData->staticData);
|
||||
uprv_free(mySharedData);
|
||||
|
||||
if(U_FAILURE(localError))
|
||||
{
|
||||
/* if an error is found, print out an error msg and keep going*/
|
||||
fprintf(stderr, "Error writing \"%s\" file for \"%s\" (%s)\n", outFileName, arg,
|
||||
if(U_FAILURE(localError))
|
||||
{
|
||||
/* if an error is found, print out an error msg and keep going*/
|
||||
fprintf(stderr, "Error writing \"%s\" file for \"%s\" (%s)\n", outFileName, arg,
|
||||
u_errorName(localError));
|
||||
if(U_SUCCESS(err)) {
|
||||
err = localError;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
puts(outFileName);
|
||||
}
|
||||
if(U_SUCCESS(err)) {
|
||||
err = localError;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
puts(outFileName);
|
||||
}
|
||||
}
|
||||
fflush(stdout);
|
||||
fflush(stderr);
|
||||
fflush(stdout);
|
||||
fflush(stderr);
|
||||
}
|
||||
|
||||
return err;
|
||||
return err;
|
||||
}
|
||||
|
||||
static void
|
||||
|
||||
Loading…
Reference in New Issue
Block a user