[Libreoffice-commits] core.git: solenv/gbuild

Bjoern Michaelsen bjoern.michaelsen at canonical.com
Wed Jul 17 12:22:22 PDT 2013 

 solenv/gbuild/LinkTarget.mk             |   21 +++------------------
 solenv/gbuild/PrecompiledHeaders.mk     |   23 -----------------------
 solenv/gbuild/TargetLocations.mk        |    4 ----
 solenv/gbuild/platform/com_GCC_class.mk |   28 ----------------------------
 solenv/gbuild/platform/com_GCC_defs.mk  |    2 --
 solenv/gbuild/platform/com_MSC_class.mk |   23 -----------------------
 solenv/gbuild/platform/com_MSC_defs.mk  |    2 --
 7 files changed, 3 insertions(+), 100 deletions(-)

New commits:
commit 2bf530153e9fb24aef62bf5e16e23ea1412887dd
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Jul 17 14:17:43 2013 +0200

    kill gb_NoexPrecompiledHeader
    
    Change-Id: I34b6cc6eceb8f326ba7e353d3d1aee3c93ea02bd
    Reviewed-on: https://gerrit.libreoffice.org/4956
    Tested-by: LibreOffice gerrit bot <gerrit at libreoffice.org>
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
    Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 3b64806..5316b09 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -146,18 +146,13 @@ ifneq ($(strip $$(PCH_NAME)),)
 ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_EXCEPTIONFLAGS)),$$(sort $$(T_CXXFLAGS) $$(T_CXXFLAGS_APPEND) $$(DEFS)))
 $$@ : PCHFLAGS := $$(call gb_PrecompiledHeader_get_enableflags,$$(PCH_NAME))
 else
-ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_NOEXCEPTIONFLAGS)),$$(sort $$(T_CXXFLAGS) $$(T_CXXFLAGS_APPEND) $$(DEFS)))
-$$@ : PCHFLAGS := $$(call gb_NoexPrecompiledHeader_get_enableflags,$$(PCH_NAME))
-else
 $$(info No precompiled header available for $$*.cxx .)
-$$(info precompiled header flags (  ex) : $$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_EXCEPTIONFLAGS)))
-$$(info precompiled header flags (noex) : $$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_NOEXCEPTIONFLAGS)))
-$$(info .           object flags        : $$(sort $$(T_CXXFLAGS) $$(T_CXXFLAGS_APPEND) $$(DEFS)))
+$$(info precompiled header flags : $$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_EXCEPTIONFLAGS)))
+$$(info .           object flags : $$(sort $$(T_CXXFLAGS) $$(T_CXXFLAGS_APPEND) $$(DEFS)))
 $$@ : PCHFLAGS :=
 endif
 endif
 endif
-endif
 endef
 
 ifneq ($(COMPILER_PLUGIN_TOOL),)
@@ -1272,15 +1267,10 @@ define gb_LinkTarget__set_precompiled_header_impl
 $(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_PrecompiledHeader_get_clean_target,$(3))
 $(call gb_PrecompiledHeader_get_target,$(3)) : $(2).cxx
 
-$(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_NoexPrecompiledHeader_get_clean_target,$(3))
-$(call gb_NoexPrecompiledHeader_get_target,$(3)) : $(2).cxx
-
 $(call gb_PrecompiledHeader_get_target,$(3)) : $(call gb_LinkTarget_get_headers_target,$(1))
-$(call gb_NoexPrecompiledHeader_get_target,$(3)) : $(call gb_LinkTarget_get_headers_target,$(1))
 
 $(call gb_LinkTarget_get_target,$(1)) : PCH_NAME := $(3)
 $(call gb_LinkTarget_get_target,$(1)) : PCHOBJEX = $(call gb_PrecompiledHeader_get_objectfile, $(call gb_PrecompiledHeader_get_target,$(3)))
-$(call gb_LinkTarget_get_target,$(1)) : PCHOBJNOEX = $(call gb_NoexPrecompiledHeader_get_objectfile, $(call gb_NoexPrecompiledHeader_get_target,$(3)))
 $(call gb_LinkTarget_get_target,$(1)) : PCHOBJS = $$(PCHOBJEX)
 
 $(call gb_LinkTarget_get_headers_target,$(1)) \
