Merge branch 'master' into feature/gnumake4feature/gnumake4

10 files changed, 69 insertions, 40 deletions

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 9083d4c60..a7f784e9a 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -120,10 +120,6 @@ ifeq ($(HAVE_CXX0X),TRUE)
 gb_CXXFLAGS += -std=c++0x -Wno-deprecated-declarations
 endif
 
-ifeq ($(ENABLE_DEBUG_STL),TRUE)
-gb_CXXFLAGS += -D_GLIBCXX_DEBUG
-endif
-
 ifneq ($(strip $(SYSBASE)),)
 gb_CXXFLAGS += --sysroot=$(SYSBASE)
 gb_CFLAGS += --sysroot=$(SYSBASE)
@@ -420,7 +416,7 @@ gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/l
 
 # SrsPartTarget class
 
-gb_SrsPartTarget_RSCTARGET := $(OUTDIR)/bin/rsc
+gb_SrsPartTarget_RSCTARGET := $(OUTDIR_FOR_BUILD)/bin/rsc
 gb_SrsPartTarget_RSCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(OUTDIR_FOR_BUILD)/bin/rsc
 
 define gb_SrsPartTarget__command_dep
diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk
index bb2dabe62..4a98fae26 100644
--- a/solenv/inc/_tg_app.mk
+++ b/solenv/inc/_tg_app.mk
@@ -125,7 +125,11 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
     @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP1LINKRES:b).rc
     @-echo $(EMQ)#include  $(EMQ)"$(APP1VERINFO)$(EMQ)" >> $(MISC)/$(APP1LINKRES:b).rc
 .ENDIF		# "$(APP1VERINFO)" != ""
+.IF "$(COM)" == "GCC"
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP1PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP1LINKRES:b).res $(MISC)/$(APP1LINKRES:b).rc
+.ELSE
     $(COMMAND_ECHO)$(RC) -DWIN32 $(APP1PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP1LINKRES:b).rc
+.ENDIF
 .ENDIF			# "$(APP1LINKRES)" != ""
 .IF "$(COM)" == "GCC"
 .IF "$(APP1LINKRES)" != "" || "$(APP1RES)" != ""
@@ -331,7 +335,11 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
     @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP2LINKRES:b).rc
     @-echo $(EMQ)#include  $(EMQ)"$(APP2VERINFO)$(EMQ)" >> $(MISC)/$(APP2LINKRES:b).rc
 .ENDIF		# "$(APP2VERINFO)" != ""
+.IF "$(COM)" == "GCC"
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP2PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP2LINKRES:b).res $(MISC)/$(APP2LINKRES:b).rc
+.ELSE
     $(COMMAND_ECHO)$(RC) -DWIN32 $(APP2PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP2LINKRES:b).rc
+.ENDIF
 .ENDIF			# "$(APP2LINKRES)" != ""
 .IF "$(COM)" == "GCC"
 .IF "$(APP2LINKRES)" != "" || "$(APP2RES)" != ""
@@ -537,7 +545,11 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
     @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP3LINKRES:b).rc
     @-echo $(EMQ)#include  $(EMQ)"$(APP3VERINFO)$(EMQ)" >> $(MISC)/$(APP3LINKRES:b).rc
 .ENDIF		# "$(APP3VERINFO)" != ""
+.IF "$(COM)" == "GCC"
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP3PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP3LINKRES:b).res $(MISC)/$(APP3LINKRES:b).rc
+.ELSE
     $(COMMAND_ECHO)$(RC) -DWIN32 $(APP3PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP3LINKRES:b).rc
+.ENDIF
 .ENDIF			# "$(APP3LINKRES)" != ""
 .IF "$(COM)" == "GCC"
 .IF "$(APP3LINKRES)" != "" || "$(APP3RES)" != ""
@@ -743,7 +755,11 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
     @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP4LINKRES:b).rc
     @-echo $(EMQ)#include  $(EMQ)"$(APP4VERINFO)$(EMQ)" >> $(MISC)/$(APP4LINKRES:b).rc
 .ENDIF		# "$(APP4VERINFO)" != ""
+.IF "$(COM)" == "GCC"
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP4PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP4LINKRES:b).res $(MISC)/$(APP4LINKRES:b).rc
+.ELSE
     $(COMMAND_ECHO)$(RC) -DWIN32 $(APP4PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP4LINKRES:b).rc
+.ENDIF
 .ENDIF			# "$(APP4LINKRES)" != ""
 .IF "$(COM)" == "GCC"
 .IF "$(APP4LINKRES)" != "" || "$(APP4RES)" != ""
