[Libreoffice-commits] .: Branch 'integration/dev300_m101' - 4 commits - solenv/gbuild solenv/inc

[Tor Lillqvist]

 solenv/gbuild/ComponentTarget.mk  |    2 +-
 solenv/gbuild/platform/windows.mk |   16 ++++++++--------
 solenv/inc/postwin.h              |    7 +++----
 solenv/inc/prewin.h               |    1 -
 4 files changed, 12 insertions(+), 14 deletions(-)

New commits:
commit b99b04850eae0a602b096b36dda0f04b1d0a33dc
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Mar 16 17:30:49 2011 +0200

    The WIN_BOOL dance no longer needed and in fact causes compilation errors

diff --git a/solenv/inc/postwin.h b/solenv/inc/postwin.h
index 4a2f196..58342e5 100644
--- a/solenv/inc/postwin.h
+++ b/solenv/inc/postwin.h
@@ -39,7 +39,6 @@
 #undef Polygon
 #undef Rectangle
 #undef BYTE
-#undef BOOL
 #undef DELETE
 
 #ifndef VCL_NEED_BASETSD
@@ -249,9 +248,9 @@
 #ifdef WNT
 extern "C"
 {
-WIN_BOOL WINAPI WIN_Rectangle( HDC hDC, int X1, int Y1, int X2, int Y2 );
-WIN_BOOL WINAPI WIN_Polygon( HDC hDC, CONST POINT * ppt, int ncnt );
-WIN_BOOL WINAPI WIN_PolyPolygon( HDC hDC, CONST POINT * ppt, LPINT npcnt, int ncnt );
+BOOL WINAPI WIN_Rectangle( HDC hDC, int X1, int Y1, int X2, int Y2 );
+BOOL WINAPI WIN_Polygon( HDC hDC, CONST POINT * ppt, int ncnt );
+BOOL WINAPI WIN_PolyPolygon( HDC hDC, CONST POINT * ppt, LPINT npcnt, int ncnt );
 }
 #endif
 
diff --git a/solenv/inc/prewin.h b/solenv/inc/prewin.h
index 7744dbe..0c07a62 100644
--- a/solenv/inc/prewin.h
+++ b/solenv/inc/prewin.h
@@ -30,7 +30,6 @@
 
 #if defined WNT
 
-#define BOOL         WIN_BOOL
 #define BYTE         WIN_BYTE
 #ifndef VCL_NEED_BASETSD
 #define INT64	     WIN_INT64
commit cef51de4450adccfb433373d28ccb77b044483b5
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Mar 16 15:52:18 2011 +0200

    Revert "Revert "Xsltproc is a non-Cygwin program on Windows so use realpath""
    
    This reverts commit 19bd92e4348b500c98b0da4230bfaf7d838133ab.

diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index a96a62b..504bd5a 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -36,7 +36,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 	mkdir -p $(dir $(1)) && \
 	$(gb_XSLTPROC) --nonet --stringparam uri \
 		'$(subst \d,$$,$(COMPONENTPREFIX))$(LIBFILENAME)' -o $(1) \
-		$(gb_ComponentTarget_XSLTCOMMANDFILE) $(2))
+		$(gb_ComponentTarget_XSLTCOMMANDFILE) $(realpath $(2)))
 
 endef
 
commit 9fc5d209ef5cd8554945ebb426faea753f805233
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Mar 16 15:52:16 2011 +0200

    Revert "Revert "Sprinkle more realpath calls""
    
    This reverts commit a6b8a0d1e59abc52fa54ea2741837b7cde9c1731.

diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index d1cb80b..cad5be5 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -258,7 +258,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 	$(gb_CC) \
 		$(DEFS) $(CFLAGS)  -Fd$(PDBFILE) \
 		$(PCHFLAGS) \
-		-I$(dir $(3)) \
+		-I$(realpath $(dir $(3))) \
 		$(INCLUDE) \
 		-c $(realpath $(3)) \
 		-Fo$(1))
@@ -297,7 +297,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 	$(gb_CXX) \
 		$(DEFS) $(CXXFLAGS) -Fd$(PDBFILE)\
 		$(PCHFLAGS) \
-		-I$(dir $(3)) \
+		-I$(realpath $(dir $(3))) \
 		$(INCLUDE_STL) $(INCLUDE) \
 		-c $(realpath $(3)) \
 		-Fo$(1))
@@ -339,7 +339,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 	unset INCLUDE && \
 	$(gb_CXX) \
 		$(4) $(5) -Fd$(PDBFILE) \
-		-I$(dir $(3)) \
+		-I$(realpath $(dir $(3))) \
 		$(6) \
 		-c $(realpath $(3)) \
 		-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj)
@@ -380,7 +380,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 	unset INCLUDE && \
 	$(gb_CXX) \
 		$(4) $(5) -Fd$(PDBFILE) \
-		-I$(dir $(3)) \
+		-I$(realpath $(dir $(3))) \
 		$(6) \
 		-c $(realpath $(3)) \
 		-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj)
commit 1fca179c87b34815897b8a60680f6fe4e05d2d17
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Mar 16 15:52:08 2011 +0200

    Revert "Revert "Use realpath on the filename being compiled to expand Cygwin symlinks""
    
    This reverts commit b4260a9b516241dd42d992cc148235e153a66d18.

diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 853f872..d1cb80b 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -260,7 +260,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 		$(PCHFLAGS) \
 		-I$(dir $(3)) \
 		$(INCLUDE) \
-		-c $(3) \
+		-c $(realpath $(3)) \
 		-Fo$(1))
 $(call gb_CObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(CFLAGS),$(INCLUDE))
 endef
@@ -299,7 +299,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 		$(PCHFLAGS) \
 		-I$(dir $(3)) \
 		$(INCLUDE_STL) $(INCLUDE) \
-		-c $(3) \
+		-c $(realpath $(3)) \
 		-Fo$(1))
 $(call gb_CxxObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(CFLAGS),$(INCLUDE))
 endef
@@ -341,7 +341,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 		$(4) $(5) -Fd$(PDBFILE) \
 		-I$(dir $(3)) \
 		$(6) \
-		-c $(3) \
+		-c $(realpath $(3)) \
 		-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj)
 $(call gb_PrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
 endef
@@ -382,7 +382,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 		$(4) $(5) -Fd$(PDBFILE) \
 		-I$(dir $(3)) \
 		$(6) \
-		-c $(3) \
+		-c $(realpath $(3)) \
 		-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj)
 $(call gb_NoexPrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
 endef