You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/11/15 00:30:03 UTC
svn commit: r1409552 -
/incubator/ooo/branches/gbuild/main/solenv/gbuild/Deliver.mk
Author: arist
Date: Wed Nov 14 23:30:03 2012
New Revision: 1409552
URL: http://svn.apache.org/viewvc?rev=1409552&view=rev
Log:
gnumake4_055_a016e9618f3d.patch
# HG changeset patch
# User Michael Stahl <ms...@openoffice.org>
# Date 1302178164 0
# Node ID a016e9618f3d9f823642b74f61639286aa42a630
# Parent 1e9ce815719e1153d9378f57e781fb34af852a9f
gnumake4: Deliver.mk: print better diagnostic on error
Modified:
incubator/ooo/branches/gbuild/main/solenv/gbuild/Deliver.mk
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/Deliver.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/Deliver.mk?rev=1409552&r1=1409551&r2=1409552&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/Deliver.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/Deliver.mk Wed Nov 14 23:30:03 2012
@@ -55,15 +55,21 @@ endif
endef
ifeq ($(strip $(gb_Deliver_GNUCOPY)),)
-define gb_Deliver_deliver
+define gb_Deliver__deliver
mkdir -p $(dir $(2)) && $(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) cp -f $(1) $(2) && touch -r $(1) $(2)
endef
else
-define gb_Deliver_deliver
+define gb_Deliver__deliver
mkdir -p $(dir $(2)) && $(gb_Deliver_GNUCOPY) $(if $(gb_Deliver_CLEARONDELIVER),--remove-destination) --force --preserve=timestamps $(1) $(2)
endef
endif
+define gb_Deliver_deliver
+$(if $(1),$(call gb_Deliver__deliver,$(1),$(2)),\
+ $(error gb_Deliver_deliver:\
+ file does not exist in solver, and cannot be delivered: $(2)))
+endef
+
# We are currently only creating a deliver.log, if only one module gets build.
# As it is possible to add gbuild modules into other (which is done for example for