@@ -1289,15 +1279,11 @@ $(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS := $$(T_CXXFLAGS) $(call gb_LinkTarget__get_cxxflags,$(1))
 
 $(call gb_PrecompiledHeader_get_target,$(3)) : VISIBILITY :=
-$(call gb_NoexPrecompiledHeader_get_target,$(3)) : VISIBILITY :=
 
 $(call gb_PrecompiledHeader_get_timestamp,$(1)) : $(call gb_PrecompiledHeader_get_target,$(3))
-$(call gb_NoexPrecompiledHeader_get_timestamp,$(1)) : $(call gb_NoexPrecompiledHeader_get_target,$(3))
 
 ifeq ($(gb_FULLDEPS),$(true))
--include \
-	$(call gb_PrecompiledHeader_get_dep_target,$(3)) \
-	$(call gb_NoexPrecompiledHeader_get_dep_target,$(3))
+-include $(call gb_PrecompiledHeader_get_dep_target,$(3)) 
 $(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS := $$(DEFS)
 $(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS := $$(T_CXXFLAGS) $(call gb_LinkTarget__get_cxxflags,$(1))
 endif
@@ -1372,7 +1358,6 @@ endif
 ifeq ($(gb_ENABLE_PCH),$(true))
 ifneq ($(strip $$(PCH_NAME)),)
 $(call gb_PrecompiledHeader_get_target,$$(PCH_NAME)) : VISIBILITY := default
-$(call gb_NoexPrecompiledHeader_get_target,$$(PCH_NAME)) : VISIBILITY := default
 endif
 endif
 
diff --git a/solenv/gbuild/PrecompiledHeaders.mk b/solenv/gbuild/PrecompiledHeaders.mk
index 1dddeb8..d675e29 100644
--- a/solenv/gbuild/PrecompiledHeaders.mk
+++ b/solenv/gbuild/PrecompiledHeaders.mk
@@ -25,10 +25,8 @@ ifeq ($(gb_ENABLE_PCH),$(true))
 # gb_PrecompiledHeader_get_enableflags defined by platform
 ifneq ($(strip $(gb_DEBUGLEVEL)$(gb_SYMBOLS)),0)
 gb_PrecompiledHeader_DEBUGDIR := debug
-gb_NoexPrecompiledHeader_DEBUGDIR := debug
 else
 gb_PrecompiledHeader_DEBUGDIR := nodebug
-gb_NoexPrecompiledHeader_DEBUGDIR := nodebug
 endif
 
 $(call gb_PrecompiledHeader_get_dep_target,%) :
@@ -36,19 +34,10 @@ $(call gb_PrecompiledHeader_get_dep_target,%) :
 		mkdir -p $(dir $@) && \
 		echo "$(call gb_PrecompiledHeader_get_target,$*) : $(gb_Helper_PHONY)" > $@)
 
-$(call gb_NoexPrecompiledHeader_get_dep_target,%) :
-	$(call gb_Helper_abbreviate_dirs,\
-		mkdir -p $(dir $@) && \
-		echo "$(call gb_NoexPrecompiledHeader_get_target,$*) : $(gb_Helper_PHONY)" > $@)
-
 $(call gb_PrecompiledHeader_get_target,%) :
 	rm -f $@
 	$(call gb_PrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) $(gb_PrecompiledHeader_EXCEPTIONFLAGS),$(INCLUDE))
 
-$(call gb_NoexPrecompiledHeader_get_target,%) :
-	rm -f $@
-	$(call gb_NoexPrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) $(gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS),$(INCLUDE))
-
 .PHONY : $(call gb_PrecompiledHeader_get_clean_target,%) $(call gb_NoExPrecompiledHeader_get_clean_target,%)
 $(call gb_PrecompiledHeader_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),PCH,1)
@@ -59,21 +48,9 @@ $(call gb_PrecompiledHeader_get_clean_target,%) :
 			$(call gb_PrecompiledHeader_get_timestamp,$*) \
 			$(call gb_PrecompiledHeader_get_dep_target,$*))
 
-
-$(call gb_NoexPrecompiledHeader_get_clean_target,%) :
-	$(call gb_Output_announce,$*,$(false),PCH,1)
-	-$(call gb_Helper_abbreviate_dirs,\
-		rm -f $(call gb_NoexPrecompiledHeader_get_target,$*) \
-			$(call gb_NoexPrecompiledHeader_get_target,$*).obj \
-			$(call gb_NoexPrecompiledHeader_get_target,$*).pdb \
-			$(call gb_NoexPrecompiledHeader_get_timestamp,$*) \
-			$(call gb_NoexPrecompiledHeader_get_dep_target,$*))
 endif
 
 $(call gb_PrecompiledHeader_get_timestamp,%) :
 	mkdir -p $(dir $@) && touch $@
 
-$(call gb_NoexPrecompiledHeader_get_timestamp,%) :
-	mkdir -p $(dir $@) && touch $@
-
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 72ec59e..fe665e4 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -148,9 +148,6 @@ gb_Module_get_check_target = $(WORKDIR)/Module/check/$(1)
 gb_Module_get_slowcheck_target = $(WORKDIR)/Module/slowcheck/$(1)
 gb_Module_get_subsequentcheck_target = $(WORKDIR)/Module/subsequentcheck/$(1)
 gb_Module_get_target = $(WORKDIR)/Module/$(1)
