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

[Tor Lillqvist]

 solenv/gbuild/ComponentTarget.mk  |    2 +-
 solenv/gbuild/platform/windows.mk |   16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit b4260a9b516241dd42d992cc148235e153a66d18
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Mar 16 13:37:02 2011 +0200

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

diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index d1cb80b..853f872 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 $(realpath $(3)) \
+		-c $(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 $(realpath $(3)) \
+		-c $(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 $(realpath $(3)) \
+		-c $(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 $(realpath $(3)) \
+		-c $(3) \
 		-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj)
 $(call gb_NoexPrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
 endef
commit a6b8a0d1e59abc52fa54ea2741837b7cde9c1731
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Mar 16 13:36:58 2011 +0200

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

diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index cad5be5..d1cb80b 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$(realpath $(dir $(3))) \
+		-I$(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$(realpath $(dir $(3))) \
+		-I$(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$(realpath $(dir $(3))) \
+		-I$(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$(realpath $(dir $(3))) \
+		-I$(dir $(3)) \
 		$(6) \
 		-c $(realpath $(3)) \
 		-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj)
commit 19bd92e4348b500c98b0da4230bfaf7d838133ab
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Mar 16 13:36:52 2011 +0200

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

diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index 504bd5a..a96a62b 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) $(realpath $(2)))
+		$(gb_ComponentTarget_XSLTCOMMANDFILE) $(2))
 
 endef