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

10 files changed, 70 insertions, 20 deletions

diff --git a/embedserv/source/inc/stdafx.h b/embedserv/source/inc/stdafx.h
index 4772b2998bc5..d20cb068be8f 100755
--- a/embedserv/source/inc/stdafx.h
+++ b/embedserv/source/inc/stdafx.h
@@ -22,6 +22,11 @@
 //You may derive a class from CComModule and use it if you want to override
 //something, but do not change the name of _Module
 extern CComModule _Module;
+#ifdef __MINGW32__
+#include <algorithm>
+using ::std::min;
+using ::std::max;
+#endif
 #include <atlcom.h>
 #include <atlctl.h>
 
diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx
index b58ae021f3ce..9d63b4a37aff 100644
--- a/forms/source/xforms/datatypes.cxx
+++ b/forms/source/xforms/datatypes.cxx
@@ -217,7 +217,7 @@ namespace xforms
         static void lcl_initializePatternMatcher( ::std::auto_ptr< RegexMatcher >& _rpMatcher, const ::rtl::OUString& _rPattern )
         {
             UErrorCode nMatchStatus = U_ZERO_ERROR;
-            UnicodeString aIcuPattern( _rPattern.getStr(), _rPattern.getLength() );
+            UnicodeString aIcuPattern( reinterpret_cast<const UChar *>(_rPattern.getStr()), _rPattern.getLength() );    // UChar != sal_Unicode in MinGW
             _rpMatcher.reset( new RegexMatcher( aIcuPattern, 0, nMatchStatus ) );
             OSL_ENSURE( U_SUCCESS( nMatchStatus ), "lcl_initializePatternMatcher: invalid pattern property!" );
                 // if asserts, then something changed our pattern without going to convertFastPropertyValue/checkPropertySanity
@@ -226,7 +226,7 @@ namespace xforms
         static bool lcl_matchString( RegexMatcher& _rMatcher, const ::rtl::OUString& _rText )
         {
             UErrorCode nMatchStatus = U_ZERO_ERROR;
-            UnicodeString aInput( _rText.getStr(), _rText.getLength() );
+            UnicodeString aInput( reinterpret_cast<const UChar *>(_rText.getStr()), _rText.getLength() );   // UChar != sal_Unicode in MinGW
             _rMatcher.reset( aInput );
             if ( _rMatcher.matches( nMatchStatus ) )
             {
@@ -300,7 +300,7 @@ namespace xforms
             ::rtl::OUString sPattern;
             OSL_VERIFY( _rNewValue >>= sPattern );
 
-            UnicodeString aIcuPattern( sPattern.getStr(), sPattern.getLength() );
+            UnicodeString aIcuPattern( reinterpret_cast<const UChar *>(sPattern.getStr()), sPattern.getLength() );  // UChar != sal_Unicode in MinGW
             UErrorCode nMatchStatus = U_ZERO_ERROR;
             RegexMatcher aMatcher( aIcuPattern, 0, nMatchStatus );
             if ( U_FAILURE( nMatchStatus ) )
diff --git a/setup_native/source/win32/customactions/languagepacks/makefile.mk b/setup_native/source/win32/customactions/languagepacks/makefile.mk
index be16ab5cfd8a..713c4f5e1385 100644
--- a/setup_native/source/win32/customactions/languagepacks/makefile.mk
+++ b/setup_native/source/win32/customactions/languagepacks/makefile.mk
@@ -44,7 +44,9 @@ MINGW_NODLL=YES
 
 .INCLUDE : settings.mk
 
+.IF "$(USE_SYSTEM_STL)" != "YES"
 CFLAGS+=-D_STLP_USE_STATIC_LIB
+.ENDIF
 
 #Disable precompiled header
 CDEFS+=-Dnot_used_define_to_disable_pch
@@ -61,8 +63,11 @@ SLOFILES =	$(SLO)$/lngpckinsthelper.obj \
 
 STDSHL+=	\
     $(ADVAPI32LIB)\
-    $(MSILIB)\
-    $(LIBSTLPORTST)								
+    $(MSILIB)
+
+.IF "$(USE_SYSTEM_STL)" != "YES"
+STDSHL+=$(LIBSTLPORTST)								
+.ENDIF
 
 SHL1OBJS = $(SLOFILES)               \
     $(SLO)$/seterror.obj
diff --git a/setup_native/source/win32/customactions/patch/makefile.mk b/setup_native/source/win32/customactions/patch/makefile.mk
index 901c771c0082..996b4fc38e5d 100755
--- a/setup_native/source/win32/customactions/patch/makefile.mk
+++ b/setup_native/source/win32/customactions/patch/makefile.mk
@@ -43,7 +43,9 @@ MINGW_NODLL=YES
 
 .INCLUDE : settings.mk
 
+.IF "$(USE_SYSTEM_STL)" != "YES"
 CFLAGS+=-D_STLP_USE_STATIC_LIB
+.ENDIF
 
 #Disable precompiled header
 CDEFS+=-Dnot_used_define_to_disable_pch
@@ -60,9 +62,12 @@ SLOFILES = \
 STDSHL += \
     $(ADVAPI32LIB)\
     $(MSILIB)\
-    $(LIBSTLPORTST) \
         $(SHELL32LIB)								
 
+.IF "$(USE_SYSTEM_STL)" != "YES"
+STDSHL += $(LIBSTLPORTST)
+.ENDIF
+
 .IF "$(COM)"=="GCC"
 STDSHL+=	\
     $(KERNEL32LIB)\
diff --git a/setup_native/source/win32/customactions/quickstarter/makefile.mk b/setup_native/source/win32/customactions/quickstarter/makefile.mk
index 8fa07b116a34..44ce1a2b1acf 100644
--- a/setup_native/source/win32/customactions/quickstarter/makefile.mk
+++ b/setup_native/source/win32/customactions/quickstarter/makefile.mk
@@ -46,7 +46,10 @@ MINGW_NODLL=YES
 
 .INCLUDE : settings.mk
 
+.IF "$(USE_SYSTEM_STL)" != "YES"
 CFLAGS+=-D_STLP_USE_STATIC_LIB
+.ENDIF
+
 UWINAPILIB=
 
 # --- Files --------------------------------------------------------
@@ -56,8 +59,11 @@ UWINAPILIB=
 STDSHL += \
     $(ADVAPI32LIB)\
     $(SHELL32LIB)\
-    $(MSILIB)\
-    $(LIBSTLPORTST)								
+    $(MSILIB)
+
+.IF "$(USE_SYSTEM_STL)" != "YES"
+STDSHL += $(LIBSTLPORTST)								
+.ENDIF
 
 .IF "$(COM)"=="GCC"
 STDSHL+=	\
diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk b/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
index 0bd44f8610ab..3bcd93234abe 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
@@ -42,7 +42,10 @@ USE_DEFFILE=TRUE
 
 .INCLUDE : settings.mk
 
-CFLAGS+=-DUNICODE -D_UNICODE -D_STLP_USE_STATIC_LIB
+CFLAGS+=-DUNICODE -D_UNICODE
+.IF "$(USE_SYSTEM_STL)" != "YES"
+CFLAGS+=-D_STLP_USE_STATIC_LIB
+.ENDIF
 
 # --- Files --------------------------------------------------------
 
@@ -57,8 +60,11 @@ SHL1STDLIBS=	$(KERNEL32LIB)\
                 $(ADVAPI32LIB)\
                 $(SHELL32LIB)\
                 $(MSILIB)\
-                $(SHLWAPILIB)\
-                $(LIBSTLPORTST)								
+                $(SHLWAPILIB)
+
+.IF "$(USE_SYSTEM_STL)" != "YES"
+SHL1STDLIBS+=$(LIBSTLPORTST)								
+.ENDIF
 
 SHL1LIBS = $(SLB)$/$(TARGET).lib 
 
diff --git a/setup_native/source/win32/customactions/reg4msdoc/makefile.mk b/setup_native/source/win32/customactions/reg4msdoc/makefile.mk
index ebb56841d770..31dca4a271b7 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/makefile.mk
+++ b/setup_native/source/win32/customactions/reg4msdoc/makefile.mk
@@ -43,7 +43,10 @@ MINGW_NODLL=YES
 
 .INCLUDE : settings.mk
 
-CFLAGS+=-DUNICODE -D_UNICODE -D_STLP_USE_STATIC_LIB
+CFLAGS+=-DUNICODE -D_UNICODE
+.IF "$(USE_SYSTEM_STL)" != "YES"
+CFLAGS+=-D_STLP_USE_STATIC_LIB
+.ENDIF
 
 # --- Files --------------------------------------------------------
 
@@ -70,8 +73,11 @@ SHL1STDLIBS=	$(KERNEL32LIB)\
                 $(ADVAPI32LIB)\
                 $(SHELL32LIB)\
                 $(MSILIB)\
-                $(SHLWAPILIB)\
-                $(LIBSTLPORTST)								
+                $(SHLWAPILIB)
+
+.IF "$(USE_SYSTEM_STL)" != "YES"
+SHL1STDLIBS+=$(LIBSTLPORTST)								
+.ENDIF
 
 SHL1LIBS = $(SLB)$/$(TARGET).lib 
 
diff --git a/setup_native/source/win32/customactions/relnotes/makefile.mk b/setup_native/source/win32/customactions/relnotes/makefile.mk
index 3d8806fa7909..8d3af6286009 100644
--- a/setup_native/source/win32/customactions/relnotes/makefile.mk
+++ b/setup_native/source/win32/customactions/relnotes/makefile.mk
@@ -44,7 +44,11 @@ MINGW_NODLL=YES
 
 .INCLUDE : settings.mk
 
-CDEFS+=-DUNICODE -D_STLP_USE_STATIC_LIB
+CDEFS+=-DUNICODE
+.IF "$(USE_SYSTEM_STL)" != "YES"
+CDEFS+=-D_STLP_USE_STATIC_LIB
+.ENDIF
+
 UWINAPILIB=
 
 # --- Files --------------------------------------------------------
@@ -56,8 +60,11 @@ SLOFILES =	$(SLO)$/relnotes.obj
 STDSHL+=	\
     $(ADVAPI32LIB)\
     $(SHELL32LIB)\
-    $(MSILIB)\
-    $(LIBSTLPORTST)								
+    $(MSILIB)
+
+.IF "$(USE_SYSTEM_STL)" != "YES"
+STDSHL+=$(LIBSTLPORTST)								
+.ENDIF
 
 SHL1LIBS = $(SLB)$/$(TARGET).lib 
 
diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk
index 9d286a349b67..4a100058374d 100644
--- a/setup_native/source/win32/customactions/shellextensions/makefile.mk
+++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk
@@ -43,7 +43,9 @@ MINGW_NODLL=YES
 
 .INCLUDE : settings.mk
 
+.IF "$(USE_SYSTEM_STL)" != "YES"
 CFLAGS+=-D_STLP_USE_STATIC_LIB
+.ENDIF
 
 #Disable precompiled header
 CDEFS+=-Dnot_used_define_to_disable_pch
@@ -78,9 +80,12 @@ SLOFILES = \
 STDSHL += \
     $(ADVAPI32LIB)\
     $(MSILIB)\
-    $(LIBSTLPORTST)\
         $(SHELL32LIB)								
 
+.IF "$(USE_SYSTEM_STL)" != "YES"
+STDSHL += $(LIBSTLPORTST)
+.ENDIF
+
 .IF "$(COM)"=="GCC"
 STDSHL+=	\
     $(KERNEL32LIB)\
diff --git a/setup_native/source/win32/customactions/tools/makefile.mk b/setup_native/source/win32/customactions/tools/makefile.mk
index cdf7271ff474..2c6a63a6fff2 100644
--- a/setup_native/source/win32/customactions/tools/makefile.mk
+++ b/setup_native/source/win32/customactions/tools/makefile.mk
@@ -44,7 +44,9 @@ MINGW_NODLL=YES
 
 .INCLUDE : settings.mk
 
+.IF "$(USE_SYSTEM_STL)" != "YES"
 CFLAGS+=-D_STLP_USE_STATIC_LIB
+.ENDIF
 
 # --- Files --------------------------------------------------------
 
@@ -59,8 +61,11 @@ SHL1OBJS = $(SLOFILES)
 
 STDSHL+=	\
     $(ADVAPI32LIB)\
-    $(MSILIB)\
-    $(LIBSTLPORTST)								
+    $(MSILIB)
+
+.IF "$(USE_SYSTEM_STL)" != "YES"
+STDSHL+=$(LIBSTLPORTST)								
+.ENDIF
 
 #SHL1LIBS = $(SLB)$/$(TARGET).lib