-gb_NoexPrecompiledHeader_get_dep_target = $(WORKDIR)/Dep/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR)/$(1).hxx.gch.d
-gb_NoexPrecompiledHeader_get_target = $(WORKDIR)/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR)/$(1).hxx.gch
-gb_NoexPrecompiledHeader_get_timestamp = $(WORKDIR)/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR)/Timestamps/$(1)
 gb_ObjCxxObject_get_target = $(WORKDIR)/ObjCxxObject/$(1).o
 gb_ObjCObject_get_target = $(WORKDIR)/ObjCObject/$(1).o
 gb_Pagein_get_target = $(WORKDIR)/Pagein/$(1)
@@ -273,7 +270,6 @@ $(eval $(call gb_Helper_make_clean_targets,\
 	JunitTest \
 	LinkTarget \
 	Module \
-	NoexPrecompiledHeader \
 	PackagePart \
 	Package \
 	PackageSet \
diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk
index e16ad03..706aa3b 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -199,34 +199,6 @@ $(call gb_Helper_abbreviate_dirs,\
 		)
 endef
 
-# NoexPrecompiledHeader class
-
-ifeq ($(COM_GCC_IS_CLANG),TRUE)
-gb_NoexPrecompiledHeader_get_enableflags = -include-pch $(call gb_NoexPrecompiledHeader_get_target,$(1))
-else
-gb_NoexPrecompiledHeader_get_enableflags = -include $(notdir $(subst .gch,,$(call gb_NoexPrecompiledHeader_get_target,$(1)))) \
-				       -I $(dir $(call gb_NoexPrecompiledHeader_get_target,$(1)))
-endif
-
-gb_NoexPrecompiledHeader_get_objectfile =
-
-define gb_NoexPrecompiledHeader__command
-$(call gb_Output_announce,$(2),$(true),PCH,1)
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) $(dir $(call gb_NoexPrecompiledHeader_get_dep_target,$(2))) && \
-	$(gb_CXX) \
-		-x c++-header \
-		$(4) $(5) \
-		$(gb_COMPILERDEPFLAGS) \
-		$(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
-		$(6) \
-		$(call gb_cxx_dep_generation_options,$(1),$(call gb_NoexPrecompiledHeader_get_dep_target,$(2))) \
-		-c $(patsubst %.cxx,%.hxx,$(3)) \
-		-o$(1) \
-		$(call gb_cxx_dep_copy,$(call gb_NoexPrecompiledHeader_get_dep_target,$(2))) \
-		)
-endef
-
 define gb_Library_get_exports_target
 $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))).exports
 endef
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 25b52c9..b229258 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -120,8 +120,6 @@ gb_LinkTarget_NOEXCEPTIONFLAGS := \
 
 gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS)
 
-gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS := $(gb_LinkTarget_NOEXCEPTIONFLAGS)
-
 # optimization level
 gb_COMPILEROPTFLAGS := $(gb_COMPILERDEFAULTOPTFLAGS)
 gb_COMPILERNOOPTFLAGS := -O0 -fstrict-aliasing -fstrict-overflow
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index dd5ceed..8999838 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -113,29 +113,6 @@ $(call gb_Helper_abbreviate_dirs,\
 		-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj) $(call gb_create_deps,$(call gb_PrecompiledHeader_get_dep_target,$(2)),$(1),$(3))
 endef
 
-# NoexPrecompiledHeader class
-
-gb_NoexPrecompiledHeader_get_enableflags = -Yu$(1).hxx \
-	-FI$(1).hxx \
-	-Fp$(call gb_NoexPrecompiledHeader_get_target,$(1)) \
-	$(gb_PCHWARNINGS)
-
-gb_NoexPrecompiledHeader_get_objectfile = $(1).obj
-
-define gb_NoexPrecompiledHeader__command
-$(call gb_Output_announce,$(2),$(true),PCH,1)
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) $(dir $(call gb_NoexPrecompiledHeader_get_dep_target,$(2))) && \
-	unset INCLUDE && \
-	$(gb_CXX) \
-		$(4) $(5) -Fd$(PDBFILE) \
-		$(gb_COMPILERDEPFLAGS) \
-		-I$(dir $(3)) \
-		$(6) \
-		-c $(3) \
-		-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj) $(call gb_create_deps,$(call gb_NoexPrecompiledHeader_get_dep_target,$(2)),$(1),$(3))
-endef
-
 # AsmObject class
 
 gb_AsmObject_get_source = $(1)/$(2).asm
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index 579e6a9..04748ed 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -229,8 +229,6 @@ gb_LinkTarget_NOEXCEPTIONFLAGS := \
 
 gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS)
 
-gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS := $(gb_LinkTarget_NOEXCEPTIONFLAGS)
-
 gb_LinkTarget_LDFLAGS := \
 	$(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-nologo,) \
 	$(patsubst %,-LIBPATH:%,$(filter-out .,$(subst ;, ,$(subst \,/,$(ILIB))))) \

More information about the Libreoffice-commits mailing list