CWS-TOOLING: integrate CWS mingwport16

2009-01-15 13:11:20 +0100 releng  r266363 : tidy-up tabs
2008-11-28 15:33:23 +0100 tono  r264557 : i95203: mingw build without stlport
2008-11-22 07:19:50 +0100 tono  r264180 : i96436: make mingw bridge conform with reg-struct-return
2008-11-22 05:14:58 +0100 tono  r264179 : i96436: make mingw bridge conform with reg-struct-return
2008-11-21 17:09:04 +0100 tono  r264153 : i95203: mingw build without stlport
2008-11-21 16:59:55 +0100 tono  r264152 : i96436: make mingw bridge conform with reg-struct-return
2008-11-21 16:59:18 +0100 tono  r264151 : i96436: make mingw bridge conform with reg-struct-return
2008-11-21 16:57:01 +0100 tono  r264150 : i96436: make mingw bridge conform with reg-struct-return
2008-11-21 16:53:19 +0100 tono  r264149 : i96100: mingw port for icu 4.0
2008-11-13 13:41:13 +0100 tono  r263643 : i95203: mingw: Build without stlport
2008-11-13 13:29:38 +0100 tono  r263640 : i96100: MinGW port for icu 4.0
2008-11-13 13:17:10 +0100 tono  r263634 : i96098: MinGW port fix for new Windows API
2008-11-09 15:22:59 +0100 tono  r263497 : i95198: mingwport do not interfere with Cygwin
2008-11-09 14:44:54 +0100 tono  r263496 : i95190: mingwport avoid use of MS assembler
2008-11-09 14:32:26 +0100 tono  r263495 : i95190: mingwport trivial build fixes

2 files changed, 114 insertions, 13 deletions

diff --git a/icu/icu-4.0.patch b/icu/icu-4.0.patch
index 5608b73829d6..30f2c8a8b525 100644
--- a/icu/icu-4.0.patch
+++ b/icu/icu-4.0.patch
@@ -10,7 +10,7 @@
  #endif
  
 --- misc/icu/source/config/mh-darwin	Tue Jul  1 03:41:24 2008
-+++ misc/build/icu/source/config/mh-darwin	Fri Oct 31 09:13:56 2008
++++ misc/build/icu/source/config/mh-darwin	Tue Jan 20 18:33:16 2009
 @@ -25,7 +25,7 @@
  SHLIB.cc=	$(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS)
  
@@ -40,15 +40,15 @@
  	$(RM) $@ && ln -s ${<F} $@
 -%.$(SO): %.$(SO_TARGET_VERSION_MAJOR).$(SO)
 -	$(RM) $@ && ln -s ${*F}.$(SO_TARGET_VERSION).$(SO) $@
-+%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
-+	$(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
- 
+-
 -# tzcode option
 -TZORIG_EXTRA_CFLAGS=-DSTD_INSPIRED
 -
 -# genren opts
 -GENREN_PL_OPTS=-x Mach-O -n '-g' -p '| c++filt'
--
++%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
++	$(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
+ 
  ## End Darwin-specific setup
 --- misc/icu/source/config/mh-linux	2007-12-12 19:57:36.000000000 +0100
 +++ misc/build/icu/source/config/mh-linux	2008-05-21 18:59:13.000000000 +0200
@@ -67,9 +67,26 @@
  ## These are the library specific LDFLAGS
  LDFLAGSICUDT=-nodefaultlibs -nostdlib
  
---- misc/icu/source/config/mh-solaris	2007-12-12 19:57:36.000000000 +0100
-+++ misc/build/icu/source/config/mh-solaris	2008-05-21 19:02:45.000000000 +0200
-@@ -18,17 +18,24 @@
+--- misc/icu/source/config/mh-mingw	2008-07-01 10:41:24.000000000 +0900
++++ misc/build/icu/source/config/mh-mingw	2008-11-06 00:18:30.261250000 +0900
+@@ -72,10 +72,12 @@
+ # The #M# is used to delete lines for icu-config
+ # Current full path directory.
+ #CURR_FULL_DIR=$(shell pwd -W)#M# for MSYS
+-CURR_FULL_DIR=$(subst \,/,$(shell cmd /c cd | tail --bytes=+3))#M# for Cygwin shell
++CURR_FULL_DIR=$(subst \,/,$(shell cmd /c cd))#M# for Cygwin shell
+ # Current full path directory for use in source code in a -D compiler option.
+ #CURR_SRCCODE_FULL_DIR=$(subst /,\\\\,$(shell pwd -W))#M# for MSYS
+-CURR_SRCCODE_FULL_DIR=$(subst \,/,$(shell cmd /c cd | tail --bytes=+3))#M# for Cygwin shell
++CURR_SRCCODE_FULL_DIR=$(subst \,/,$(shell cmd /c cd))#M# for Cygwin shell
++SRCDIR_DEPEND=$(shell cd $(SRCDIR) && pwd)
++DATAFILEPATHS_DEPEND=$(foreach p,$(DATAFILEPATHS),$(shell cd $(dir $(p)) && pwd)/$(notdir $(p)))
+ 
+ ## Compilation rules
+ %.$(STATIC_O): $(srcdir)/%.c
+--- misc/icu/source/config/mh-solaris	Tue Jul  1 03:41:26 2008
++++ misc/build/icu/source/config/mh-solaris	Tue Jan 20 18:33:16 2009
+@@ -18,16 +18,23 @@
  
  ## Commands to link
  ## For Sun Workshop, use CC to link to bring in C++ runtime
@@ -86,17 +103,16 @@
  ## Compiler switch to embed a runtime search path
  LD_RPATH=	-R
  LD_RPATH_PRE=	
- 
++
 +## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH
 +ENABLE_RPATH=YES
 +RPATHLDFLAGS=${LD_RPATH}'$$ORIGIN'
 +
 +#SH#  ENABLE_RPATH=YES
 +#SH#  RPATHLDFLAGS="${LD_RPATH}'$$ORIGIN'"
-+
+ 
  #LIBRARY_PATH_PREFIX=/usr/lib/lwp:
  
- ## Compiler switch to embed a library name
 --- misc/icu/source/layoutex/ParagraphLayout.cpp	2008-07-01 03:42:02.000000000 +0200
 +++ misc/build/icu/source/layoutex/ParagraphLayout.cpp	2008-12-01 19:32:58.000000000 +0100
 @@ -868,7 +868,7 @@
@@ -108,3 +124,87 @@
  
  // TODO - dummy implementation for right now...
  le_int32 ParagraphLayout::getLanguageCode(const Locale *locale)
+--- misc/icu/source/tools/pkgdata/cmnmode.c	2008-07-01 10:41:20.000000000 +0900
++++ misc/build/icu/source/tools/pkgdata/cmnmode.c	2008-11-07 00:03:32.393500000 +0900
+@@ -69,7 +69,11 @@
+   sprintf(tmp, "# List file for gencmn:\n"
+           "CMNLIST=%s%s%s_common.lst\n\n",
+           o->tmpDir,
++#ifdef __MINGW32__
++          U_FILE_ALT_SEP_STRING,
++#else
+           U_FILE_SEP_STRING,
++#endif
+           o->shortName);
+   T_FileStream_writeLine(makefile, tmp);
+ 
+--- misc/icu/source/tools/pkgdata/dllmode.c	2008-07-01 10:41:20.000000000 +0900
++++ misc/build/icu/source/tools/pkgdata/dllmode.c	2008-11-07 06:08:36.016750000 +0900
+@@ -139,7 +139,11 @@
+     sprintf(tmp, "# List file for gencmn:\n"
+                  "CMNLIST=%s%s$(NAME)_dll.lst\n\n",
+                  o->tmpDir,
++#ifdef __MINGW32__
++                 U_FILE_ALT_SEP_STRING);
++#else
+                  U_FILE_SEP_STRING);
++#endif
+     T_FileStream_writeLine(makefile, tmp);
+     
+     if(o->hadStdin == FALSE) { /* shortcut */
+--- misc/icu/source/tools/pkgdata/make.c	2008-07-01 10:41:20.000000000 +0900
++++ misc/build/icu/source/tools/pkgdata/make.c	2008-11-06 23:23:04.096625000 +0900
+@@ -313,8 +313,13 @@
+       uprv_strcpy(cfile+uprv_strlen(cfile)-uprv_strlen(objSuffix), ".c" ); /* replace .o with .c */
+       
+       /* Make up parents.. */
++#ifdef __MINGW32__
++      parentPath = uprv_malloc(1+uprv_strlen(baseName) + uprv_strlen("$(SRCDIR_DEPEND)/"));
++      sprintf(parentPath, "$(SRCDIR_DEPEND)/%s", baseName);
++#else
+       parentPath = uprv_malloc(1+uprv_strlen(baseName) + uprv_strlen("$(SRCDIR)/"));
+       sprintf(parentPath, "$(SRCDIR)/%s", baseName);
++#endif
+       parents = pkg_appendToList(parents, NULL, parentPath);
+       
+       /* make up commands.. */
+@@ -379,7 +384,11 @@
+     T_FileStream_writeLine(f, "\n");
+     T_FileStream_writeLine(f, "BASE_OBJECTS=$(NAME)_dat.o\n");
+     T_FileStream_writeLine(f, "\n");
++#ifdef __MINGW32__
++    T_FileStream_writeLine(f, "$(TEMP_DIR)/$(NAME).dat: $(CMNLIST) $(DATAFILEPATHS_DEPEND)\n");
++#else
+     T_FileStream_writeLine(f, "$(TEMP_DIR)/$(NAME).dat: $(CMNLIST) $(DATAFILEPATHS)\n");
++#endif
+     T_FileStream_writeLine(f, "\t$(INVOKE) $(ICUPKG) -t$(ICUDATA_CHAR) -c -s $(SRCDIR) -a $(CMNLIST) new $(TEMP_DIR)/$(CNAME).dat\n");
+     T_FileStream_writeLine(f, "\n");
+     T_FileStream_writeLine(f, "$(TEMP_DIR)/$(NAME)_dat.o : $(TEMP_DIR)/$(NAME).dat\n");
+--- misc/icu/source/tools/pkgdata/pkgdata.c	2008-07-01 10:41:20.000000000 +0900
++++ misc/build/icu/source/tools/pkgdata/pkgdata.c	2008-11-07 05:59:27.110500000 +0900
+@@ -594,7 +594,11 @@
+                     exit(U_ILLEGAL_ARGUMENT_ERROR);
+                 }		
+                 uprv_strcpy(tmp, o->srcDir);
++#ifdef __MINGW32__
++                uprv_strcat(tmp, o->srcDir[uprv_strlen(o->srcDir)-1]==U_FILE_SEP_CHAR?"":U_FILE_ALT_SEP_STRING);
++#else
+                 uprv_strcat(tmp, o->srcDir[uprv_strlen(o->srcDir)-1]==U_FILE_SEP_CHAR?"":U_FILE_SEP_STRING);
++#endif
+                 uprv_strcat(tmp, s);
+                 o->filePaths = pkg_appendToList(o->filePaths, &tail2, uprv_strdup(tmp));
+                 linePtr = lineNext;
+--- misc/icu/source/tools/pkgdata/sttcmode.c	2008-07-01 10:41:20.000000000 +0900
++++ misc/build/icu/source/tools/pkgdata/sttcmode.c	2008-11-07 00:30:05.690375000 +0900
+@@ -172,7 +172,11 @@
+     sprintf(tmp, "# List file for gencmn:\n"
+         "CMNLIST=%s%s$(NAME)_static.lst\n\n",
+         o->tmpDir,
++#ifdef __MINGW32__
++        U_FILE_ALT_SEP_STRING);
++#else
+         U_FILE_SEP_STRING);
++#endif
+     T_FileStream_writeLine(makefile, tmp);
+ 
+     if(o->hadStdin == FALSE) { /* shortcut */
diff --git a/icu/makefile.mk b/icu/makefile.mk
index 5a1a1d258f63..b042ede5a29e 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -144,10 +144,11 @@ OUT2BIN= \
 .IF "$(GUI)"=="WNT"
 CONFIGURE_DIR=source
 .IF "$(COM)"=="GCC"
+CONFIGURE_ACTION=rm data/mappings/ucm*.mk data/translit/trn*.mk ;
 .IF "$(USE_MINGW)"=="cygwin"
-CONFIGURE_ACTION=+sh -c 'CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" LDFLAGS="-L$(COMPATH)/lib/mingw -L$(COMPATH)/lib/w32api -L$(COMPATH)$/lib" LIBS="-lmingwthrd" ./configure --build=i586-pc-mingw32 --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no'
+CONFIGURE_ACTION+=sh -c 'CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" LDFLAGS="-L$(COMPATH)/lib/mingw -L$(COMPATH)/lib/w32api -L$(COMPATH)$/lib" LIBS="-lmingwthrd" ./configure --build=i586-pc-mingw32 --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no'
 .ELSE
-CONFIGURE_ACTION=+sh -c 'CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" LDFLAGS="-L$(COMPATH)$/lib" LIBS="-lmingwthrd" ./configure --build=i586-pc-mingw32 --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no'
+CONFIGURE_ACTION+=sh -c 'CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" LDFLAGS="-L$(COMPATH)$/lib" LIBS="-lmingwthrd" ./configure --build=i586-pc-mingw32 --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no'
 .ENDIF
 
 #CONFIGURE_FLAGS=--enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no