@@ -949,7 +965,11 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
     @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP5LINKRES:b).rc
     @-echo $(EMQ)#include  $(EMQ)"$(APP5VERINFO)$(EMQ)" >> $(MISC)/$(APP5LINKRES:b).rc
 .ENDIF		# "$(APP5VERINFO)" != ""
+.IF "$(COM)" == "GCC"
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP5PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP5LINKRES:b).res $(MISC)/$(APP5LINKRES:b).rc
+.ELSE
     $(COMMAND_ECHO)$(RC) -DWIN32 $(APP5PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP5LINKRES:b).rc
+.ENDIF
 .ENDIF			# "$(APP5LINKRES)" != ""
 .IF "$(COM)" == "GCC"
 .IF "$(APP5LINKRES)" != "" || "$(APP5RES)" != ""
@@ -1155,7 +1175,11 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
     @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP6LINKRES:b).rc
     @-echo $(EMQ)#include  $(EMQ)"$(APP6VERINFO)$(EMQ)" >> $(MISC)/$(APP6LINKRES:b).rc
 .ENDIF		# "$(APP6VERINFO)" != ""
+.IF "$(COM)" == "GCC"
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP6PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP6LINKRES:b).res $(MISC)/$(APP6LINKRES:b).rc
+.ELSE
     $(COMMAND_ECHO)$(RC) -DWIN32 $(APP6PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP6LINKRES:b).rc
+.ENDIF
 .ENDIF			# "$(APP6LINKRES)" != ""
 .IF "$(COM)" == "GCC"
 .IF "$(APP6LINKRES)" != "" || "$(APP6RES)" != ""
@@ -1361,7 +1385,11 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
     @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP7LINKRES:b).rc
     @-echo $(EMQ)#include  $(EMQ)"$(APP7VERINFO)$(EMQ)" >> $(MISC)/$(APP7LINKRES:b).rc
 .ENDIF		# "$(APP7VERINFO)" != ""
+.IF "$(COM)" == "GCC"
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP7PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP7LINKRES:b).res $(MISC)/$(APP7LINKRES:b).rc
+.ELSE
     $(COMMAND_ECHO)$(RC) -DWIN32 $(APP7PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP7LINKRES:b).rc
+.ENDIF
 .ENDIF			# "$(APP7LINKRES)" != ""
 .IF "$(COM)" == "GCC"
 .IF "$(APP7LINKRES)" != "" || "$(APP7RES)" != ""
@@ -1567,7 +1595,11 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
     @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP8LINKRES:b).rc
     @-echo $(EMQ)#include  $(EMQ)"$(APP8VERINFO)$(EMQ)" >> $(MISC)/$(APP8LINKRES:b).rc
 .ENDIF		# "$(APP8VERINFO)" != ""
+.IF "$(COM)" == "GCC"
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP8PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP8LINKRES:b).res $(MISC)/$(APP8LINKRES:b).rc
+.ELSE
     $(COMMAND_ECHO)$(RC) -DWIN32 $(APP8PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP8LINKRES:b).rc
+.ENDIF
 .ENDIF			# "$(APP8LINKRES)" != ""
 .IF "$(COM)" == "GCC"
 .IF "$(APP8LINKRES)" != "" || "$(APP8RES)" != ""
@@ -1773,7 +1805,11 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
     @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP9LINKRES:b).rc
     @-echo $(EMQ)#include  $(EMQ)"$(APP9VERINFO)$(EMQ)" >> $(MISC)/$(APP9LINKRES:b).rc
 .ENDIF		# "$(APP9VERINFO)" != ""
+.IF "$(COM)" == "GCC"
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP9PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP9LINKRES:b).res $(MISC)/$(APP9LINKRES:b).rc
+.ELSE
     $(COMMAND_ECHO)$(RC) -DWIN32 $(APP9PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP9LINKRES:b).rc
+.ENDIF
 .ENDIF			# "$(APP9LINKRES)" != ""
 .IF "$(COM)" == "GCC"
 .IF "$(APP9LINKRES)" != "" || "$(APP9RES)" != ""
@@ -1979,7 +2015,11 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
     @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP10LINKRES:b).rc
     @-echo $(EMQ)#include  $(EMQ)"$(APP10VERINFO)$(EMQ)" >> $(MISC)/$(APP10LINKRES:b).rc
 .ENDIF		# "$(APP10VERINFO)" != ""
