Kaydet (Commit) 07c0b800 authored tarafından Michael Stahl's avatar Michael Stahl

fix spurious re-delivery of RDB files:

The OUTDIR RDB depends on Packages for IDL and headers, the latter of
which depends on the WORKDIR RDB, hence preserving timestamps here leads
to spurious re-delivery because the OUTDIR RDB always has older
timestamp than the headers Package.
üst 0b1e380e
...@@ -30,6 +30,14 @@ $(call gb_UnoApi_get_clean_target,%) : ...@@ -30,6 +30,14 @@ $(call gb_UnoApi_get_clean_target,%) :
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_UnoApi_get_target,$*)) rm -f $(call gb_UnoApi_get_target,$*))
# override the rule from Package.mk:44:
# preserving timestamps is not desirable here, because the OUTDIR target
# depends on package targets _inc and _idl, and those depend on the WORKDIR
# target, so with timestamps preserved the RDB always gets delivered again
$(call gb_UnoApi_get_target,%) : $(call gb_UnoApiTarget_get_target,%)
$(gb_Deliver_GNUCOPY) $(if $(gb_Deliver_CLEARONDELIVER),--remove-destination) --no-dereference --force $< $@
define gb_UnoApi_UnoApi define gb_UnoApi_UnoApi
$(call gb_UnoApiTarget_UnoApiTarget,$(1)) $(call gb_UnoApiTarget_UnoApiTarget,$(1))
$(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1)) $(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1))
......
...@@ -285,6 +285,7 @@ include $(SOLARENV)/inc/minor.mk ...@@ -285,6 +285,7 @@ include $(SOLARENV)/inc/minor.mk
# For example: # For example:
# $(OUTDIR)/bin/% for executables collides # $(OUTDIR)/bin/% for executables collides
# with $(OUTDIR)/bin/%.res for resources on unix # with $(OUTDIR)/bin/%.res for resources on unix
# with $(OUTDIR)/bin/%.rdb for UnoApi
# $(OUTDIR)/lib/%.lib collides # $(OUTDIR)/lib/%.lib collides
# on windows (static and dynamic libs) # on windows (static and dynamic libs)
# $(OUTDIR)/xml/% for packageparts collides # $(OUTDIR)/xml/% for packageparts collides
...@@ -303,6 +304,7 @@ include $(foreach class, \ ...@@ -303,6 +304,7 @@ include $(foreach class, \
StaticLibrary \ StaticLibrary \
Executable \ Executable \
SdiTarget \ SdiTarget \
UnoApi \
Package \ Package \
CustomTarget \ CustomTarget \
ExternalLib \ ExternalLib \
...@@ -315,7 +317,6 @@ include $(foreach class, \ ...@@ -315,7 +317,6 @@ include $(foreach class, \
JunitTest \ JunitTest \
Module \ Module \
UnoApiTarget \ UnoApiTarget \
UnoApi \
UnoApiMerge \ UnoApiMerge \
InternalUnoApi \ InternalUnoApi \
Zip \ Zip \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment