Author: damjan
Date: Sun Mar 13 05:56:04 2016
New Revision: 1734761
URL: http://svn.apache.org/viewvc?rev=1734761&view=rev
Log:
Merge from branches/gbuild:
* r1409551: gnumake4: Jar.mk: remove unnecessary final target
* r1409552: gnumake4: Deliver.mk: print better diagnostic on error
* r1409553: gnumake4: LinkTarget.mk: remove some unnecessary arguments
BUILDS
Modified:
openoffice/branches/gbuild-reintegration/ (props changed)
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Deliver.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Jar.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/LinkTarget.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/TargetLocations.mk
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 13 05:56:04 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409550
+/incubator/ooo/branches/gbuild:1409313-1409553
/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/Deliver.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Deliver.mk?rev=1734761&r1=1734760&r2=1734761&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Deliver.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Deliver.mk Sun
Mar 13 05:56:04 2016
@@ -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
Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Jar.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Jar.mk?rev=1734761&r1=1734760&r2=1734761&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Jar.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Jar.mk Sun Mar
13 05:56:04 2016
@@ -56,16 +56,10 @@ endef
$(call gb_Jar_get_clean_target,%) : $(call
gb_JavaClassSet_get_clean_target,$(call gb_Jar_get_classsetname,%))
$(call gb_Output_announce,$*,$(false),JAR,3)
$(call gb_Helper_abbreviate_dirs,\
- rm -rf $(dir $(call gb_Jar_get_target,$*)) && \
- rm -f $(call gb_Jar_get_final_target,$*) && \
- rm -f $(call gb_Jar_get_outdir_target,$*))
+ rm -f $(call gb_Jar_get_target,$*) $(call
gb_Jar_get_outdir_target,$*))
-# the final target is a touch target; we use it as registered targets should
be in workdir, not in outdir
# the outdir target depends on the workdir target and is built by delivering
the latter
# the workdir target is created by cd'ing to the target directory and
adding/updating the files
-$(call gb_Jar_get_final_target,%) : $(call gb_Jar_get_outdir_target,%)
- $(call gb_Helper_abbreviate_dirs,\
- touch $@)
# rule for creating the jar file using the command defined above
$(call gb_Jar_get_target,%) : $(call gb_JavaClassSet_get_target,$(call
gb_Jar_get_classsetname,%))
@@ -82,7 +76,7 @@ $(call gb_Jar_get_target,$(1)) : MANIFES
$(call gb_Jar_get_target,$(1)) : JARCLASSPATH :=
$(call gb_Jar_get_target,$(1)) : PACKAGEROOTS :=
$(call gb_JavaClassSet_JavaClassSet,$(call gb_Jar_get_classsetname,$(1)),$(2))
-$(eval $(call gb_Module_register_target,$(call
gb_Jar_get_final_target,$(1)),$(call gb_Jar_get_clean_target,$(1))))
+$(eval $(call gb_Module_register_target,$(call
gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_clean_target,$(1))))
$(call gb_Deliver_add_deliverable,$(call gb_Jar_get_outdir_target,$(1)),$(call
gb_Jar_get_target,$(1)),$(1))
$(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Jar_get_target,$(1))
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=1734761&r1=1734760&r2=1734761&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/LinkTarget.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/LinkTarget.mk
Sun Mar 13 05:56:04 2016
@@ -44,11 +44,11 @@ endif
define gb_CObject__rules
$$(call gb_CObject_get_target,%) : $$(call gb_CObject_get_source,$(1),%)
- $$(call gb_CObject__command,$$@,$$*,$$<,$$(DEFS),$$(CFLAGS),$$(INCLUDE))
+ $$(call gb_CObject__command,$$@,$$*,$$<)
ifeq ($(gb_FULLDEPS),$(true))
$$(call gb_CObject_get_dep_target,%) : $$(call gb_CObject_get_source,$(1),%)
- $$(call
gb_CObject__command_dep,$$@,$$*,$$<,$$(DEFS),$$(CFLAGS),$$(INCLUDE))
+ $$(call gb_CObject__command_dep,$$@,$$*,$$<)
endif
endef
@@ -188,11 +188,11 @@ endif
define gb_ObjCxxObject__rules
$$(call gb_ObjCxxObject_get_target,%) : $$(call
gb_ObjCxxObject_get_source,$(1),%)
- $$(call
gb_ObjCxxObject__command,$$@,$$*,$$<,$$(DEFS),$$(OBJCXXFLAGS),$$(INCLUDE_STL)
$$(INCLUDE))
+ $$(call gb_ObjCxxObject__command,$$@,$$*,$$<)
ifeq ($(gb_FULLDEPS),$(true))
$$(call gb_ObjCxxObject_get_dep_target,%) : $$(call
gb_ObjCxxObject_get_source,$(1),%)
- $$(call
gb_ObjCxxObject__command_dep,$$@,$$*,$$<,$$(DEFS),$$(OBJCXXFLAGS),$$(INCLUDE_STL)
$$(INCLUDE))
+ $$(call gb_ObjCxxObject__command_dep,$$@,$$*,$$<)
endif
endef
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=1734761&r1=1734760&r2=1734761&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/TargetLocations.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/TargetLocations.mk
Sun Mar 13 05:56:04 2016
@@ -57,7 +57,6 @@ gb_Executable_get_external_headers_targe
gb_Executable_get_headers_target = $(WORKDIR)/Headers/Executable/$(1)
gb_GoogleTest_get_target = $(WORKDIR)/GoogleTest/$(1).test
gb_Jar_get_target = $(WORKDIR)/Jar/$(1).jar
-gb_Jar_get_final_target = $(WORKDIR)/Jar/$(1).done
gb_Jar_get_classsetname = Jar/$(1)
gb_JavaClassSet_get_classdir = $(WORKDIR)/JavaClassSet/$(1)
gb_JavaClassSet_get_repo_target = $(WORKDIR)/JavaClassSet/$(2)/$(1).done
