[Libreoffice-commits] .: 3 commits - RepositoryFixes.mk solenv/gbuild

[Tor Lillqvist]

 RepositoryFixes.mk                 |    7 ++---
 solenv/gbuild/platform/winmingw.mk |   44 ++++++++++++-------------------------
 2 files changed, 18 insertions(+), 33 deletions(-)

New commits:
commit ed755d550b043bf95b8b40e83fa2709b2a088231
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Jul 25 20:21:17 2011 +0300

    Don't bother with makedepend and processdeps.awk
    
    Just use gcc's own mechanism, just like in unxgcc.mk. We intend to
    support MinGW only for cross-compilation anyway.

diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 1aa59d3..0435f51 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -233,57 +233,42 @@ endef
 
 # CObject class
 
-ifeq ($(gb_FULLDEPS),$(true))
-define gb_Object__command_deponcompile
-$(call gb_Helper_abbreviate_dirs_native,\
-	$(OUTDIR_FOR_BUILD)/bin/makedepend \
-		$(filter-out -DPRECOMPILED_HEADERS,$(4)) $(5) \
-		-I$(dir $(3)) \
-		$(filter-out -I$(COMPATH)% %/pch -I$(JAVA_HOME),$(6)) \
-		$(3) \
-		-f - \
-	| $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
-		-v OBJECTFILE=$(1) \
-		-v OUTDIR=$(OUTDIR)/ \
-		-v WORKDIR=$(WORKDIR)/ \
-		-v SRCDIR=$(SRCDIR)/ \
-		-v REPODIR=$(REPODIR)/ \
-	> $(2))
-endef
-else
-gb_Object__command_deponcompile =
-endif
+# We (LibreOffice) support MinGW only for cross-compilation. This is identical to
+# gb_CObject__command in unxgcc.mk
 
+# $(call gb_CObject__command,object,relative-source,source,dep-file)
 define gb_CObject__command
 $(call gb_Output_announce,$(2),$(true),C  ,3)
-$(call gb_Helper_abbreviate_dirs_native,\
-	mkdir -p $(dir $(1)) && \
+$(call gb_Helper_abbreviate_dirs,\
+	mkdir -p $(dir $(1)) $(dir $(4)) && \
 	$(gb_CC) \
 		$(DEFS) \
 		$(T_CFLAGS) \
 		-c $(3) \
 		-o $(1) \
+		-MMD -MT $(1) \
+		-MF $(4) \
 		-I$(dir $(3)) \
 		$(INCLUDE))
-$(call gb_Object__command_deponcompile,$(1),$(4),$(3),$(DEFS),$(T_CFLAGS),$(INCLUDE))
 endef
 
 
-
 # CxxObject class
 
+# $(call gb_CxxObject__command,object,relative-source,source,dep-file)
 define gb_CxxObject__command
 $(call gb_Output_announce,$(2),$(true),CXX,3)
-$(call gb_Helper_abbreviate_dirs_native,\
-	mkdir -p $(dir $(1)) && \
+$(call gb_Helper_abbreviate_dirs,\
+	mkdir -p $(dir $(1)) $(dir $(4)) && \
 	$(gb_CXX) \
 		$(DEFS) \
 		$(T_CXXFLAGS) \
 		-c $(3) \
 		-o $(1) \
+		-MMD -MT $(1) \
+		-MF $(4) \
 		-I$(dir $(3)) \
 		$(INCLUDE_STL) $(INCLUDE))
-$(call gb_Object__command_deponcompile,$(1),$(4),$(3),$(DEFS),$(T_CXXFLAGS),$(INCLUDE_STL) $(INCLUDE))
 endef
 
 
commit a2a51a82e7e90399564dac5055700c0a053e8c5a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Jul 25 18:19:36 2011 +0300

    Remove superfluous empty line
    
    The comment for gb_Library_ILIBFILENAMES in the WNTGCC case doesn't
    make much sense for us, though, as I think we want to support WNTGCC
    only for cross-compilation, and thus we don't have access to the PSDK
    ("Platform" SDK, with which they mean the Windows SDK). I don't see
    any point in using MinGW natively on Windows to build LibreOffice. If
    you build locally, use MSVC.

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index b6c7108..d822ae6 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -81,10 +81,9 @@ gb_Library_SDKLIBFILENAMES:=\
 # some Windows platform libraries are missing in mingw library set
 # we have to use them from the PSDK by linking against their ilibs
 gb_Library_ILIBFILENAMES:=\
-
-	unicows \
-	uuid \
-	winmm \
+    unicows \
+    uuid \
+    winmm \
 
 gb_Library_DLLFILENAMES := $(filter-out $(foreach lib,$(gb_Library_SDKLIBFILENAMES),$(lib):%),$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_SDKLIBFILENAMES),$(lib):$(WINDOWS_SDK_HOME)/lib/$(lib).lib)
commit 53297f579f310e8e4daee46f16797548df6ec7ce
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Jul 25 18:23:05 2011 +0300

    Move apparently misplaced endif to correct place

diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 788e777..1aa59d3 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -380,10 +380,11 @@ endef
 gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
 gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
 
-endif
 ifeq ($(gb_SYMBOL),$(true))
 gb_LinkTarget_CXXFLAGS += -ggdb2
 gb_LinkTarget_CFLAGS += -ggdb2
+endif
+
 gb_LinkTarget_INCLUDE :=\
 	$(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) \
 	$(foreach inc,$(subst ;, ,$(JDKINC)),-I$(inc)) \
@@ -711,7 +712,7 @@ gb_Library_COMPONENTPREFIXES := \
 	OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \
 	URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
 	NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
-	
+
 # UnoApiTarget
 
 gb_UnoApiTarget_IDLCTARGET := $(OUTDIR_FOR_BUILD)/bin/idlc