1*b1cdbd2cSJim Jagielski--- misc/icu/source/config/mh-bsd-gcc 2009-01-15 16:46:10.000000000 +0900 2*b1cdbd2cSJim Jagielski+++ misc/build/icu/source/config/mh-bsd-gcc 2011-06-14 17:12:14.000000000 +0900 3*b1cdbd2cSJim Jagielski@@ -18,7 +18,15 @@ 4*b1cdbd2cSJim Jagielski 5*b1cdbd2cSJim Jagielski ## Compiler switch to embed a runtime search path 6*b1cdbd2cSJim Jagielski LD_RPATH= 7*b1cdbd2cSJim Jagielski-LD_RPATH_PRE= -Wl,-rpath, 8*b1cdbd2cSJim Jagielski+LD_RPATH_PRE= -Wl,-z,origin -Wl,-rpath, 9*b1cdbd2cSJim Jagielski+ 10*b1cdbd2cSJim Jagielski+## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH 11*b1cdbd2cSJim Jagielski+## (incl. the C++ runtime libs potentially found in the URE lib dir): 12*b1cdbd2cSJim Jagielski+ENABLE_RPATH=YES 13*b1cdbd2cSJim Jagielski+RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN:$$ORIGIN/../ure-link/lib' 14*b1cdbd2cSJim Jagielski+ 15*b1cdbd2cSJim Jagielski+#SH# ENABLE_RPATH=YES 16*b1cdbd2cSJim Jagielski+#SH# RPATHLDFLAGS="${LD_RPATH_PRE}'$$ORIGIN:$$ORIGIN/../ure-link/lib'" 17*b1cdbd2cSJim Jagielski 18*b1cdbd2cSJim Jagielski ## Compiler switch to embed a library name 19*b1cdbd2cSJim Jagielski LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET)) 20*b1cdbd2cSJim Jagielski 21*b1cdbd2cSJim Jagielski--- misc/icu/source/common/putil.c 2008-07-01 03:41:12.000000000 +0200 22*b1cdbd2cSJim Jagielski+++ misc/build/icu/source/common/putil.c 2008-09-02 07:01:29.335795765 +0200 23*b1cdbd2cSJim Jagielski@@ -52,7 +52,7 @@ 24*b1cdbd2cSJim Jagielski Poorly upgraded Solaris machines can't have this defined. 25*b1cdbd2cSJim Jagielski Cleanly installed Solaris can use this #define. 26*b1cdbd2cSJim Jagielski */ 27*b1cdbd2cSJim Jagielski-#if !defined(_XOPEN_SOURCE_EXTENDED) && (!defined(__STDC_VERSION__) || __STDC_VERSION__ >= 199901L) 28*b1cdbd2cSJim Jagielski+#if !defined(_XOPEN_SOURCE_EXTENDED) && (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L) 29*b1cdbd2cSJim Jagielski #define _XOPEN_SOURCE_EXTENDED 1 30*b1cdbd2cSJim Jagielski #endif 31*b1cdbd2cSJim Jagielski 32*b1cdbd2cSJim Jagielski--- misc/icu/source/common/unicode/pwin32.h 2008-07-01 10:41:12.000000000 +0900 33*b1cdbd2cSJim Jagielski+++ misc/build/icu/source/common/unicode/pwin32.h 2008-11-05 22:37:21.479250000 +0900 34*b1cdbd2cSJim Jagielski@@ -32,6 +32,10 @@ 35*b1cdbd2cSJim Jagielski #define __STDC_CONSTANT_MACROS 36*b1cdbd2cSJim Jagielski #endif 37*b1cdbd2cSJim Jagielski 38*b1cdbd2cSJim Jagielski+#if defined(__MINGW32__) 39*b1cdbd2cSJim Jagielski+#define U_HAVE_INTTYPES_H 1 40*b1cdbd2cSJim Jagielski+#endif 41*b1cdbd2cSJim Jagielski+ 42*b1cdbd2cSJim Jagielski /* _MSC_VER is used to detect the Microsoft compiler. */ 43*b1cdbd2cSJim Jagielski #if defined(_MSC_VER) 44*b1cdbd2cSJim Jagielski #define U_INT64_IS_LONG_LONG 0 45*b1cdbd2cSJim Jagielski--- misc/icu/source/config/mh-darwin Tue Jul 1 03:41:24 2008 46*b1cdbd2cSJim Jagielski+++ misc/build/icu/source/config/mh-darwin Tue Jan 20 18:33:16 2009 47*b1cdbd2cSJim Jagielski@@ -25,7 +25,7 @@ 48*b1cdbd2cSJim Jagielski SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) 49*b1cdbd2cSJim Jagielski 50*b1cdbd2cSJim Jagielski ## Compiler switches to embed a library name and version information 51*b1cdbd2cSJim Jagielski-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) 52*b1cdbd2cSJim Jagielski+LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name @executable_path/$(notdir $(FINAL_SO_TARGET)) 53*b1cdbd2cSJim Jagielski 54*b1cdbd2cSJim Jagielski ## Compiler switch to embed a runtime search path 55*b1cdbd2cSJim Jagielski LD_RPATH= 56*b1cdbd2cSJim Jagielski@@ -41,10 +41,6 @@ 57*b1cdbd2cSJim Jagielski ## Non-shared intermediate object suffix 58*b1cdbd2cSJim Jagielski STATIC_O = ao 59*b1cdbd2cSJim Jagielski 60*b1cdbd2cSJim Jagielski-## Override Versioned target for a shared library. 61*b1cdbd2cSJim Jagielski-FINAL_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION).$(SO) 62*b1cdbd2cSJim Jagielski-MIDDLE_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION_MAJOR).$(SO) 63*b1cdbd2cSJim Jagielski- 64*b1cdbd2cSJim Jagielski ## Compilation rules 65*b1cdbd2cSJim Jagielski %.$(STATIC_O): $(srcdir)/%.c 66*b1cdbd2cSJim Jagielski $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< 67*b1cdbd2cSJim Jagielski@@ -76,15 +72,9 @@ 68*b1cdbd2cSJim Jagielski 69*b1cdbd2cSJim Jagielski ## Versioned libraries rules 70*b1cdbd2cSJim Jagielski 71*b1cdbd2cSJim Jagielski-%.$(SO_TARGET_VERSION_MAJOR).$(SO): %.$(SO_TARGET_VERSION).$(SO) 72*b1cdbd2cSJim Jagielski+%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION) 73*b1cdbd2cSJim Jagielski $(RM) $@ && ln -s ${<F} $@ 74*b1cdbd2cSJim Jagielski-%.$(SO): %.$(SO_TARGET_VERSION_MAJOR).$(SO) 75*b1cdbd2cSJim Jagielski- $(RM) $@ && ln -s ${*F}.$(SO_TARGET_VERSION).$(SO) $@ 76*b1cdbd2cSJim Jagielski- 77*b1cdbd2cSJim Jagielski-# tzcode option 78*b1cdbd2cSJim Jagielski-TZORIG_EXTRA_CFLAGS=-DSTD_INSPIRED 79*b1cdbd2cSJim Jagielski- 80*b1cdbd2cSJim Jagielski-# genren opts 81*b1cdbd2cSJim Jagielski-GENREN_PL_OPTS=-x Mach-O -n '-g' -p '| c++filt' 82*b1cdbd2cSJim Jagielski+%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR) 83*b1cdbd2cSJim Jagielski+ $(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@ 84*b1cdbd2cSJim Jagielski 85*b1cdbd2cSJim Jagielski ## End Darwin-specific setup 86*b1cdbd2cSJim Jagielski--- misc/icu/source/config/mh-linux 2007-12-12 19:57:36.000000000 +0100 87*b1cdbd2cSJim Jagielski+++ misc/build/icu/source/config/mh-linux 2008-05-21 18:59:13.000000000 +0200 88*b1cdbd2cSJim Jagielski@@ -20,6 +20,14 @@ 89*b1cdbd2cSJim Jagielski LD_RPATH= 90*b1cdbd2cSJim Jagielski LD_RPATH_PRE = -Wl,-rpath, 91*b1cdbd2cSJim Jagielski 92*b1cdbd2cSJim Jagielski+## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH 93*b1cdbd2cSJim Jagielski+## (incl. the C++ runtime libs potentially found in the URE lib dir): 94*b1cdbd2cSJim Jagielski+ENABLE_RPATH=YES 95*b1cdbd2cSJim Jagielski+RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN:$$ORIGIN/../ure-link/lib' 96*b1cdbd2cSJim Jagielski+ 97*b1cdbd2cSJim Jagielski+#SH# ENABLE_RPATH=YES 98*b1cdbd2cSJim Jagielski+#SH# RPATHLDFLAGS="${LD_RPATH_PRE}'$$ORIGIN:$$ORIGIN/../ure-link/lib'" 99*b1cdbd2cSJim Jagielski+ 100*b1cdbd2cSJim Jagielski ## These are the library specific LDFLAGS 101*b1cdbd2cSJim Jagielski LDFLAGSICUDT=-nodefaultlibs -nostdlib 102*b1cdbd2cSJim Jagielski 103*b1cdbd2cSJim Jagielski--- misc/icu/source/config/mh-mingw 2008-07-01 10:41:24.000000000 +0900 104*b1cdbd2cSJim Jagielski+++ misc/build/icu/source/config/mh-mingw 2008-11-06 00:18:30.261250000 +0900 105*b1cdbd2cSJim Jagielski@@ -72,10 +72,12 @@ 106*b1cdbd2cSJim Jagielski # The #M# is used to delete lines for icu-config 107*b1cdbd2cSJim Jagielski # Current full path directory. 108*b1cdbd2cSJim Jagielski #CURR_FULL_DIR=$(shell pwd -W)#M# for MSYS 109*b1cdbd2cSJim Jagielski-CURR_FULL_DIR=$(subst \,/,$(shell cmd /c cd | tail --bytes=+3))#M# for Cygwin shell 110*b1cdbd2cSJim Jagielski+CURR_FULL_DIR=$(subst \,/,$(shell cmd /c cd))#M# for Cygwin shell 111*b1cdbd2cSJim Jagielski # Current full path directory for use in source code in a -D compiler option. 112*b1cdbd2cSJim Jagielski #CURR_SRCCODE_FULL_DIR=$(subst /,\\\\,$(shell pwd -W))#M# for MSYS 113*b1cdbd2cSJim Jagielski-CURR_SRCCODE_FULL_DIR=$(subst \,/,$(shell cmd /c cd | tail --bytes=+3))#M# for Cygwin shell 114*b1cdbd2cSJim Jagielski+CURR_SRCCODE_FULL_DIR=$(subst \,/,$(shell cmd /c cd))#M# for Cygwin shell 115*b1cdbd2cSJim Jagielski+SRCDIR_DEPEND=$(shell cd $(SRCDIR) && pwd) 116*b1cdbd2cSJim Jagielski+DATAFILEPATHS_DEPEND=$(foreach p,$(DATAFILEPATHS),$(shell cd $(dir $(p)) && pwd)/$(notdir $(p))) 117*b1cdbd2cSJim Jagielski 118*b1cdbd2cSJim Jagielski ## Compilation rules 119*b1cdbd2cSJim Jagielski %.$(STATIC_O): $(srcdir)/%.c 120*b1cdbd2cSJim Jagielski--- misc/icu/source/config/mh-solaris 2008-07-01 03:41:26.000000000 +0200 121*b1cdbd2cSJim Jagielski+++ misc/build/icu/source/config/mh-solaris 2009-02-17 11:54:45.105890123 +0100 122*b1cdbd2cSJim Jagielski@@ -18,17 +18,24 @@ 123*b1cdbd2cSJim Jagielski 124*b1cdbd2cSJim Jagielski ## Commands to link 125*b1cdbd2cSJim Jagielski ## For Sun Workshop, use CC to link to bring in C++ runtime 126*b1cdbd2cSJim Jagielski-LINK.c= $(CXX) $(CXXFLAGS) $(LDFLAGS) 127*b1cdbd2cSJim Jagielski-LINK.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) 128*b1cdbd2cSJim Jagielski+LINK.c= $(CXX) $(CXXFLAGS) $(LDFLAGS) -norunpath 129*b1cdbd2cSJim Jagielski+LINK.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -norunpath 130*b1cdbd2cSJim Jagielski 131*b1cdbd2cSJim Jagielski ## Commands to make a shared library 132*b1cdbd2cSJim Jagielski SHLIB.c= $(CC) $(CFLAGS) $(LDFLAGS) -G 133*b1cdbd2cSJim Jagielski-SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -G 134*b1cdbd2cSJim Jagielski+SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -G -norunpath 135*b1cdbd2cSJim Jagielski 136*b1cdbd2cSJim Jagielski ## Compiler switch to embed a runtime search path 137*b1cdbd2cSJim Jagielski LD_RPATH= -R 138*b1cdbd2cSJim Jagielski LD_RPATH_PRE= 139*b1cdbd2cSJim Jagielski 140*b1cdbd2cSJim Jagielski+## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH 141*b1cdbd2cSJim Jagielski+ENABLE_RPATH=YES 142*b1cdbd2cSJim Jagielski+RPATHLDFLAGS=${LD_RPATH}'$$ORIGIN' 143*b1cdbd2cSJim Jagielski+ 144*b1cdbd2cSJim Jagielski+#SH# ENABLE_RPATH=YES 145*b1cdbd2cSJim Jagielski+#SH# RPATHLDFLAGS="${LD_RPATH}'$$ORIGIN'" 146*b1cdbd2cSJim Jagielski+ 147*b1cdbd2cSJim Jagielski #LIBRARY_PATH_PREFIX=/usr/lib/lwp: 148*b1cdbd2cSJim Jagielski 149*b1cdbd2cSJim Jagielski ## Compiler switch to embed a library name 150*b1cdbd2cSJim Jagielski--- misc/icu/source/layout/ArabicShaping.cpp 2008-07-01 03:42:04.000000000 +0200 151*b1cdbd2cSJim Jagielski+++ misc/build/icu/source/layout/ArabicShaping.cpp 2009-02-17 12:04:34.264869737 +0100 152*b1cdbd2cSJim Jagielski@@ -79,7 +79,6 @@ 153*b1cdbd2cSJim Jagielski #define markFeatureMask 0x00040000UL 154*b1cdbd2cSJim Jagielski #define mkmkFeatureMask 0x00020000UL 155*b1cdbd2cSJim Jagielski 156*b1cdbd2cSJim Jagielski-#define NO_FEATURES 0 157*b1cdbd2cSJim Jagielski #define ISOL_FEATURES (isolFeatureMask | ligaFeatureMask | msetFeatureMask | markFeatureMask | ccmpFeatureMask | rligFeatureMask | caltFeatureMask | dligFeatureMask | cswhFeatureMask | cursFeatureMask | kernFeatureMask | mkmkFeatureMask) 158*b1cdbd2cSJim Jagielski 159*b1cdbd2cSJim Jagielski #define SHAPE_MASK 0xF0000000UL 160*b1cdbd2cSJim Jagielski@@ -174,11 +173,7 @@ 161*b1cdbd2cSJim Jagielski LEUnicode c = chars[in]; 162*b1cdbd2cSJim Jagielski ShapeType t = getShapeType(c); 163*b1cdbd2cSJim Jagielski 164*b1cdbd2cSJim Jagielski- if (t == ST_NOSHAPE_NONE) { 165*b1cdbd2cSJim Jagielski- glyphStorage.setAuxData(out, NO_FEATURES, success); 166*b1cdbd2cSJim Jagielski- } else { 167*b1cdbd2cSJim Jagielski- glyphStorage.setAuxData(out, ISOL_FEATURES, success); 168*b1cdbd2cSJim Jagielski- } 169*b1cdbd2cSJim Jagielski+ glyphStorage.setAuxData(out, ISOL_FEATURES, success); 170*b1cdbd2cSJim Jagielski 171*b1cdbd2cSJim Jagielski if ((t & MASK_TRANSPARENT) != 0) { 172*b1cdbd2cSJim Jagielski continue; 173*b1cdbd2cSJim Jagielski--- misc/icu/source/layoutex/ParagraphLayout.cpp 2008-07-01 03:42:02.000000000 +0200 174*b1cdbd2cSJim Jagielski+++ misc/build/icu/source/layoutex/ParagraphLayout.cpp 2008-12-01 19:32:58.000000000 +0100 175*b1cdbd2cSJim Jagielski@@ -868,7 +868,7 @@ 176*b1cdbd2cSJim Jagielski 177*b1cdbd2cSJim Jagielski return nullLanguageCode; 178*b1cdbd2cSJim Jagielski } 179*b1cdbd2cSJim Jagielski-#elif 180*b1cdbd2cSJim Jagielski+#else 181*b1cdbd2cSJim Jagielski 182*b1cdbd2cSJim Jagielski // TODO - dummy implementation for right now... 183*b1cdbd2cSJim Jagielski le_int32 ParagraphLayout::getLanguageCode(const Locale *locale) 184*b1cdbd2cSJim Jagielski--- misc/icu/source/tools/pkgdata/cmnmode.c 2008-07-01 10:41:20.000000000 +0900 185*b1cdbd2cSJim Jagielski+++ misc/build/icu/source/tools/pkgdata/cmnmode.c 2008-11-07 00:03:32.393500000 +0900 186*b1cdbd2cSJim Jagielski@@ -69,7 +69,11 @@ 187*b1cdbd2cSJim Jagielski sprintf(tmp, "# List file for gencmn:\n" 188*b1cdbd2cSJim Jagielski "CMNLIST=%s%s%s_common.lst\n\n", 189*b1cdbd2cSJim Jagielski o->tmpDir, 190*b1cdbd2cSJim Jagielski+#ifdef __MINGW32__ 191*b1cdbd2cSJim Jagielski+ U_FILE_ALT_SEP_STRING, 192*b1cdbd2cSJim Jagielski+#else 193*b1cdbd2cSJim Jagielski U_FILE_SEP_STRING, 194*b1cdbd2cSJim Jagielski+#endif 195*b1cdbd2cSJim Jagielski o->shortName); 196*b1cdbd2cSJim Jagielski T_FileStream_writeLine(makefile, tmp); 197*b1cdbd2cSJim Jagielski 198*b1cdbd2cSJim Jagielski--- misc/icu/source/tools/pkgdata/dllmode.c 2008-07-01 10:41:20.000000000 +0900 199*b1cdbd2cSJim Jagielski+++ misc/build/icu/source/tools/pkgdata/dllmode.c 2008-11-07 06:08:36.016750000 +0900 200*b1cdbd2cSJim Jagielski@@ -139,7 +139,11 @@ 201*b1cdbd2cSJim Jagielski sprintf(tmp, "# List file for gencmn:\n" 202*b1cdbd2cSJim Jagielski "CMNLIST=%s%s$(NAME)_dll.lst\n\n", 203*b1cdbd2cSJim Jagielski o->tmpDir, 204*b1cdbd2cSJim Jagielski+#ifdef __MINGW32__ 205*b1cdbd2cSJim Jagielski+ U_FILE_ALT_SEP_STRING); 206*b1cdbd2cSJim Jagielski+#else 207*b1cdbd2cSJim Jagielski U_FILE_SEP_STRING); 208*b1cdbd2cSJim Jagielski+#endif 209*b1cdbd2cSJim Jagielski T_FileStream_writeLine(makefile, tmp); 210*b1cdbd2cSJim Jagielski 211*b1cdbd2cSJim Jagielski if(o->hadStdin == FALSE) { /* shortcut */ 212*b1cdbd2cSJim Jagielski--- misc/icu/source/tools/pkgdata/make.c 2008-07-01 10:41:20.000000000 +0900 213*b1cdbd2cSJim Jagielski+++ misc/build/icu/source/tools/pkgdata/make.c 2008-11-06 23:23:04.096625000 +0900 214*b1cdbd2cSJim Jagielski@@ -313,8 +313,13 @@ 215*b1cdbd2cSJim Jagielski uprv_strcpy(cfile+uprv_strlen(cfile)-uprv_strlen(objSuffix), ".c" ); /* replace .o with .c */ 216*b1cdbd2cSJim Jagielski 217*b1cdbd2cSJim Jagielski /* Make up parents.. */ 218*b1cdbd2cSJim Jagielski+#ifdef __MINGW32__ 219*b1cdbd2cSJim Jagielski+ parentPath = uprv_malloc(1+uprv_strlen(baseName) + uprv_strlen("$(SRCDIR_DEPEND)/")); 220*b1cdbd2cSJim Jagielski+ sprintf(parentPath, "$(SRCDIR_DEPEND)/%s", baseName); 221*b1cdbd2cSJim Jagielski+#else 222*b1cdbd2cSJim Jagielski parentPath = uprv_malloc(1+uprv_strlen(baseName) + uprv_strlen("$(SRCDIR)/")); 223*b1cdbd2cSJim Jagielski sprintf(parentPath, "$(SRCDIR)/%s", baseName); 224*b1cdbd2cSJim Jagielski+#endif 225*b1cdbd2cSJim Jagielski parents = pkg_appendToList(parents, NULL, parentPath); 226*b1cdbd2cSJim Jagielski 227*b1cdbd2cSJim Jagielski /* make up commands.. */ 228*b1cdbd2cSJim Jagielski@@ -379,7 +384,11 @@ 229*b1cdbd2cSJim Jagielski T_FileStream_writeLine(f, "\n"); 230*b1cdbd2cSJim Jagielski T_FileStream_writeLine(f, "BASE_OBJECTS=$(NAME)_dat.o\n"); 231*b1cdbd2cSJim Jagielski T_FileStream_writeLine(f, "\n"); 232*b1cdbd2cSJim Jagielski+#ifdef __MINGW32__ 233*b1cdbd2cSJim Jagielski+ T_FileStream_writeLine(f, "$(TEMP_DIR)/$(NAME).dat: $(CMNLIST) $(DATAFILEPATHS_DEPEND)\n"); 234*b1cdbd2cSJim Jagielski+#else 235*b1cdbd2cSJim Jagielski T_FileStream_writeLine(f, "$(TEMP_DIR)/$(NAME).dat: $(CMNLIST) $(DATAFILEPATHS)\n"); 236*b1cdbd2cSJim Jagielski+#endif 237*b1cdbd2cSJim Jagielski T_FileStream_writeLine(f, "\t$(INVOKE) $(ICUPKG) -t$(ICUDATA_CHAR) -c -s $(SRCDIR) -a $(CMNLIST) new $(TEMP_DIR)/$(CNAME).dat\n"); 238*b1cdbd2cSJim Jagielski T_FileStream_writeLine(f, "\n"); 239*b1cdbd2cSJim Jagielski T_FileStream_writeLine(f, "$(TEMP_DIR)/$(NAME)_dat.o : $(TEMP_DIR)/$(NAME).dat\n"); 240*b1cdbd2cSJim Jagielski--- misc/icu/source/tools/pkgdata/pkgdata.c 2008-07-01 10:41:20.000000000 +0900 241*b1cdbd2cSJim Jagielski+++ misc/build/icu/source/tools/pkgdata/pkgdata.c 2008-11-07 05:59:27.110500000 +0900 242*b1cdbd2cSJim Jagielski@@ -594,7 +594,11 @@ 243*b1cdbd2cSJim Jagielski exit(U_ILLEGAL_ARGUMENT_ERROR); 244*b1cdbd2cSJim Jagielski } 245*b1cdbd2cSJim Jagielski uprv_strcpy(tmp, o->srcDir); 246*b1cdbd2cSJim Jagielski+#ifdef __MINGW32__ 247*b1cdbd2cSJim Jagielski+ uprv_strcat(tmp, o->srcDir[uprv_strlen(o->srcDir)-1]==U_FILE_SEP_CHAR?"":U_FILE_ALT_SEP_STRING); 248*b1cdbd2cSJim Jagielski+#else 249*b1cdbd2cSJim Jagielski uprv_strcat(tmp, o->srcDir[uprv_strlen(o->srcDir)-1]==U_FILE_SEP_CHAR?"":U_FILE_SEP_STRING); 250*b1cdbd2cSJim Jagielski+#endif 251*b1cdbd2cSJim Jagielski uprv_strcat(tmp, s); 252*b1cdbd2cSJim Jagielski o->filePaths = pkg_appendToList(o->filePaths, &tail2, uprv_strdup(tmp)); 253*b1cdbd2cSJim Jagielski linePtr = lineNext; 254*b1cdbd2cSJim Jagielski--- misc/icu/source/tools/pkgdata/sttcmode.c 2008-07-01 10:41:20.000000000 +0900 255*b1cdbd2cSJim Jagielski+++ misc/build/icu/source/tools/pkgdata/sttcmode.c 2008-11-07 00:30:05.690375000 +0900 256*b1cdbd2cSJim Jagielski@@ -172,7 +172,11 @@ 257*b1cdbd2cSJim Jagielski sprintf(tmp, "# List file for gencmn:\n" 258*b1cdbd2cSJim Jagielski "CMNLIST=%s%s$(NAME)_static.lst\n\n", 259*b1cdbd2cSJim Jagielski o->tmpDir, 260*b1cdbd2cSJim Jagielski+#ifdef __MINGW32__ 261*b1cdbd2cSJim Jagielski+ U_FILE_ALT_SEP_STRING); 262*b1cdbd2cSJim Jagielski+#else 263*b1cdbd2cSJim Jagielski U_FILE_SEP_STRING); 264*b1cdbd2cSJim Jagielski+#endif 265*b1cdbd2cSJim Jagielski T_FileStream_writeLine(makefile, tmp); 266*b1cdbd2cSJim Jagielski 267*b1cdbd2cSJim Jagielski if(o->hadStdin == FALSE) { /* shortcut */ 268*b1cdbd2cSJim Jagielski--- misc/icu/source/common/uloc.c 2009-01-15 08:45:56.000000000 +0100 269*b1cdbd2cSJim Jagielski+++ misc/build/icu/source/common/uloc.c 2009-12-14 10:51:38.000000000 +0100 270*b1cdbd2cSJim Jagielski@@ -1736,7 +1736,7 @@ 271*b1cdbd2cSJim Jagielski int32_t variantLen = _deleteVariant(variant, uprv_min(variantSize, (nameCapacity-len)), variantToCompare, n); 272*b1cdbd2cSJim Jagielski len -= variantLen; 273*b1cdbd2cSJim Jagielski if (variantLen > 0) { 274*b1cdbd2cSJim Jagielski- if (name[len-1] == '_') { /* delete trailing '_' */ 275*b1cdbd2cSJim Jagielski+ if (len > 0 && name[len-1] == '_') { /* delete trailing '_' */ 276*b1cdbd2cSJim Jagielski --len; 277*b1cdbd2cSJim Jagielski } 278*b1cdbd2cSJim Jagielski addKeyword = VARIANT_MAP[j].keyword; 279*b1cdbd2cSJim Jagielski@@ -1744,7 +1744,7 @@ 280*b1cdbd2cSJim Jagielski break; 281*b1cdbd2cSJim Jagielski } 282*b1cdbd2cSJim Jagielski } 283*b1cdbd2cSJim Jagielski- if (name[len-1] == '_') { /* delete trailing '_' */ 284*b1cdbd2cSJim Jagielski+ if (len > 0 && name[len-1] == '_') { /* delete trailing '_' */ 285*b1cdbd2cSJim Jagielski --len; 286*b1cdbd2cSJim Jagielski } 287*b1cdbd2cSJim Jagielski } 288*b1cdbd2cSJim Jagielski--- misc/icu/source/tools/genuca/genuca.cpp 2009-01-15 08:46:02.000000000 +0100 289*b1cdbd2cSJim Jagielski+++ misc/build/icu/source/tools/genuca/genuca.cpp 2013-01-30 07:45:01.000000000 +0100 290*b1cdbd2cSJim Jagielski@@ -395,7 +395,7 @@ 291*b1cdbd2cSJim Jagielski copyright, status); 292*b1cdbd2cSJim Jagielski 293*b1cdbd2cSJim Jagielski if(U_FAILURE(*status)) { 294*b1cdbd2cSJim Jagielski- fprintf(stderr, "Error: unable to create %s"INVC_DATA_NAME", error %s\n", outputDir, u_errorName(*status)); 295*b1cdbd2cSJim Jagielski+ fprintf(stderr, "Error: unable to create %s" INVC_DATA_NAME ", error %s\n", outputDir, u_errorName(*status)); 296*b1cdbd2cSJim Jagielski return; 297*b1cdbd2cSJim Jagielski } 298*b1cdbd2cSJim Jagielski 299*b1cdbd2cSJim Jagielski@@ -757,7 +757,7 @@ 300*b1cdbd2cSJim Jagielski copyright, status); 301*b1cdbd2cSJim Jagielski 302*b1cdbd2cSJim Jagielski if(U_FAILURE(*status)) { 303*b1cdbd2cSJim Jagielski- fprintf(stderr, "Error: unable to create %s"UCA_DATA_NAME", error %s\n", outputDir, u_errorName(*status)); 304*b1cdbd2cSJim Jagielski+ fprintf(stderr, "Error: unable to create %s" UCA_DATA_NAME ", error %s\n", outputDir, u_errorName(*status)); 305*b1cdbd2cSJim Jagielski return; 306*b1cdbd2cSJim Jagielski } 307*b1cdbd2cSJim Jagielski 308*b1cdbd2cSJim Jagielski@@ -904,9 +904,9 @@ 309*b1cdbd2cSJim Jagielski {0x20000, 0x2A6D6, UCOL_SPECIAL_FLAG | (CJK_IMPLICIT_TAG << 24) }, //6 CJK_IMPLICIT_TAG, /* 0x20000-0x2A6D6*/ 310*b1cdbd2cSJim Jagielski {0x2F800, 0x2FA1D, UCOL_SPECIAL_FLAG | (CJK_IMPLICIT_TAG << 24) }, //7 CJK_IMPLICIT_TAG, /* 0x2F800-0x2FA1D*/ 311*b1cdbd2cSJim Jagielski #endif 312*b1cdbd2cSJim Jagielski- {0xAC00, 0xD7B0, UCOL_SPECIAL_FLAG | (HANGUL_SYLLABLE_TAG << 24) }, //0 HANGUL_SYLLABLE_TAG,/* AC00-D7AF*/ 313*b1cdbd2cSJim Jagielski+ {0xAC00, 0xD7B0, static_cast<int32_t>(UCOL_SPECIAL_FLAG | (HANGUL_SYLLABLE_TAG << 24)) }, //0 HANGUL_SYLLABLE_TAG,/* AC00-D7AF*/ 314*b1cdbd2cSJim Jagielski //{0xD800, 0xDC00, UCOL_SPECIAL_FLAG | (LEAD_SURROGATE_TAG << 24) }, //1 LEAD_SURROGATE_TAG, /* D800-DBFF*/ 315*b1cdbd2cSJim Jagielski- {0xDC00, 0xE000, UCOL_SPECIAL_FLAG | (TRAIL_SURROGATE_TAG << 24) }, //2 TRAIL_SURROGATE DC00-DFFF 316*b1cdbd2cSJim Jagielski+ {0xDC00, 0xE000, static_cast<int32_t>(UCOL_SPECIAL_FLAG | (TRAIL_SURROGATE_TAG << 24)) }, //2 TRAIL_SURROGATE DC00-DFFF 317*b1cdbd2cSJim Jagielski // Now directly handled in the collation code by the swapCJK function. 318*b1cdbd2cSJim Jagielski //{0x3400, 0x4DB6, UCOL_SPECIAL_FLAG | (CJK_IMPLICIT_TAG << 24) }, //3 CJK_IMPLICIT_TAG, /* 0x3400-0x4DB5*/ 319*b1cdbd2cSJim Jagielski //{0x4E00, 0x9FA6, UCOL_SPECIAL_FLAG | (CJK_IMPLICIT_TAG << 24) }, //4 CJK_IMPLICIT_TAG, /* 0x4E00-0x9FA5*/ 320