cli_ure/CliLibrary_cli_basetypes.mk | 2
cli_ure/CliLibrary_cli_ure.mk | 2
cli_ure/CliNativeLibrary_cli_cppuhelper.mk | 2
cli_ure/CliUnoApi_cli_uretypes.mk | 2
solenv/bin/concat-deps.c | 5 ++
solenv/gbuild/CliAssembly.mk | 17 +++----
solenv/gbuild/CliLibrary.mk | 2
solenv/gbuild/CliNativeLibrary.mk | 2
solenv/gbuild/CliUnoApi.mk | 2
solenv/gbuild/Library.mk | 1
solenv/gbuild/LinkTarget.mk | 63 ++++++++++++++++++++++++++++-
solenv/gbuild/TargetLocations.mk | 2
solenv/gbuild/platform/com_MSC_class.mk | 1
unoil/CliUnoApi_oootypes.mk | 2
14 files changed, 86 insertions(+), 19 deletions(-)
New commits:
commit bb9413907cd7bea0feadb7e4e3d44d5078fe5a26
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Nov 24 01:09:58 2017 +0100
tdf#113787: gbuild: fix the version of cli_cppuhelper assembly
There is one usage of gb_Library_add_generated_cxxclrobjects in
the entire repo, and regrettably generated C++/CLR objects
weren't actually implemented in the new build system, so the
assembly.cxx with its generated version number was simply ignored.
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 5b9fb4ea7dd1..b815cad29b67 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -1074,6 +1074,11 @@ off_t size;
created_line = generate_phony_line(src_relative, "o");
rc = generate_phony_file(fn, created_line);
}
+ else if(strncmp(src_relative, "GenCxxClrObject/", 16) == 0)
+ {
+ created_line = generate_phony_line(src_relative, "o");
+ rc = generate_phony_file(fn, created_line);
+ }
else
{
fprintf(stderr, "no magic for %s(%s) in %s\n", fn,
src_relative, work_dir);
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 18b62f2342bd..5166dbe6c390 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -182,6 +182,7 @@ gb_Library_add_objcxxobject = $(call
gb_Library__forward_to_Linktarget,$(subst g
gb_Library_add_objcxxobjects = $(call
gb_Library__forward_to_Linktarget,$(subst gb_Library_,,$(0)),$(1),$(2),$(3))
gb_Library_add_cxxclrobject = $(call gb_Library__forward_to_Linktarget,$(subst
gb_Library_,,$(0)),$(1),$(2),$(3))
gb_Library_add_cxxclrobjects = $(call
gb_Library__forward_to_Linktarget,$(subst gb_Library_,,$(0)),$(1),$(2),$(3))
+gb_Library_add_generated_cxxclrobjects = $(call
gb_Library__forward_to_Linktarget,$(subst gb_Library_,,$(0)),$(1),$(2),$(3))
gb_Library_add_asmobject = $(call gb_Library__forward_to_Linktarget,$(subst
gb_Library_,,$(0)),$(1),$(2),$(3))
gb_Library_add_asmobjects = $(call gb_Library__forward_to_Linktarget,$(subst
gb_Library_,,$(0)),$(1),$(2),$(3))
gb_Library_add_exception_objects = $(call
gb_Library__forward_to_Linktarget,$(subst gb_Library_,,$(0)),$(1),$(2),$(3))
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 6c7bfa09d1f1..cbc9499d6eb8 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -173,9 +173,9 @@ endef
# Overview of dependencies and tasks of LinkTarget
#
# target task depends on
-# LinkTarget linking AsmObject CObject
CxxObject GenCObject GenCxxObject ObjCObject ObjCxxObject CxxClrObject
+# LinkTarget linking AsmObject CObject
CxxObject GenCObject GenCxxObject ObjCObject ObjCxxObject CxxClrObject
GenCxxClrObject
# LinkTarget/headers
-# LinkTarget/dep joined dep file AsmObject/dep
CObject/dep CxxObject/dep GenCObject/dep GenCxxObject/dep ObjCObject/dep
ObjCxxObject/dep CxxClrObject/dep
+# LinkTarget/dep joined dep file AsmObject/dep
CObject/dep CxxObject/dep GenCObject/dep GenCxxObject/dep ObjCObject/dep
ObjCxxObject/dep CxxClrObject/dep GenCxxClrObject/dep
# | LinkTarget/headers
# LinkTarget/headers all headers available
# including own generated
@@ -189,6 +189,8 @@ endef
# ObjCObject objective c compile | LinkTarget/headers
# ObjCxxObject objective c++ compile | LinkTarget/headers
# CxxClrObject C++ CLR compile | LinkTarget/headers
+# GenCxxClrObject C++ CLR compile from | LinkTarget/headers
+# generated source
#
# AsmObject asm compile | LinkTarget
#
@@ -199,6 +201,7 @@ endef
# ObjCObject/dep dependencies
# ObjCxxObject/dep dependencies
# CxxClrObject/dep dependencies
+# GenCxxClrObject/dep dependencies
# AsmObject/dep dependencies
# LinkTarget/headers means gb_LinkTarget_get_headers_target etc.
@@ -350,6 +353,28 @@ $(call gb_GenCxxObject_get_dep_target,%) :
endif
+# GenCxxClrObject class
+
+gb_GenCxxClrObject_get_source =
$(WORKDIR)/$(1).$(gb_LinkTarget_CXX_SUFFIX_$(call
gb_LinkTarget__get_workdir_linktargetname,$(2)))
+
+$(call gb_GenCxxClrObject_get_target,%) : $(gb_FORCE_COMPILE_ALL_TARGET)
+ $(call gb_Output_announce,$(subst
$(BUILDDIR)/,,$(GEN_CXXCLR_SOURCE)),$(true),CLR,3)
+ test -f $(GEN_CXXCLR_SOURCE) || (echo "Missing generated source file
$(GEN_CXXCLR_SOURCE)" && false)
+ $(call gb_CObject__command_pattern,$@,$(T_CXXCLRFLAGS)
$(T_CXXCLRFLAGS_APPEND),$(GEN_CXXCLR_SOURCE),$(call
gb_GenCxxClrObject_get_dep_target,$*),$(COMPILER_PLUGINS))
+
+ifeq ($(gb_FULLDEPS),$(true))
+$(dir $(call gb_GenCxxClrObject_get_dep_target,%)).dir :
+ $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(dir $(call gb_GenCxxClrObject_get_dep_target,%))%/.dir :
+ $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(call gb_GenCxxClrObject_get_dep_target,%) :
+ $(if $(wildcard $@),touch $@)
+
+endif
+
+
# YaccTarget class
# XXX: This is more complicated than necessary, but we cannot just use
@@ -532,6 +557,8 @@ $(WORKDIR)/Clean/LinkTarget/% :
$(foreach object,$(GENCOBJECTS),$(call
gb_GenCObject_get_dep_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_dep_target,$(object))) \
+ $(foreach object,$(GENCXXCLROBJECTS),$(call
gb_GenCxxClrObject_get_target,$(object))) \
+ $(foreach object,$(GENCXXCLROBJECTS),$(call
gb_GenCxxClrObject_get_dep_target,$(object))) \
$(call gb_LinkTarget_get_target,$(LINKTARGET)) \
$(call gb_LinkTarget_get_dep_target,$(LINKTARGET)) \
$(call gb_LinkTarget_get_headers_target,$(LINKTARGET)) \
@@ -557,6 +584,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(ASMOBJECTS),$(call
gb_AsmObject_get_dep_target,$(object)))\
$(foreach object,$(GENCOBJECTS),$(call
gb_GenCObject_get_dep_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_dep_target,$(object))) \
+ $(foreach object,$(GENCXXCLROBJECTS),$(call
gb_GenCxxClrObject_get_dep_target,$(object))) \
) && \
$(call gb_Executable_get_command,concat-deps) $${RESPONSEFILE} > $(1))
&& \
rm -f $${RESPONSEFILE}
@@ -574,6 +602,7 @@ TEMPFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\
$(foreach object,$(ASMOBJECTS),$(call
gb_AsmObject_get_target,$(object))) \
$(foreach object,$(GENCOBJECTS),$(call
gb_GenCObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_target,$(object))) \
+ $(foreach object,$(GENCXXCLROBJECTS),$(call
gb_GenCxxClrObject_get_target,$(object))) \
$(PCHOBJS)) && \
$(if $(EXTRAOBJECTLISTS),cat $(EXTRAOBJECTLISTS) >> $${TEMPFILE} && ) \
mv $${TEMPFILE} $(1)
@@ -716,6 +745,8 @@ $(call gb_LinkTarget_get_clean_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : GENCOBJECTS :=
$(call gb_LinkTarget_get_clean_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS :=
+$(call gb_LinkTarget_get_clean_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : GENCXXCLROBJECTS :=
$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS := $$(gb_LinkTarget_CFLAGS)
$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS_APPEND :=
$(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS :=
$$(gb_LinkTarget_CXXFLAGS)
@@ -765,6 +796,7 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : CXXCLROBJECTS :=
$(call gb_LinkTarget_get_dep_target,$(1)) : ASMOBJECTS :=
$(call gb_LinkTarget_get_dep_target,$(1)) : GENCOBJECTS :=
$(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS :=
+$(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXCLROBJECTS :=
$(call gb_LinkTarget_get_dep_target,$(1)) : YACCOBJECTS :=
endif
@@ -1225,6 +1257,28 @@ endif
endef
+# call
gb_LinkTarget_add_generated_cxxclrobject,linktarget,sourcefile,cxxclrflags,linktargetmakefilename
+define gb_LinkTarget_add_generated_cxxclrobject
+$(call gb_LinkTarget_get_target,$(1)) : GENCXXCLROBJECTS += $(2)
+$(call gb_LinkTarget_get_clean_target,$(1)) : GENCXXCLROBJECTS += $(2)
+
+$(call gb_LinkTarget_get_target,$(1)) : $(call
gb_GenCxxClrObject_get_target,$(2))
+$(call gb_GenCxxClrObject_get_target,$(2)) : $(call
gb_GenCxxClrObject_get_source,$(2),$(1))
+$(call gb_GenCxxClrObject_get_target,$(2)) : | $(call
gb_LinkTarget_get_headers_target,$(1))
+$(call gb_GenCxxClrObject_get_target,$(2)) : T_CXXCLRFLAGS += $(call
gb_LinkTarget__get_cxxclrflags,$(4)) $(3)
+$(call gb_GenCxxClrObject_get_target,$(2)) : \
+ OBJECTOWNER := $(call gb_Object__owner,$(2),$(1))
+$(call gb_GenCxxClrObject_get_target,$(2)) : GEN_CXXCLR_SOURCE := $(call
gb_GenCxxClrObject_get_source,$(2),$(1))
+
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXCLROBJECTS += $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : $(call
gb_GenCxxClrObject_get_dep_target,$(2))
+$(call gb_GenCxxClrObject_get_dep_target,$(2)) :| $(dir $(call
gb_GenCxxClrObject_get_dep_target,$(2))).dir
+$(call gb_GenCxxClrObject_get_target,$(2)) :| $(dir $(call
gb_GenCxxClrObject_get_dep_target,$(2))).dir
+endif
+
+endef
+
# Add a bison grammar to the build.
# call
gb_LinkTarget_add_grammar,linktarget,yaccfile,linktargetmakefilename,cxxflags
define gb_LinkTarget_add_grammar
@@ -1355,6 +1409,11 @@ define gb_LinkTarget_add_generated_exception_objects
$(foreach obj,$(2),$(call
gb_LinkTarget_add_generated_exception_object,$(1),$(obj),$(4)))
endef
+# call
gb_LinkTarget_add_generated_cxxclrobjects,linktarget,sourcefiles,cxxclrflags,linktargetmakefilename
+define gb_LinkTarget_add_generated_cxxclrobjects
+$(foreach obj,$(2),$(call
gb_LinkTarget_add_generated_cxxclrobject,$(1),$(obj),$(3),$(4)))
+endef
+
# call gb_LinkTarget_set_targettype,linktarget,targettype
define gb_LinkTarget_set_targettype
$(call gb_LinkTarget_get_target,$(1)) : TARGETTYPE := $(2)
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 206a88e187ca..a8310655039a 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -128,6 +128,7 @@ gb_Module_get_target = $(WORKDIR)/Module/$(1)
gb_ObjCxxObject_get_target = $(WORKDIR)/ObjCxxObject/$(1).o
gb_ObjCObject_get_target = $(WORKDIR)/ObjCObject/$(1).o
gb_CxxClrObject_get_target = $(WORKDIR)/CxxClrObject/$(1).o
+gb_GenCxxClrObject_get_target = $(WORKDIR)/GenCxxClrObject/$(1).o
gb_Pagein_get_target = $(WORKDIR)/Pagein/pagein-$(1)
gb_Package_get_preparation_target = $(WORKDIR)/Package/prepared/$(1)
gb_Package_get_target = $(WORKDIR)/Package/$(1).filelist
@@ -310,6 +311,7 @@ $(eval $(call gb_Helper_make_dep_targets,\
AsmObject \
GenCObject \
GenCxxObject \
+ GenCxxClrObject \
SdiTarget \
))
diff --git a/solenv/gbuild/platform/com_MSC_class.mk
b/solenv/gbuild/platform/com_MSC_class.mk
index b00741184d27..0916c2fd1fd9 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -160,6 +160,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) \
$(foreach object,$(GENCOBJECTS),$(call
gb_GenCObject_get_target,$(object))) \
$(foreach object,$(CXXCLROBJECTS),$(call
gb_CxxClrObject_get_target,$(object))) \
+ $(foreach object,$(GENCXXCLROBJECTS),$(call
gb_GenCxxClrObject_get_target,$(object))) \
$(foreach object,$(ASMOBJECTS),$(call
gb_AsmObject_get_target,$(object))) \
$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),$(shell cat
$(extraobjectlist))) \
$(PCHOBJS) $(NATIVERES)) && \
commit 9673dbf3a19740b22ecb99721dab9b03cae76509
Author: Michael Stahl <mst...@redhat.com>
Date: Thu Nov 23 23:40:04 2017 +0100
tdf#113787: always require version file with config for CLI assemblies
The CliUnoApi_oootypes does not use the same version file as everything
else, so pass that in as a parameter.
diff --git a/cli_ure/CliLibrary_cli_basetypes.mk
b/cli_ure/CliLibrary_cli_basetypes.mk
index 2d7b93737823..30f284fd5fbb 100644
--- a/cli_ure/CliLibrary_cli_basetypes.mk
+++ b/cli_ure/CliLibrary_cli_basetypes.mk
@@ -11,7 +11,7 @@ include $(SRCDIR)/cli_ure/version/version.txt
$(eval $(call gb_CliLibrary_CliLibrary,cli_basetypes))
-$(eval $(call
gb_CliLibrary_set_configfile,cli_basetypes,cli_ure/source/basetypes/cli_basetypes_config))
+$(eval $(call
gb_CliLibrary_set_configfile,cli_basetypes,cli_ure/source/basetypes/cli_basetypes_config,cli_ure/version/version.txt))
$(eval $(call
gb_CliLibrary_set_keyfile,cli_basetypes,$(SRCDIR)/cli_ure/source/cliuno.snk))
diff --git a/cli_ure/CliLibrary_cli_ure.mk b/cli_ure/CliLibrary_cli_ure.mk
index c169d3c22829..1f320a02d160 100644
--- a/cli_ure/CliLibrary_cli_ure.mk
+++ b/cli_ure/CliLibrary_cli_ure.mk
@@ -11,7 +11,7 @@ include $(SRCDIR)/cli_ure/version/version.txt
$(eval $(call gb_CliLibrary_CliLibrary,cli_ure))
-$(eval $(call
gb_CliLibrary_set_configfile,cli_ure,cli_ure/source/ure/cli_ure_config))
+$(eval $(call
gb_CliLibrary_set_configfile,cli_ure,cli_ure/source/ure/cli_ure_config,cli_ure/version/version.txt))
$(eval $(call
gb_CliLibrary_set_keyfile,cli_ure,$(SRCDIR)/cli_ure/source/cliuno.snk))
diff --git a/cli_ure/CliNativeLibrary_cli_cppuhelper.mk
b/cli_ure/CliNativeLibrary_cli_cppuhelper.mk
index 5bc4f45e8b0a..0fa51671410a 100644
--- a/cli_ure/CliNativeLibrary_cli_cppuhelper.mk
+++ b/cli_ure/CliNativeLibrary_cli_cppuhelper.mk
@@ -13,7 +13,7 @@ $(eval $(call
gb_CliNativeLibrary_CliNativeLibrary,cli_cppuhelper))
$(eval $(call gb_CliNativeLibrary_wrap_library,cli_cppuhelper,cli_cppuhelper))
-$(eval $(call
gb_CliNativeLibrary_set_configfile,cli_cppuhelper,cli_ure/source/native/cli_cppuhelper_config))
+$(eval $(call
gb_CliNativeLibrary_set_configfile,cli_cppuhelper,cli_ure/source/native/cli_cppuhelper_config,cli_ure/version/version.txt))
$(eval $(call
gb_CliNativeLibrary_set_keyfile,cli_cppuhelper,$(SRCDIR)/cli_ure/source/cliuno.snk))
diff --git a/cli_ure/CliUnoApi_cli_uretypes.mk
b/cli_ure/CliUnoApi_cli_uretypes.mk
index 5748523ca8a8..c8bceb55b222 100644
--- a/cli_ure/CliUnoApi_cli_uretypes.mk
+++ b/cli_ure/CliUnoApi_cli_uretypes.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_CliUnoApi_CliUnoApi,cli_uretypes))
$(eval $(call
gb_CliUnoApi_set_assembly_version,cli_uretypes,$(CLI_URETYPES_NEW_VERSION)))
-$(eval $(call
gb_CliUnoApi_set_configfile,cli_uretypes,cli_ure/unotypes/cli_uretypes_config))
+$(eval $(call
gb_CliUnoApi_set_configfile,cli_uretypes,cli_ure/unotypes/cli_uretypes_config,cli_ure/version/version.txt))
$(eval $(call
gb_CliUnoApi_set_keyfile,cli_uretypes,$(SRCDIR)/cli_ure/source/cliuno.snk))
diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk
index f9cd42289f84..a0257708aead 100644
--- a/solenv/gbuild/CliAssembly.mk
+++ b/solenv/gbuild/CliAssembly.mk
@@ -12,8 +12,6 @@
gb_CliConfigTarget_TARGET := $(SRCDIR)/solenv/bin/clipatchconfig.pl
gb_CliConfigTarget_COMMAND := $(PERL) -w $(gb_CliConfigTarget_TARGET)
-gb_CliConfigTarget_VERSIONFILE_DEFAULT := $(SRCDIR)/cli_ure/version/version.txt
-
define gb_CliConfigTarget__command
$(call gb_Output_announce,$(2),$(true),CPA,1)
$(call gb_Helper_abbreviate_dirs,\
@@ -35,11 +33,11 @@ $(call gb_CliConfigTarget_get_clean_target,%) :
#
# gb_CliConfigTarget_CliConfigTarget target source
define gb_CliConfigTarget_CliConfigTarget
-$(call gb_CliConfigTarget_get_target,$(1)) : CLI_CONFIG_VERSIONFILE :=
$(gb_CliConfigTarget_VERSIONFILE_DEFAULT)
+$(call gb_CliConfigTarget_get_target,$(1)) : CLI_CONFIG_VERSIONFILE := $(3)
$(call gb_CliConfigTarget_get_target,$(1)) : $(2)
$(call gb_CliConfigTarget_get_target,$(1)) : $(gb_CliConfigTarget_TARGET)
-$(call gb_CliConfigTarget_get_target,$(1)) :
$(gb_CliConfigTarget_VERSIONFILE_DEFAULT)
+$(call gb_CliConfigTarget_get_target,$(1)) : $(3)
$(call gb_CliConfigTarget_get_target,$(1)) :| $(dir $(call
gb_CliConfigTarget_get_target,$(1))).dir
endef
@@ -170,19 +168,19 @@ $(call gb_Package_add_file,$(1)_assembly,$(notdir
$(2)),$(subst $(WORKDIR)/,,$(2
endef
define gb_CliAssembly__set_configfile_impl
-$(call gb_CliAssemblyTarget_set_configfile,$(1),$(2))
+$(call gb_CliAssemblyTarget_set_configfile,$(1),$(2),$(3))
$(call gb_CliAssembly__add_file,$(1),$(2))
endef
define gb_CliAssembly__set_configfile
-$(call gb_CliConfigTarget_CliConfigTarget,$(2),$(3))
+$(call gb_CliConfigTarget_CliConfigTarget,$(2),$(3),$(4))
$(call gb_CliAssembly__set_configfile_impl,$(1),$(call
gb_CliConfigTarget_get_target,$(2)),$(call
gb_CliConfigTarget_get_clean_target,$(2)))
endef
define gb_CliAssembly_set_configfile
-$(call gb_CliAssembly__set_configfile,$(1),$(patsubst
%_config,%,$(2)),$(SRCDIR)/$(2))
+$(call gb_CliAssembly__set_configfile,$(1),$(patsubst
%_config,%,$(2)),$(SRCDIR)/$(2),$(SRCDIR)/$(3))
endef
diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk
index 8c863a72e05a..e7fa508efada 100644
--- a/solenv/gbuild/CliLibrary.mk
+++ b/solenv/gbuild/CliLibrary.mk
@@ -82,7 +82,7 @@ $(call gb_CliLibrary_get_target,$(1)) :
endef
define gb_CliLibrary_set_configfile
-$(call gb_CliAssembly_set_configfile,$(1),$(2))
+$(call gb_CliAssembly_set_configfile,$(1),$(2),$(3))
endef
diff --git a/solenv/gbuild/CliNativeLibrary.mk
b/solenv/gbuild/CliNativeLibrary.mk
index be2862151a02..6ff28ce6f842 100644
--- a/solenv/gbuild/CliNativeLibrary.mk
+++ b/solenv/gbuild/CliNativeLibrary.mk
@@ -63,7 +63,7 @@ $(call gb_CliNativeLibrary_get_target,$(1)) :
endef
define gb_CliNativeLibrary_set_configfile
-$(call gb_CliAssembly_set_configfile,$(1),$(2))
+$(call gb_CliAssembly_set_configfile,$(1),$(2),$(3))
endef
diff --git a/solenv/gbuild/CliUnoApi.mk b/solenv/gbuild/CliUnoApi.mk
index 16f331b48ec9..d12dc62f7998 100644
--- a/solenv/gbuild/CliUnoApi.mk
+++ b/solenv/gbuild/CliUnoApi.mk
@@ -67,7 +67,7 @@ $(call gb_CliUnoApi_get_target,$(1)) : $(gb_CliUnoApi_DEPS)
endef
define gb_CliUnoApi_set_configfile
-$(call gb_CliAssembly_set_configfile,$(1),$(2))
+$(call gb_CliAssembly_set_configfile,$(1),$(2),$(3))
endef
diff --git a/unoil/CliUnoApi_oootypes.mk b/unoil/CliUnoApi_oootypes.mk
index 46201b7ac032..69d0a128f7da 100644
--- a/unoil/CliUnoApi_oootypes.mk
+++ b/unoil/CliUnoApi_oootypes.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_CliUnoApi_CliUnoApi,cli_oootypes))
$(eval $(call
gb_CliUnoApi_set_assembly_version,cli_oootypes,$(CLI_OOOTYPES_NEW_VERSION)))
-$(eval $(call
gb_CliUnoApi_set_configfile,cli_oootypes,unoil/climaker/cli_oootypes_config))
+$(eval $(call
gb_CliUnoApi_set_configfile,cli_oootypes,unoil/climaker/cli_oootypes_config,unoil/climaker/version.txt))
$(eval $(call
gb_CliUnoApi_set_keyfile,cli_oootypes,$(SRCDIR)/cli_ure/source/cliuno.snk))
commit c850db62618b9c53b21ae3e13bf52df91ea93bbd
Author: Michael Stahl <mst...@redhat.com>
Date: Thu Nov 23 23:25:38 2017 +0100
gbuild: CliAssembly: clean everything
Change-Id: Ieaef37a8af808c9b1b981b4363e4dabfb4816457
diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk
index 514bf368d63b..f9cd42289f84 100644
--- a/solenv/gbuild/CliAssembly.mk
+++ b/solenv/gbuild/CliAssembly.mk
@@ -63,7 +63,7 @@ $(call gb_Helper_abbreviate_dirs,\
-keyfile:$(1).tmp.snk \
-link:$(CLI_ASSEMBLY_CONFIGFILE) \
$(if
$(CLI_ASSEMBLY_PLATFORM),-platform:$(CLI_ASSEMBLY_PLATFORM)) && \
- rm -f $(1).tmp/snk && \
+ rm -f $(1).tmp.snk && \
touch $(1) \
)
endef
@@ -107,6 +107,7 @@ endef
define gb_CliAssemblyTarget_set_configfile
$(call gb_CliAssemblyTarget_get_target,$(1)) : CLI_ASSEMBLY_CONFIGFILE := $(2)
$(call gb_CliAssemblyTarget_get_target,$(1)) : $(2)
+$(call gb_CliAssemblyTarget_get_clean_target,$(1)) : $(3)
endef
@@ -176,7 +177,7 @@ endef
define gb_CliAssembly__set_configfile
$(call gb_CliConfigTarget_CliConfigTarget,$(2),$(3))
-$(call gb_CliAssembly__set_configfile_impl,$(1),$(call
gb_CliConfigTarget_get_target,$(2)))
+$(call gb_CliAssembly__set_configfile_impl,$(1),$(call
gb_CliConfigTarget_get_target,$(2)),$(call
gb_CliConfigTarget_get_clean_target,$(2)))
endef
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
