[Libreoffice-commits] core.git: 2 commits - basic/CppunitTest_basic_scanner.mk connectivity/Rdb_postgresql-sdbc.mk postprocess/Rdb_services.mk pyuno/Rdb_pyuno.mk scripting/Rdb_scriptproviderforbeanshell.mk scripting/Rdb_scriptproviderforjavascript.mk solenv/gbuild ure/Rdb_ure.mk
Michael Stahl
mstahl at redhat.com
Thu Sep 12 05:42:37 PDT 2013
basic/CppunitTest_basic_scanner.mk | 2 +
connectivity/Rdb_postgresql-sdbc.mk | 4 ---
postprocess/Rdb_services.mk | 4 ---
pyuno/Rdb_pyuno.mk | 4 ---
scripting/Rdb_scriptproviderforbeanshell.mk | 4 ---
scripting/Rdb_scriptproviderforjavascript.mk | 4 ---
solenv/gbuild/Helper.mk | 6 +++++
solenv/gbuild/Pagein.mk | 11 ++--------
solenv/gbuild/Rdb.mk | 29 ++++++++++++++++-----------
ure/Rdb_ure.mk | 4 ---
10 files changed, 35 insertions(+), 37 deletions(-)
New commits:
commit 6667caef24557d66177c1f7e9b72d2f609233d87
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Sep 12 13:10:32 2013 +0200
gbuild: remove gb_Rdb__get_final_target
... by replacing gb_Rdb_install with a separate constructor so the right
target can be registered at the module. There is still an ugly special
case for the ure/services.
Change-Id: I81c004143f201aaf38daca99819888313ee24f49
diff --git a/basic/CppunitTest_basic_scanner.mk b/basic/CppunitTest_basic_scanner.mk
index ec0c928..83c040a 100644
--- a/basic/CppunitTest_basic_scanner.mk
+++ b/basic/CppunitTest_basic_scanner.mk
@@ -8,6 +8,8 @@
$(eval $(call gb_CppunitTest_CppunitTest,basic_scanner))
+$(eval $(call gb_CppunitTest_use_ure,basic_scanner))
+
$(eval $(call gb_CppunitTest_add_exception_objects,basic_scanner, \
basic/qa/cppunit/test_scanner \
))
diff --git a/connectivity/Rdb_postgresql-sdbc.mk b/connectivity/Rdb_postgresql-sdbc.mk
index 7f58482..6162b30 100644
--- a/connectivity/Rdb_postgresql-sdbc.mk
+++ b/connectivity/Rdb_postgresql-sdbc.mk
@@ -7,9 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Rdb_Rdb,postgresql-sdbc))
-
-$(eval $(call gb_Rdb_install,postgresql-sdbc))
+$(eval $(call gb_Rdb_Rdb_install,postgresql-sdbc))
$(eval $(call gb_Rdb_add_components,postgresql-sdbc,\
connectivity/source/drivers/postgresql/postgresql-sdbc \
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 00be524..964f1fc 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -7,9 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Rdb_Rdb,services))
-
-$(eval $(call gb_Rdb_install,services))
+$(eval $(call gb_Rdb_Rdb_install,services))
$(eval $(call gb_Rdb_add_components,services,\
animations/source/animcore/animcore \
diff --git a/pyuno/Rdb_pyuno.mk b/pyuno/Rdb_pyuno.mk
index 71050ec..c141857 100644
--- a/pyuno/Rdb_pyuno.mk
+++ b/pyuno/Rdb_pyuno.mk
@@ -7,9 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Rdb_Rdb,pyuno))
-
-$(eval $(call gb_Rdb_install,pyuno))
+$(eval $(call gb_Rdb_Rdb_install,pyuno))
$(eval $(call gb_Rdb_add_components,pyuno, \
pyuno/source/loader/pythonloader \
diff --git a/scripting/Rdb_scriptproviderforbeanshell.mk b/scripting/Rdb_scriptproviderforbeanshell.mk
index 0a08694..5781610 100644
--- a/scripting/Rdb_scriptproviderforbeanshell.mk
+++ b/scripting/Rdb_scriptproviderforbeanshell.mk
@@ -7,9 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Rdb_Rdb,scriptproviderforbeanshell))
-
-$(eval $(call gb_Rdb_install,scriptproviderforbeanshell))
+$(eval $(call gb_Rdb_Rdb_install,scriptproviderforbeanshell))
$(eval $(call gb_Rdb_add_components,scriptproviderforbeanshell,\
scripting/java/ScriptProviderForBeanShell \
diff --git a/scripting/Rdb_scriptproviderforjavascript.mk b/scripting/Rdb_scriptproviderforjavascript.mk
index 1ac23ab..5d7f56d 100644
--- a/scripting/Rdb_scriptproviderforjavascript.mk
+++ b/scripting/Rdb_scriptproviderforjavascript.mk
@@ -7,9 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Rdb_Rdb,scriptproviderforjavascript))
-
-$(eval $(call gb_Rdb_install,scriptproviderforjavascript))
+$(eval $(call gb_Rdb_Rdb_install,scriptproviderforjavascript))
$(eval $(call gb_Rdb_add_components,scriptproviderforjavascript,\
scripting/java/ScriptProviderForJavaScript \
diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk
index 980f2c8..b3dcaff 100644
--- a/solenv/gbuild/Rdb.mk
+++ b/solenv/gbuild/Rdb.mk
@@ -8,7 +8,6 @@
#
gb_Rdb__get_install_target = $(gb_INSTROOT)/$(gb_PROGRAMDIRNAME)/services/$(1).rdb
-gb_Rdb__get_final_target = $(WORKDIR)/Rdb/$(1).final
define gb_Rdb__command
$(call gb_Helper_abbreviate_dirs,\
@@ -30,26 +29,34 @@ $(call gb_Rdb_get_target,%) :| $(call gb_ExternalExecutable_get_dependencies,xsl
$(call gb_Rdb_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),RDB,1)
$(call gb_Helper_abbreviate_dirs,\
- rm -f $(call gb_Rdb__get_final_target,$*) $(call gb_Rdb_get_target,$*))
-
-$(call gb_Rdb__get_final_target,%) :
- touch $@
+ rm -f $(call gb_Rdb__get_install_target,$*) $(call gb_Rdb_get_target,$*))
-define gb_Rdb_Rdb
+define gb_Rdb__Rdb_impl
$(call gb_Rdb_get_target,$(1)) : COMPONENTS :=
-$(call gb_Rdb__get_final_target,$(1)) : $(call gb_Rdb_get_target,$(1))
-$$(eval $$(call gb_Module_register_target,$(call gb_Rdb__get_final_target,$(1)),$(call gb_Rdb_get_clean_target,$(1))))
-$(call gb_Helper_make_userfriendly_targets,$(1),Rdb,$(call gb_Rdb_get_target,$(1)))
+$$(eval $$(call gb_Module_register_target,$(2),$(call gb_Rdb_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),Rdb,$(2))
endef
-define gb_Rdb_install
-$(call gb_Helper_install,$(call gb_Rdb__get_final_target,$(1)), \
+define gb_Rdb_Rdb
+$(call gb_Rdb__Rdb_impl,$(1),$(call gb_Rdb_get_target,$(1)))
+
+endef
+
+# FIXME this needs some layer-like thing for the special case in URE
+define gb_Rdb_Rdb_install
+$(call gb_Rdb__Rdb_impl,$(1),$(if $(2),$(gb_INSTROOT)/$(2),$(call gb_Rdb__get_install_target,$(1))))
+$(call gb_Helper_install_final, \
$(if $(2),$(gb_INSTROOT)/$(2),$(call gb_Rdb__get_install_target,$(1))), \
$(call gb_Rdb_get_target,$(1)))
endef
+define gb_Rdb_install
+$(error gb_Rdb_install removed use gb_Rdb_Rdb_install instead)
+
+endef
+
define gb_Rdb_add_component
$(call gb_Rdb_get_target,$(1)) : $(call gb_ComponentTarget_get_target,$(2))
$(call gb_Rdb_get_target,$(1)) : COMPONENTS += $(2)
diff --git a/ure/Rdb_ure.mk b/ure/Rdb_ure.mk
index ba172a7..7eeaf1a 100644
--- a/ure/Rdb_ure.mk
+++ b/ure/Rdb_ure.mk
@@ -7,9 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Rdb_Rdb,ure/services))
-
-$(eval $(call gb_Rdb_install,ure/services,$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb))
+$(eval $(call gb_Rdb_Rdb_install,ure/services,$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb))
$(eval $(call gb_Rdb_add_components,ure/services,\
$(if $(filter IOS,$(OS)),, \
commit 3b0654ab0fa2408bd660f80a56254df16339cf4d
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Sep 12 13:05:17 2013 +0200
gbuild: remove gb_Pagein__get_final_target
Change-Id: Ie3fcd7330e4e9f9d3ab48227edd192984d7ec49a
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index cfa0ddf..727c4ea 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -209,6 +209,12 @@ $(2) : $(3) | $(dir $(2)).dir
$(call gb_Deliver_add_deliverable,$(2),$(3),$(2))
endef
+# use if the installed target is the final target
+define gb_Helper_install_final
+$(1) : $(2) | $(dir $(1)).dir
+$(call gb_Deliver_add_deliverable,$(1),$(2),$(1))
+endef
+
# 4th parameter overrides 3rd for the dependency, necessary for Library
# which needs to copy DLL but that must not be a real target...
define gb_Library__install
diff --git a/solenv/gbuild/Pagein.mk b/solenv/gbuild/Pagein.mk
index 0392ccb..9753a41 100644
--- a/solenv/gbuild/Pagein.mk
+++ b/solenv/gbuild/Pagein.mk
@@ -19,7 +19,6 @@ gb_Pagein__make_path = \
$(if $(call gb_Pagein__is_library,$(1)),$(call gb_Pagein__make_library_path,$(1)),$(1))
gb_Pagein__get_install_target = $(gb_INSTROOT)/$(gb_PROGRAMDIRNAME)/pagein-$(1)
-gb_Pagein__get_final_target = $(WORKDIR)/Pagein/pagein-$(1).final
define gb_Pagein__command
$(call gb_Output_announce,$(2),$(true),PAG,5)
@@ -34,22 +33,18 @@ endef
$(call gb_Pagein_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),PAG,5)
$(call gb_Helper_abbreviate_dirs,\
- rm -f $(call gb_Pagein__get_final_target,$*) $(call gb_Pagein_get_target,$*))
+ rm -f $(call gb_Pagein__get_install_target,$*) $(call gb_Pagein_get_target,$*))
$(call gb_Pagein_get_target,%) :
$(call gb_Pagein__command,$@,$*,$^)
-$(call gb_Pagein__get_final_target,%) :
- touch $@
-
define gb_Pagein_Pagein
$(call gb_Pagein_get_target,$(1)) : OBJECTS :=
$(call gb_Pagein_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
-$(call gb_Pagein__get_final_target,$(1)) : $(call gb_Pagein_get_target,$(1))
-$$(eval $$(call gb_Module_register_target,$(call gb_Pagein__get_final_target,$(1)),$(call gb_Pagein_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_Pagein__get_install_target,$(1)),$(call gb_Pagein_get_clean_target,$(1))))
$(call gb_Helper_make_userfriendly_targets,$(1),Pagein,$(call gb_Pagein_get_target,$(1)))
-$(call gb_Helper_install,$(call gb_Pagein__get_final_target,$(1)), \
+$(call gb_Helper_install_final, \
$(call gb_Pagein__get_install_target,$(1)), \
$(call gb_Pagein_get_target,$(1)))
More information about the Libreoffice-commits
mailing list