You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2016/03/15 01:02:02 UTC
svn commit: r1735004 - in /openoffice/branches/gbuild-reintegration: ./
main/solenv/gbuild/ main/solenv/gbuild/platform/ main/sw/ main/sw/inc/
main/sw/source/filter/basflt/
Author: damjan
Date: Tue Mar 15 00:02:01 2016
New Revision: 1735004
URL: http://svn.apache.org/viewvc?rev=1735004&view=rev
Log:
Merge from branches/gbuild:
* r1409587: gnumake4: #i117845#: sw: do not link objects into two libraries
* r1409589: gnumake4: #i117845#: LinkTarget.mk: fix dep-files for GenCxxObjects:
pass the dep-file target explicitly as a parameter to the Object__commands.
* r1409590: gnumake4: #i117845#: LinkTarget.mk: refactor dep-files:
introduce dependency from object dep-file to object.
* r1409591: gnumake4: #i117845#: LinkTarget.mk: remove debug stuff
Also ported changes to FreeBSD and OS/2.
BUILDS
Build updates by: me
Added:
openoffice/branches/gbuild-reintegration/main/sw/inc/swddllapi.h
- copied unchanged from r1409587, incubator/ooo/branches/gbuild/main/sw/inc/swddllapi.h
Modified:
openoffice/branches/gbuild-reintegration/ (props changed)
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/LinkTarget.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/TargetLocations.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/freebsd.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/linux.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/macosx.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/os2.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/solaris.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/windows.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/winmingw.mk
openoffice/branches/gbuild-reintegration/main/sw/Library_sw.mk
openoffice/branches/gbuild-reintegration/main/sw/Library_swd.mk
openoffice/branches/gbuild-reintegration/main/sw/Library_swui.mk
openoffice/branches/gbuild-reintegration/main/sw/inc/iodetect.hxx
openoffice/branches/gbuild-reintegration/main/sw/source/filter/basflt/iodetect.cxx
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 15 00:02:01 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409579,1409582,1409584,1409586,1409592,1409598-1409600,1409602,1409604-1409605
+/incubator/ooo/branches/gbuild:1409313-1409579,1409582,1409584,1409586-1409587,1409589-1409592,1409598-1409600,1409602,1409604-1409605
/openoffice/branches/AOO400:1503684
/openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
/openoffice/branches/alg_writerframes:1556289-1579189
Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/LinkTarget.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/LinkTarget.mk?rev=1735004&r1=1735003&r2=1735004&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/LinkTarget.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/LinkTarget.mk Tue Mar 15 00:02:01 2016
@@ -40,33 +40,41 @@ OBJCXXFLAGS ?= $(gb_COMPILEROPTFLAGS)
endif
-# CObject class
-
-gb_CObject_REPOS := $(gb_REPOS)
-
-gb_CObject_get_source = $(1)/$(2).c
-# defined by platform
-# gb_CObject__command
+# For every object there is a dep file (if gb_FULLDEPS is active).
+# The dep file depends on the object: the Object__command also updates the
+# dep file as a side effect.
+# In the dep file rule just touch it so it's newer than the object.
-# this rule generates an "always rebuild" dep file, to have something to include.
-# the dep file will be overridden on the fly, when the object is compiled
+# The gb_Object__command_dep generates an "always rebuild" dep file;
+# It is _only_ used in case the user deletes the object dep file.
ifeq ($(gb_FULLDEPS),$(true))
-define gb_CObject__command_dep
+define gb_Object__command_dep
mkdir -p $(dir $(1)) && \
- echo '$(call gb_CObject_get_target,$(2)) : $$(gb_Helper_PHONY)' > $(1)
+ echo '$(2) : $$(gb_Helper_PHONY)' > $(1)
endef
else
-gb_CObject__command_dep =
+gb_Object__command_dep = \
+ $(call gb_Output_error,gb_Object__command_dep is only for gb_FULLDEPS)
endif
+
+# CObject class
+
+gb_CObject_REPOS := $(gb_REPOS)
+
+gb_CObject_get_source = $(1)/$(2).c
+# defined by platform
+# gb_CObject__command
+
define gb_CObject__rules
$$(call gb_CObject_get_target,%) : $$(call gb_CObject_get_source,$(1),%)
- $$(call gb_CObject__command,$$@,$$*,$$<)
+ $$(call gb_CObject__command,$$@,$$*,$$<,$$(call gb_CObject_get_dep_target,$$*))
ifeq ($(gb_FULLDEPS),$(true))
-$$(call gb_CObject_get_dep_target,%) : $$(call gb_CObject_get_source,$(1),%)
- $$(call gb_CObject__command_dep,$$@,$$*,$$<)
+$$(call gb_CObject_get_dep_target,%) : $$(call gb_CObject_get_target,%)
+ $$(if $$(wildcard $$@),touch $$@,\
+ $$(call gb_Object__command_dep,$$@,$$(call gb_CObject_get_target,$$*)))
endif
endef
@@ -87,19 +95,6 @@ gb_CxxObject_get_source = $(1)/$(2).cxx
# defined by platform
# gb_CxxObject__command
-# This rule generates an "always rebuild" dep file, to have something to
-# include. The dep file will be overridden on the fly, when the object is
-# compiled.
-ifeq ($(gb_FULLDEPS),$(true))
-define gb_CxxObject__command_dep
-mkdir -p $(dir $(1)) && \
- echo '$(call gb_CxxObject_get_target,$(2)) : $$(gb_Helper_PHONY)' > $(1)
-
-endef
-else
-gb_CxxObject__command_dep =
-endif
-
# Only enable PCH if the PCH_CXXFLAGS and the PCH_DEFS (from the linktarget)
# are the same as the T_CXXFLAGS and DEFS we want to use for this object. This
# should usually be the case. The DEFS/T_CXXFLAGS would have too be manually
@@ -131,12 +126,13 @@ endef
define gb_CxxObject__rules
$$(call gb_CxxObject_get_target,%) : $$(call gb_CxxObject_get_source,$(1),%)
$$(eval $$(gb_CxxObject__set_pchflags))
- $$(call gb_CxxObject__command,$$@,$$*,$$<)
+ $$(call gb_CxxObject__command,$$@,$$*,$$<,$$(call gb_CxxObject_get_dep_target,$$*))
ifeq ($(gb_FULLDEPS),$(true))
-$$(call gb_CxxObject_get_dep_target,%) : $$(call gb_CxxObject_get_source,$(1),%)
- $$(eval $$(gb_CxxObject__set_pchflags))
- $$(call gb_CxxObject__command_dep,$$@,$$*,$$<)
+$$(call gb_CxxObject_get_dep_target,%) : $$(call gb_CxxObject_get_target,%)
+ $$(if $$(wildcard $$@),touch $$@,\
+ $$(eval $$(gb_CxxObject__set_pchflags))\
+ $$(call gb_Object__command_dep,$$@,$$(call gb_CxxObject_get_target,$$*)))
endif
endef
@@ -158,27 +154,13 @@ gb_GenCxxObject_get_source = $(WORKDIR)/
# defined by platform
# gb_CxxObject__command
-# This rule generates an "always rebuild" dep file, to have something to
-# include. The dep file will be overridden on the fly, when the object is
-# compiled.
-ifeq ($(gb_FULLDEPS),$(true))
-define gb_GenCxxObject__command_dep
-mkdir -p $(dir $(1)) && \
- echo '$(call gb_GenCxxObject_get_target,$(2)) : $$(gb_Helper_PHONY)' > $(1)
-endef
-else
-gb_GenCxxObject__command_dep =
-endif
-
$(call gb_GenCxxObject_get_target,%) : $(call gb_GenCxxObject_get_source,%)
- $(call gb_CxxObject__command,$@,$*,$<)
+ $(call gb_CxxObject__command,$@,$*,$<,$(call gb_GenCxxObject_get_dep_target,$*))
ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_GenCxxObject_get_dep_target,%) : $(call gb_GenCxxObject_get_source,%)
- $(call gb_GenCxxObject__command_dep,$@,$*,$<)
-
-$(call gb_GenCxxObject_get_dep_target,%) :
- $(eval $(call gb_Output_error,Unable to find generated C++ file $(call gb_GenCxxObject_get_source,$*) in WORKDIR.))
+$(call gb_GenCxxObject_get_dep_target,%) : $(call gb_GenCxxObject_get_target,%)
+ $(if $(wildcard $@),touch $@,\
+ $(call gb_Object__command_dep,$@,$(call gb_GenCxxObject_get_target,$*)))
endif
gb_GenCxxObject_GenCxxObject =
@@ -192,25 +174,14 @@ gb_ObjCxxObject_get_source = $(1)/$(2).m
# defined by platform
# gb_ObjCxxObject__command
-# this rule generates an "always rebuild" dep file, to have something to include.
-# the dep file will be overridden on the fly, when the object is compiled
-ifeq ($(gb_FULLDEPS),$(true))
-define gb_ObjCxxObject__command_dep
-mkdir -p $(dir $(1)) && \
- echo '$(call gb_ObjCxxObject_get_target,$(2)) : $$(gb_Helper_PHONY)' > $(1)
-
-endef
-else
-gb_ObjCxxObject__command_dep =
-endif
-
define gb_ObjCxxObject__rules
$$(call gb_ObjCxxObject_get_target,%) : $$(call gb_ObjCxxObject_get_source,$(1),%)
- $$(call gb_ObjCxxObject__command,$$@,$$*,$$<)
+ $$(call gb_ObjCxxObject__command,$$@,$$*,$$<,$$(call gb_ObjCxxObject_get_dep_target,$$*))
ifeq ($(gb_FULLDEPS),$(true))
-$$(call gb_ObjCxxObject_get_dep_target,%) : $$(call gb_ObjCxxObject_get_source,$(1),%)
- $$(call gb_ObjCxxObject__command_dep,$$@,$$*,$$<)
+$$(call gb_ObjCxxObject_get_dep_target,%) : $$(call gb_ObjCxxObject_get_target,%)
+ $$(if $$(wildcard $$@),touch $$@,\
+ $$(call gb_Object__command_dep,$$@,$$(call gb_ObjCxxObject_get_target,$$*)))
endif
endef
@@ -385,11 +356,7 @@ $(call gb_LinkTarget_get_target,$(1)) :
$(call gb_LinkTarget_get_target,$(1)) : NATIVERES :=
ifeq ($(gb_FULLDEPS),$(true))
-ifneq ($(wildcard $(call gb_LinkTarget_get_dep_target,$(1))),)
-include $(call gb_LinkTarget_get_dep_target,$(1))
-else
-$(firstword $(MAKEFILE_LIST)) : $(call gb_LinkTarget_get_dep_target,$(1))
-endif
+-include $(call gb_LinkTarget_get_dep_target,$(1))
$(call gb_LinkTarget_get_dep_target,$(1)) : COBJECTS :=
$(call gb_LinkTarget_get_dep_target,$(1)) : CXXOBJECTS :=
$(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXOBJECTS :=
Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/TargetLocations.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/TargetLocations.mk?rev=1735004&r1=1735003&r2=1735004&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/TargetLocations.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/TargetLocations.mk Tue Mar 15 00:02:01 2016
@@ -140,13 +140,12 @@ $(eval $(call gb_Helper_make_dep_targets
CObject \
CxxObject \
ObjCxxObject \
+ GenCxxObject \
LinkTarget \
SrsPartTarget \
SrsTarget \
UnoApiTarget \
))
-# needs to use same dep target because we use gb_CxxObject__command
-gb_GenCxxObject_get_dep_target = $(gb_CxxObject_get_dep_target)
# other getters
Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/freebsd.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/freebsd.mk?rev=1735004&r1=1735003&r2=1735004&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/freebsd.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/freebsd.mk Tue Mar 15 00:02:01 2016
@@ -165,18 +165,18 @@ endef
# CObject class
+# $(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,\
- mkdir -p $(dir $(1)) && \
- mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \
+ mkdir -p $(dir $(1)) $(dir $(4)) && \
$(gb_CC) \
$(DEFS) \
$(T_CFLAGS) \
-c $(3) \
-o $(1) \
- -MMD -MT $(call gb_CObject_get_target,$(2)) \
- -MF $(call gb_CObject_get_dep_target,$(2)) \
+ -MMD -MT $(1) \
+ -MF $(4) \
-I$(dir $(3)) \
$(INCLUDE))
endef
@@ -190,18 +190,18 @@ 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,\
- mkdir -p $(dir $(1)) && \
- mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \
+ mkdir -p $(dir $(1)) $(dir $(4)) && \
$(gb_CXX) \
$(DEFS) \
$(T_CXXFLAGS) \
-c $(3) \
-o $(1) \
- -MMD -MT $(call gb_CxxObject_get_target,$(2)) \
- -MF $(call gb_CxxObject_get_dep_target,$(2)) \
+ -MMD -MT $(1) \
+ -MF $(4) \
-I$(dir $(3)) \
$(INCLUDE_STL) $(INCLUDE))
endef
Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/linux.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/linux.mk?rev=1735004&r1=1735003&r2=1735004&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/linux.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/linux.mk Tue Mar 15 00:02:01 2016
@@ -160,18 +160,18 @@ endef
# CObject class
+# $(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,\
- mkdir -p $(dir $(1)) && \
- mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \
+ mkdir -p $(dir $(1)) $(dir $(4)) && \
$(gb_CC) \
$(DEFS) \
$(T_CFLAGS) \
-c $(3) \
-o $(1) \
- -MMD -MT $(call gb_CObject_get_target,$(2)) \
- -MF $(call gb_CObject_get_dep_target,$(2)) \
+ -MMD -MT $(1) \
+ -MF $(4) \
-I$(dir $(3)) \
$(INCLUDE))
endef
@@ -185,18 +185,18 @@ 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,\
- mkdir -p $(dir $(1)) && \
- mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \
+ mkdir -p $(dir $(1)) $(dir $(4)) && \
$(gb_CXX) \
$(DEFS) \
$(T_CXXFLAGS) \
-c $(3) \
-o $(1) \
- -MMD -MT $(call gb_CxxObject_get_target,$(2)) \
- -MF $(call gb_CxxObject_get_dep_target,$(2)) \
+ -MMD -MT $(1) \
+ -MF $(4) \
-I$(dir $(3)) \
$(INCLUDE_STL) $(INCLUDE))
endef
Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/macosx.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/macosx.mk?rev=1735004&r1=1735003&r2=1735004&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/macosx.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/macosx.mk Tue Mar 15 00:02:01 2016
@@ -171,15 +171,14 @@ endef
define gb_CObject__command
$(call gb_Output_announce,$(2),$(true),C ,3)
$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $(1)) && \
- mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \
+ mkdir -p $(dir $(1)) $(dir $(4)) && \
$(gb_CC) \
$(DEFS) \
$(T_CFLAGS) \
-c $(3) \
-o $(1) \
- -MMD -MT $(call gb_CObject_get_target,$(2)) \
- -MF $(call gb_CObject_get_dep_target,$(2)) \
+ -MMD -MT $(1) \
+ -MF $(4) \
-I$(dir $(3)) \
$(INCLUDE))
endef
@@ -191,15 +190,14 @@ endef
define gb_CxxObject__command
$(call gb_Output_announce,$(2),$(true),CXX,3)
$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $(1)) && \
- mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \
+ mkdir -p $(dir $(1)) $(dir $(4)) && \
$(gb_CXX) \
$(DEFS) \
$(T_CXXFLAGS) \
-c $(3) \
-o $(1) \
- -MMD -MT $(call gb_CxxObject_get_target,$(2)) \
- -MF $(call gb_CxxObject_get_dep_target,$(2)) \
+ -MMD -MT $(1) \
+ -MF $(4) \
-I$(dir $(3)) \
$(INCLUDE_STL) $(INCLUDE))
endef
@@ -210,15 +208,14 @@ endef
define gb_ObjCxxObject__command
$(call gb_Output_announce,$(2),$(true),OCX,3)
$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $(1)) && \
- mkdir -p $(dir $(call gb_ObjCxxObject_get_dep_target,$(2))) && \
+ mkdir -p $(dir $(1)) $(dir $(4)) && \
$(gb_CXX) \
$(DEFS) \
$(T_OBJCXXFLAGS) \
-c $(3) \
-o $(1) \
- -MMD -MT $(call gb_ObjCxxObject_get_target,$(2)) \
- -MF $(call gb_ObjCxxObject_get_dep_target,$(2)) \
+ -MMD -MT $(1) \
+ -MF $(4) \
-I$(dir $(3)) \
$(INCLUDE_STL) $(INCLUDE))
endef
Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/os2.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/os2.mk?rev=1735004&r1=1735003&r2=1735004&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/os2.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/os2.mk Tue Mar 15 00:02:01 2016
@@ -163,18 +163,18 @@ endef
# CObject class
+# $(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,\
- mkdir -p $(dir $(1)) && \
- mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \
+ mkdir -p $(dir $(1)) $(dir $(4)) && \
$(gb_CC) \
$(DEFS) \
$(T_CFLAGS) \
-c $(3) \
-o $(1) \
- -MMD -MT $(call gb_CObject_get_target,$(2)) \
- -MF $(call gb_CObject_get_dep_target,$(2)) \
+ -MMD -MT $(1) \
+ -MF $(4) \
-I$(dir $(3)) \
$(INCLUDE))
endef
@@ -182,18 +182,18 @@ 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,\
- mkdir -p $(dir $(1)) && \
- mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \
+ mkdir -p $(dir $(1)) $(dir $(4)) && \
$(gb_CXX) \
$(DEFS) \
$(T_CXXFLAGS) \
-c $(3) \
-o $(1) \
- -MMD -MT $(call gb_CxxObject_get_target,$(2)) \
- -MF $(call gb_CxxObject_get_dep_target,$(2)) \
+ -MMD -MT $(1) \
+ -MF $(4) \
-I$(dir $(3)) \
$(INCLUDE_STL) $(INCLUDE))
endef
Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/solaris.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/solaris.mk?rev=1735004&r1=1735003&r2=1735004&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/solaris.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/solaris.mk Tue Mar 15 00:02:01 2016
@@ -147,14 +147,13 @@ endef
define gb_CObject__command
$(call gb_Output_announce,$(2),$(true),C ,3)
$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $(1)) && \
- rm -f $(call gb_CObject_get_dep_target,$(2)) && \
- mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \
+ rm -f $(4) && \
+ mkdir -p $(dir $(1)) $(dir $(4)) && \
$(gb_CC) \
-c $(3) \
-o $(1) \
-xMMD \
- -xMF $(call gb_CObject_get_dep_target,$(2)) \
+ -xMF $(4) \
$(DEFS) \
$(T_CFLAGS) \
-I$(dir $(3)) \
@@ -167,15 +166,14 @@ endef
define gb_CxxObject__command
$(call gb_Output_announce,$(2),$(true),CXX,3)
$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $(1)) && \
- mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \
+ mkdir -p $(dir $(1)) $(dir $(4)) && \
$(gb_CXX) \
$(DEFS) \
$(T_CXXFLAGS) \
-c $(3) \
-o $(1) \
-xMMD \
- -xMF $(call gb_CxxObject_get_dep_target,$(2)) \
+ -xMF $(4) \
-I$(dir $(3)) \
$(INCLUDE_STL) $(INCLUDE))
endef
Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/windows.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/windows.mk?rev=1735004&r1=1735003&r2=1735004&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/windows.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/windows.mk Tue Mar 15 00:02:01 2016
@@ -248,7 +248,7 @@ endef
# CObject class
ifeq ($(gb_FULLDEPS),$(true))
-define gb_CObject__command_deponcompile
+define gb_Object__command_deponcompile
$(call gb_Helper_abbreviate_dirs_native,\
$(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
$(filter-out -DPRECOMPILED_HEADERS,$(4)) $(5) \
@@ -262,16 +262,16 @@ $(call gb_Helper_abbreviate_dirs_native,
-v WORKDIR=$(WORKDIR)/ \
-v SRCDIR=$(SRCDIR)/ \
-v REPODIR=$(REPODIR)/ \
- > $(call gb_CObject_get_dep_target,$(2)))
+ > $(2))
endef
else
-CObject__command_deponcompile =
+gb_Object__command_deponcompile =
endif
define gb_CObject__command
$(call gb_Output_announce,$(2),$(true),C ,3)
$(call gb_Helper_abbreviate_dirs_native,\
- mkdir -p $(dir $(1)) && \
+ mkdir -p $(dir $(1)) $(dir $(4)) && \
unset INCLUDE && \
$(gb_CC) \
$(DEFS) \
@@ -282,37 +282,16 @@ $(call gb_Helper_abbreviate_dirs_native,
$(INCLUDE) \
-c $(3) \
-Fo$(1))
-$(call gb_CObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(T_CFLAGS),$(INCLUDE))
+$(call gb_Object__command_deponcompile,$(1),$(4),$(3),$(DEFS),$(T_CFLAGS),$(INCLUDE))
endef
# CxxObject class
-ifeq ($(gb_FULLDEPS),$(true))
-define gb_CxxObject__command_deponcompile
-$(call gb_Helper_abbreviate_dirs_native,\
- $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
- $(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)/ \
- > $(call gb_CxxObject_get_dep_target,$(2)))
- endef
-else
-gb_CxxObject__command_deponcompile =
-endif
-
define gb_CxxObject__command
$(call gb_Output_announce,$(2),$(true),CXX,3)
$(call gb_Helper_abbreviate_dirs_native,\
- mkdir -p $(dir $(1)) && \
+ mkdir -p $(dir $(1)) $(dir $(4)) && \
unset INCLUDE && \
$(gb_CXX) \
$(DEFS) \
@@ -323,7 +302,7 @@ $(call gb_Helper_abbreviate_dirs_native,
$(INCLUDE_STL) $(INCLUDE) \
-c $(3) \
-Fo$(1))
-$(call gb_CxxObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(CFLAGS),$(INCLUDE))
+$(call gb_Object__command_deponcompile,$(1),$(4),$(3),$(DEFS),$(T_CXXFLAGS),$(INCLUDE))
endef
Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/winmingw.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/winmingw.mk?rev=1735004&r1=1735003&r2=1735004&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/winmingw.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/winmingw.mk Tue Mar 15 00:02:01 2016
@@ -222,7 +222,7 @@ endef
# CObject class
ifeq ($(gb_FULLDEPS),$(true))
-define gb_CObject__command_deponcompile
+define gb_Object__command_deponcompile
$(call gb_Helper_abbreviate_dirs_native,\
$(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
$(filter-out -DPRECOMPILED_HEADERS,$(4)) $(5) \
@@ -236,10 +236,10 @@ $(call gb_Helper_abbreviate_dirs_native,
-v WORKDIR=$(WORKDIR)/ \
-v SRCDIR=$(SRCDIR)/ \
-v REPODIR=$(REPODIR)/ \
- > $(call gb_CObject_get_dep_target,$(2)))
+ > $(2))
endef
else
-CObject__command_deponcompile =
+gb_Object__command_deponcompile =
endif
define gb_CObject__command
@@ -253,34 +253,13 @@ $(call gb_Helper_abbreviate_dirs_native,
-o $(1) \
-I$(dir $(3)) \
$(INCLUDE))
-$(call gb_CObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(T_CFLAGS),$(INCLUDE))
+$(call gb_Object__command_deponcompile,$(1),$(4),$(3),$(DEFS),$(T_CFLAGS),$(INCLUDE))
endef
# CxxObject class
-ifeq ($(gb_FULLDEPS),$(true))
-define gb_CxxObject__command_deponcompile
-$(call gb_Helper_abbreviate_dirs_native,\
- $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
- $(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)/ \
- > $(call gb_CxxObject_get_dep_target,$(2)))
-endef
-else
-gb_CxxObject__command_deponcompile =
-endif
-
define gb_CxxObject__command
$(call gb_Output_announce,$(2),$(true),CXX,3)
$(call gb_Helper_abbreviate_dirs_native,\
@@ -292,7 +271,7 @@ $(call gb_Helper_abbreviate_dirs_native,
-o $(1) \
-I$(dir $(3)) \
$(INCLUDE_STL) $(INCLUDE))
-$(call gb_CxxObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(T_CXXFLAGS),$(INCLUDE_STL) $(INCLUDE))
+$(call gb_Object__command_deponcompile,$(1),$(4),$(3),$(DEFS),$(T_CXXFLAGS),$(INCLUDE_STL) $(INCLUDE))
endef
Modified: openoffice/branches/gbuild-reintegration/main/sw/Library_sw.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sw/Library_sw.mk?rev=1735004&r1=1735003&r2=1735004&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sw/Library_sw.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/sw/Library_sw.mk Tue Mar 15 00:02:01 2016
@@ -71,6 +71,7 @@ $(eval $(call gb_Library_add_linked_libs
svt \
svx \
svxcore \
+ swd \
ootk \
tl \
ucbhelper \
@@ -476,7 +477,6 @@ $(eval $(call gb_Library_add_exception_o
sw/source/filter/ascii/wrtasc \
sw/source/filter/basflt/docfact \
sw/source/filter/basflt/fltini \
- sw/source/filter/basflt/iodetect \
sw/source/filter/basflt/shellio \
sw/source/filter/html/SwAppletImpl \
sw/source/filter/html/css1atr \
Modified: openoffice/branches/gbuild-reintegration/main/sw/Library_swd.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sw/Library_swd.mk?rev=1735004&r1=1735003&r2=1735004&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sw/Library_swd.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/sw/Library_swd.mk Tue Mar 15 00:02:01 2016
@@ -41,6 +41,10 @@ $(eval $(call gb_Library_add_api,swd,\
offapi \
))
+$(eval $(call gb_Library_add_defs,swd,\
+ -DSWD_DLLIMPLEMENTATION \
+))
+
$(eval $(call gb_Library_add_linked_libs,swd,\
comphelper \
cppu \
@@ -59,7 +63,6 @@ $(eval $(call gb_Library_add_linked_libs
))
$(eval $(call gb_Library_add_exception_objects,swd,\
- sw/source/core/except/errhdl \
sw/source/filter/basflt/iodetect \
sw/source/ui/uno/detreg \
sw/source/ui/uno/swdet2 \
Modified: openoffice/branches/gbuild-reintegration/main/sw/Library_swui.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sw/Library_swui.mk?rev=1735004&r1=1735003&r2=1735004&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sw/Library_swui.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/sw/Library_swui.mk Tue Mar 15 00:02:01 2016
@@ -56,6 +56,7 @@ $(eval $(call gb_Library_add_linked_libs
svx \
svxcore \
sw \
+ swd \
ootk \
tl \
ucbhelper \
Modified: openoffice/branches/gbuild-reintegration/main/sw/inc/iodetect.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sw/inc/iodetect.hxx?rev=1735004&r1=1735003&r2=1735004&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sw/inc/iodetect.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sw/inc/iodetect.hxx Tue Mar 15 00:02:01 2016
@@ -30,7 +30,7 @@
#include <osl/endian.h>
#include <errhdl.hxx> // for ASSERT
#include <tools/string.hxx>
-#include <swdllapi.h>
+#include <swddllapi.h>
#define FILTER_RTF "RTF" // RTF-Filter
#define sRtfWH "WH_RTF"
@@ -82,7 +82,7 @@ enum ReaderWriterEnum {
MAXFILTER
};
-extern SwIoDetect aFilterDetect[];
+extern SWD_DLLPUBLIC SwIoDetect aFilterDetect[];
// Die folgende Klasse ist ein Wrappe fuer die Basic-I/O-Funktionen
// des Writer 3.0. Alles ist statisch. Alle u.a. Filternamen sind die
@@ -93,13 +93,15 @@ class SwIoSystem
{
public:
// suche ueber den internen FormatNamen den Filtereintrag
- SW_DLLPUBLIC static const SfxFilter* GetFilterOfFormat( const String& rFormat,
+ SWD_DLLPUBLIC static const SfxFilter*
+ GetFilterOfFormat( const String& rFormat,
const SfxFilterContainer* pCnt = 0 );
// Feststellen des zu verwendenden Filters fuer die uebergebene
// Datei. Der Filtername wird zurueckgeliefert. Konnte kein Filter
// zurueckgeliefert werden, wird der Name des ASCII-Filters geliefert!
- static const SfxFilter* GetFileFilter( const String& rFileName,
+ SWD_DLLPUBLIC static const SfxFilter*
+ GetFileFilter( const String& rFileName,
const String& rPrefFltName,
SfxMedium* pMedium = 0 );
@@ -111,13 +113,15 @@ public:
static sal_Bool IsValidStgFilter( SotStorage& , const SfxFilter& );
static sal_Bool IsValidStgFilter( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const SfxFilter& rFilter);
- static bool IsDetectableText( const sal_Char* pBuf, sal_uLong &rLen,
+ SWD_DLLPUBLIC static bool
+ IsDetectableText( const sal_Char* pBuf, sal_uLong &rLen,
CharSet *pCharSet=0, bool *pSwap=0, LineEnd *pLineEnd=0, bool bEncodedFilter = false );
// static bool IsDetectableW4W(const String& rFileName, const String& rUserData);
static const SfxFilter* GetTextFilter( const sal_Char* pBuf, sal_uLong nLen );
- static const String GetSubStorageName( const SfxFilter& rFltr );
+ SWD_DLLPUBLIC static const String
+ GetSubStorageName( const SfxFilter& rFltr );
};
#endif
Modified: openoffice/branches/gbuild-reintegration/main/sw/source/filter/basflt/iodetect.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sw/source/filter/basflt/iodetect.cxx?rev=1735004&r1=1735003&r2=1735004&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sw/source/filter/basflt/iodetect.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sw/source/filter/basflt/iodetect.cxx Tue Mar 15 00:02:01 2016
@@ -197,9 +197,9 @@ sal_Bool SwIoSystem::IsValidStgFilter(So
void TerminateBuffer(sal_Char *pBuffer, sal_uLong nBytesRead, sal_uLong nBufferLen)
{
- ASSERT(nBytesRead <= nBufferLen - 2,
+ OSL_ENSURE(nBytesRead <= nBufferLen - 2,
"what you read must be less than the max + null termination");
- ASSERT(!(nBufferLen & 0x00000001), "nMaxReadBuf must be an even number");
+ OSL_ENSURE(!(nBufferLen & 0x00000001),"nMaxReadBuf must be an even number");
if (nBytesRead <= nBufferLen - 2)
{
pBuffer[nBytesRead] = '\0';