+.IF "$(COM)" == "GCC"
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP10PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP10LINKRES:b).res $(MISC)/$(APP10LINKRES:b).rc
+.ELSE
     $(COMMAND_ECHO)$(RC) -DWIN32 $(APP10PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP10LINKRES:b).rc
+.ENDIF
 .ENDIF			# "$(APP10LINKRES)" != ""
 .IF "$(COM)" == "GCC"
 .IF "$(APP10LINKRES)" != "" || "$(APP10RES)" != ""
diff --git a/solenv/inc/antsettings.mk b/solenv/inc/antsettings.mk
index fda4a8289..0137e33b6 100644
--- a/solenv/inc/antsettings.mk
+++ b/solenv/inc/antsettings.mk
@@ -82,7 +82,7 @@ JAVA_HOME=
 ANT_FLAGS!:=$(ANT_COMPILER_FLAGS) -Dprj=$(PRJ) -Dprjname=$(PRJNAME) $(ANT_JAVA_VER_FLAGS) \
  -Ddebug=$(ANT_DEBUG) -Doptimize=$(ANT_OPT) -Dtarget=$(TARGET) -Dsolar.update=on \
  -Dout=$(OUT) -Dinpath=$(INPATH) -Dproext="$(PROEXT)" -Dsolar.bin=$(SOLARBINDIR) \
- -Dsolar.jar=$(SOLARBINDIR) -Dsolar.doc=$(SOLARDOCDIR) -Dcommon.jar=$(SOLARCOMMONBINDIR) \
+ -Dsolar.jar=$(SOLARVER)/$(INPATH)/bin -Dsolar.doc=$(SOLARDOCDIR) -Dcommon.jar=$(SOLARCOMMONBINDIR) \
  -Dcommon.doc=$(SOLARCOMMONDOCDIR) -Dsolar.sourceversion=$(SOURCEVERSION) \
  -Dsolar.lastminor=$(LAST_MINOR) -Dsolar.build=$(BUILD) -f $(ANT_BUILDFILE) $(ANT_FLAGS) \
  -emacs $(ANT_VERBOSE)
diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk
index 5204af7dd..82421e240 100644
--- a/solenv/inc/extension_post.mk
+++ b/solenv/inc/extension_post.mk
@@ -159,7 +159,7 @@ $(DESCRIPTION) $(PHONYDESC) : $(DESCRIPTION_SRC)
 # may not fit...
 .IF "$(CUSTOM_LICENSE)"==""
 .IF "$(GUI)" == "WNT"
-PACKLICDEPS=$(SOLARBINDIR)/osl/license.txt
+PACKLICDEPS=$(SOLARVER)/$(INPATH)/bin/osl/license.txt
 .ELSE			# "$(GUI)" == "WNT"
 PACKLICDEPS=$(SOLARBINDIR)/osl/LICENSE
 .ENDIF			# "$(GUI)" == "WNT"
diff --git a/solenv/inc/postmac.h b/solenv/inc/postmac.h
index 9b0a67c6f..4c722befa 100644
--- a/solenv/inc/postmac.h
+++ b/solenv/inc/postmac.h
@@ -26,29 +26,25 @@
  *
  ************************************************************************/
 
-//#undef Boolean
-//#undef BOOL
 #undef Button
 #undef Byte
 #undef Control
 #undef Cursor
+#undef DirInfo
 #undef FontInfo
-#undef GetItem
+#undef LSize
+#undef Line
 #undef MemoryBlock
+#undef ModalDialog
 #undef Palette
-#undef Polygon
+#undef Pattern
 #undef Point
+#undef Polygon
 #undef Ptr
 #undef Region
-#undef Size
-#undef LSize
-#undef ModalDialog
 #undef SetCursor
+#undef Size
 #undef StringPtr
-#undef DirInfo
-//#undef ULONG
-#undef Line
 #undef TimeValue
-#undef Pattern
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/inc/premac.h b/solenv/inc/premac.h
index e59e7d97a..b5650dc94 100644
--- a/solenv/inc/premac.h
+++ b/solenv/inc/premac.h
@@ -26,29 +26,25 @@
  *
  ************************************************************************/
 
-
-//#define Boolean MacOSBoolean
-//#define BOOL MacOSBOOL
 #define Button MacOSButton
 #define Byte MacOSByte
 #define Control MacOSControl
 #define Cursor MacOSCursor
+#define DirInfo MacOSDirInfo
 #define FontInfo MacOSFontInfo
+#define LSize MacOSLSize
+#define Line MacOSLine
 #define MemoryBlock MacOSMemoryBlock
+#define ModalDialog MacOSModalDialog
+#define Palette MacOSPalette
+#define Pattern MacOSPattern
 #define Point MacOSPoint
-#define Size MacOSSize
-#define Region MacOSRegion
 #define Polygon MacOSPolygon
 #define Ptr MacOSPtr
-#define Palette MacOSPalette
-#define LSize MacOSLSize
-#define ModalDialog MacOSModalDialog
+#define Region MacOSRegion
 #define SetCursor MacOSSetCursor
+#define Size MacOSSize
 #define StringPtr MacOSStringPtr
-#define DirInfo MacOSDirInfo
-//#define ULONG MacOSULONG
-#define Line MacOSLine
 #define TimeValue MacOSTimeValue
-#define Pattern MacOSPattern
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk
index a6fb32df1..c49ee04b3 100644
--- a/solenv/inc/tg_app.mk
+++ b/solenv/inc/tg_app.mk
@@ -154,7 +154,11 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
     @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP$(TNR)LINKRES:b).rc
     @-echo $(EMQ)#include  $(EMQ)"$(APP$(TNR)VERINFO)$(EMQ)" >> $(MISC)/$(APP$(TNR)LINKRES:b).rc
 .ENDIF		# "$(APP$(TNR)VERINFO)" != ""
+.IF "$(COM)" == "GCC"
+    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP$(TNR)PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP$(TNR)LINKRES:b).res $(MISC)/$(APP$(TNR)LINKRES:b).rc
+.ELSE
     $(COMMAND_ECHO)$(RC) -DWIN32 $(APP$(TNR)PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP$(TNR)LINKRES:b).rc
+.ENDIF
 .ENDIF			# "$(APP$(TNR)LINKRES)" != ""
 .IF "$(COM)" == "GCC"
 .IF "$(APP$(TNR)LINKRES)" != "" || "$(APP$(TNR)RES)" != ""
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 79d10d274..752de80c7 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -90,9 +90,6 @@ CFLAGSCXX+=-fvisibility-inlines-hidden
 .IF "$(HAVE_CXX0X)" == "TRUE"
 CFLAGSCXX+=-std=c++0x -Wno-deprecated-declarations
 .ENDIF # "$(HAVE_CXX0X)" == "TRUE"
-.IF "$(ENABLE_DEBUG_STL)" == "TRUE"
-CFLAGSCXX += -D_GLIBCXX_DEBUG
-.ENDIF
 
 CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
 CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch
diff --git a/solenv/inc/unxiosr.mk b/solenv/inc/unxiosr.mk
index 2e7599e10..dad117778 100644
--- a/solenv/inc/unxiosr.mk
+++ b/solenv/inc/unxiosr.mk
@@ -32,7 +32,7 @@ CFLAGS=-c $(EXTRA_CFLAGS)
 LINKC*=$(CC)
 LINK*=$(CXX)
 
-STDLIBCUIMT=-framework UIKit -framework Foundation -framework CoreFoundation -Xlinker -objc_abi_version -Xlinker 2
+STDLIBCUIMT=-framework UIKit -framework Foundation -framework CoreText -framework CoreGraphics -framework CoreFoundation -Xlinker -objc_abi_version -Xlinker 2
 STDLIBGUIMT=$(STDLIBCUIMT)
 STDSHLCUIMT=
 STDSHLGUIMT=
diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk
index 2622ca6b1..34faf329f 100644
--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -199,15 +199,15 @@ OLDNAMESLIB=-lmoldname
 MSIMG32LIB=-lmsimg32
 PROPSYSLIB=-lpropsys
 
-# Libraries that neither mingw.org or mingw-w64 have.
-# Thus have to use the Windows SDK ones.
-GDIPLUSLIB=$(WINDOWS_SDK_HOME)$/lib$/gdiplus.lib
-MSILIB=$(WINDOWS_SDK_HOME)$/lib$/msi.lib
-URLMONLIB=$(WINDOWS_SDK_HOME)$/lib$/urlmon.lib
+# Libraries for which we use an import library built
+# from Wine's .def file
+MSILIB=-lmsi
+GDIPLUSLIB=-lgdiplus
+URLMONLIB=-lurlmon
 
 # Libraries that mingw-w64 has but mingw.org doesn't. At least the OBS MinGW
 # cross-compiler is based on mingw-w64. When using MinGW natively on Windows
-# (which as such I don't think we want to support) let's use the Windows SDK
+# (which as such I don't think we want to support) we  use the Windows SDK
 # libraries.
 .IF "$(CROSS_COMPILING)"=="YES"
 DBGHELPLIB=-ldbghelp