[Libreoffice-commits] core.git: 4 commits - filter/Configuration_filter.mk mysqlc/Extension_mysql-connector-ooo.mk nlpsolver/Extension_nlpsolver.mk solenv/gbuild swext/Extension_wiki-publisher.mk sysui/desktop
Michael Stahl
mstahl at redhat.com
Mon Nov 4 13:20:22 CET 2013
filter/Configuration_filter.mk | 2
mysqlc/Extension_mysql-connector-ooo.mk | 2
nlpsolver/Extension_nlpsolver.mk | 2
solenv/gbuild/CppunitTest.mk | 65 ------------
solenv/gbuild/Executable.mk | 17 ---
solenv/gbuild/Extension.mk | 4
solenv/gbuild/Jar.mk | 41 -------
solenv/gbuild/JavaClassSet.mk | 45 --------
solenv/gbuild/JunitTest.mk | 25 ----
solenv/gbuild/Library.mk | 22 ----
solenv/gbuild/LinkTarget.mk | 97 ------------------
solenv/gbuild/Rdb.mk | 5
solenv/gbuild/StaticLibrary.mk | 7 -
solenv/gbuild/UnoApiTarget.mk | 8 -
solenv/gbuild/WinResTarget.mk | 8 -
swext/Extension_wiki-publisher.mk | 2
sysui/desktop/mimetypes/drawing-template.desktop | 2
sysui/desktop/mimetypes/drawing-template.keys | 2
sysui/desktop/mimetypes/drawing.desktop | 2
sysui/desktop/mimetypes/drawing.keys | 2
sysui/desktop/mimetypes/formula.desktop | 2
sysui/desktop/mimetypes/formula.keys | 2
sysui/desktop/mimetypes/master-document.desktop | 2
sysui/desktop/mimetypes/master-document.keys | 2
sysui/desktop/mimetypes/presentation-template.desktop | 2
sysui/desktop/mimetypes/presentation-template.keys | 2
sysui/desktop/mimetypes/presentation.desktop | 2
sysui/desktop/mimetypes/presentation.keys | 2
sysui/desktop/mimetypes/spreadsheet-template.desktop | 2
sysui/desktop/mimetypes/spreadsheet-template.keys | 2
sysui/desktop/mimetypes/spreadsheet.desktop | 2
sysui/desktop/mimetypes/spreadsheet.keys | 2
sysui/desktop/mimetypes/text-template.desktop | 2
sysui/desktop/mimetypes/text-template.keys | 2
sysui/desktop/mimetypes/text.desktop | 2
sysui/desktop/mimetypes/text.keys | 2
sysui/desktop/share/documents.ulf | 20 +--
37 files changed, 37 insertions(+), 375 deletions(-)
New commits:
commit 3c47b0befda137765a1ee3c91dd4488c63206064
Author: Michael Stahl <mstahl at redhat.com>
Date: Sun Nov 3 23:18:39 2013 +0100
sysui: fix yet more cases of accidental OpenOffice.org XML rebranding
Change-Id: I9c6bbd0ae57b90f9fec570ec5dea5058625e0f8f
diff --git a/sysui/desktop/mimetypes/drawing-template.desktop b/sysui/desktop/mimetypes/drawing-template.desktop
index 6c8cf2a..d6cde3c 100755
--- a/sysui/desktop/mimetypes/drawing-template.desktop
+++ b/sysui/desktop/mimetypes/drawing-template.desktop
@@ -23,4 +23,4 @@ Icon=drawing-template
Type=MimeType
Patterns=*.std
MimeType=application/vnd.sun.xml.draw.template
-Comment=%PRODUCTNAME Drawing Template
+Comment=OpenOffice.org 1.0 Drawing Template
diff --git a/sysui/desktop/mimetypes/drawing-template.keys b/sysui/desktop/mimetypes/drawing-template.keys
index 2c6e844..40e006d 100755
--- a/sysui/desktop/mimetypes/drawing-template.keys
+++ b/sysui/desktop/mimetypes/drawing-template.keys
@@ -1,5 +1,5 @@
application/vnd.sun.xml.draw.template
- description=%PRODUCTNAME Drawing Template
+ description=OpenOffice.org 1.0 Drawing Template
default_action_type=application
short_list_application_ids_for_novice_user_level=openoffice,staroffice,starsuite
short_list_application_ids_for_intermediate_user_level=openoffice,staroffice,starsuite
diff --git a/sysui/desktop/mimetypes/drawing.desktop b/sysui/desktop/mimetypes/drawing.desktop
index a8444da..fe9db11 100755
--- a/sysui/desktop/mimetypes/drawing.desktop
+++ b/sysui/desktop/mimetypes/drawing.desktop
@@ -23,4 +23,4 @@ Icon=drawing
Type=MimeType
Patterns=*.sxd
MimeType=application/vnd.sun.xml.draw
-Comment=%PRODUCTNAME Drawing
+Comment=OpenOffice.org 1.0 Drawing
diff --git a/sysui/desktop/mimetypes/drawing.keys b/sysui/desktop/mimetypes/drawing.keys
index 2fbd27e..891b0ec 100755
--- a/sysui/desktop/mimetypes/drawing.keys
+++ b/sysui/desktop/mimetypes/drawing.keys
@@ -1,5 +1,5 @@
application/vnd.sun.xml.draw
- description=%PRODUCTNAME Drawing
+ description=OpenOffice.org 1.0 Drawing
default_action_type=application
short_list_application_ids_for_novice_user_level=openoffice,staroffice,starsuite
short_list_application_ids_for_intermediate_user_level=openoffice,staroffice,starsuite
diff --git a/sysui/desktop/mimetypes/formula.desktop b/sysui/desktop/mimetypes/formula.desktop
index 6f958a2..34f77a6 100755
--- a/sysui/desktop/mimetypes/formula.desktop
+++ b/sysui/desktop/mimetypes/formula.desktop
@@ -23,4 +23,4 @@ Icon=formula
Type=MimeType
Patterns=*.sxm
MimeType=application/vnd.sun.xml.math
-Comment=%PRODUCTNAME Formula
+Comment=OpenOffice.org 1.0 Formula
diff --git a/sysui/desktop/mimetypes/formula.keys b/sysui/desktop/mimetypes/formula.keys
index 845cdff..f6b2b3a 100755
--- a/sysui/desktop/mimetypes/formula.keys
+++ b/sysui/desktop/mimetypes/formula.keys
@@ -1,5 +1,5 @@
application/vnd.sun.xml.math
- description=%PRODUCTNAME Formula
+ description=OpenOffice.org 1.0 Formula
default_action_type=application
short_list_application_ids_for_novice_user_level=openoffice,staroffice,starsuite
short_list_application_ids_for_intermediate_user_level=openoffice,staroffice,starsuite
diff --git a/sysui/desktop/mimetypes/master-document.desktop b/sysui/desktop/mimetypes/master-document.desktop
index 5212808..9477557 100755
--- a/sysui/desktop/mimetypes/master-document.desktop
+++ b/sysui/desktop/mimetypes/master-document.desktop
@@ -23,4 +23,4 @@ Icon=master-document
Type=MimeType
Patterns=*.sxg
MimeType=application/vnd.sun.xml.writer.global
-Comment=%PRODUCTNAME Master Document
+Comment=OpenOffice.org 1.0 Master Document
diff --git a/sysui/desktop/mimetypes/master-document.keys b/sysui/desktop/mimetypes/master-document.keys
index a9882a0..05936fe 100755
--- a/sysui/desktop/mimetypes/master-document.keys
+++ b/sysui/desktop/mimetypes/master-document.keys
@@ -1,5 +1,5 @@
application/vnd.sun.xml.writer.global
- description=%PRODUCTNAME Master Document
+ description=OpenOffice.org 1.0 Master Document
default_action_type=application
short_list_application_ids_for_novice_user_level=openoffice,staroffice,starsuite
short_list_application_ids_for_intermediate_user_level=openoffice,staroffice,starsuite
diff --git a/sysui/desktop/mimetypes/presentation-template.desktop b/sysui/desktop/mimetypes/presentation-template.desktop
index 1bdc191..2157a56 100755
--- a/sysui/desktop/mimetypes/presentation-template.desktop
+++ b/sysui/desktop/mimetypes/presentation-template.desktop
@@ -23,4 +23,4 @@ Icon=presentation-template
Type=MimeType
Patterns=*.sti
MimeType=application/vnd.sun.xml.impress.template
-Comment=%PRODUCTNAME Presentation Template
+Comment=OpenOffice.org 1.0 Presentation Template
diff --git a/sysui/desktop/mimetypes/presentation-template.keys b/sysui/desktop/mimetypes/presentation-template.keys
index a909f73..b3585a8 100755
--- a/sysui/desktop/mimetypes/presentation-template.keys
+++ b/sysui/desktop/mimetypes/presentation-template.keys
@@ -1,5 +1,5 @@
application/vnd.sun.xml.impress.template
- description=%PRODUCTNAME Presentation Template
+ description=OpenOffice.org 1.0 Presentation Template
default_action_type=application
short_list_application_ids_for_novice_user_level=openoffice,staroffice,starsuite
short_list_application_ids_for_intermediate_user_level=openoffice,staroffice,starsuite
diff --git a/sysui/desktop/mimetypes/presentation.desktop b/sysui/desktop/mimetypes/presentation.desktop
index 260bb76..b59c036 100755
--- a/sysui/desktop/mimetypes/presentation.desktop
+++ b/sysui/desktop/mimetypes/presentation.desktop
@@ -23,4 +23,4 @@ Icon=presentation
Type=MimeType
Patterns=*.sxi
MimeType=application/vnd.sun.xml.impress
-Comment=%PRODUCTNAME Presentation
+Comment=OpenOffice.org 1.0 Presentation
diff --git a/sysui/desktop/mimetypes/presentation.keys b/sysui/desktop/mimetypes/presentation.keys
index 4620867..21e2716 100755
--- a/sysui/desktop/mimetypes/presentation.keys
+++ b/sysui/desktop/mimetypes/presentation.keys
@@ -1,5 +1,5 @@
application/vnd.sun.xml.impress
- description=%PRODUCTNAME Presentation
+ description=OpenOffice.org 1.0 Presentation
default_action_type=application
short_list_application_ids_for_novice_user_level=openoffice,staroffice,starsuite
short_list_application_ids_for_intermediate_user_level=openoffice,staroffice,starsuite
diff --git a/sysui/desktop/mimetypes/spreadsheet-template.desktop b/sysui/desktop/mimetypes/spreadsheet-template.desktop
index d15029e..4f50910 100755
--- a/sysui/desktop/mimetypes/spreadsheet-template.desktop
+++ b/sysui/desktop/mimetypes/spreadsheet-template.desktop
@@ -23,4 +23,4 @@ Icon=spreadsheet-template
Type=MimeType
Patterns=*.stc
MimeType=application/vnd.sun.xml.calc.template
-Comment=%PRODUCTNAME Spreadsheet Template
+Comment=OpenOffice.org 1.0 Spreadsheet Template
diff --git a/sysui/desktop/mimetypes/spreadsheet-template.keys b/sysui/desktop/mimetypes/spreadsheet-template.keys
index 604cca7..210ffe2 100755
--- a/sysui/desktop/mimetypes/spreadsheet-template.keys
+++ b/sysui/desktop/mimetypes/spreadsheet-template.keys
@@ -1,5 +1,5 @@
application/vnd.sun.xml.calc.template
- description=%PRODUCTNAME Spreadsheet Template
+ description=OpenOffice.org 1.0 Spreadsheet Template
default_action_type=application
short_list_application_ids_for_novice_user_level=openoffice,staroffice,starsuite
short_list_application_ids_for_intermediate_user_level=openoffice,staroffice,starsuite
diff --git a/sysui/desktop/mimetypes/spreadsheet.desktop b/sysui/desktop/mimetypes/spreadsheet.desktop
index e43d51c..584c64a 100755
--- a/sysui/desktop/mimetypes/spreadsheet.desktop
+++ b/sysui/desktop/mimetypes/spreadsheet.desktop
@@ -23,4 +23,4 @@ Icon=spreadsheet
Type=MimeType
Patterns=*.sxc
MimeType=application/vnd.sun.xml.calc
-Comment=%PRODUCTNAME Spreadsheet
+Comment=OpenOffice.org 1.0 Spreadsheet
diff --git a/sysui/desktop/mimetypes/spreadsheet.keys b/sysui/desktop/mimetypes/spreadsheet.keys
index d108e64..8288622 100755
--- a/sysui/desktop/mimetypes/spreadsheet.keys
+++ b/sysui/desktop/mimetypes/spreadsheet.keys
@@ -1,5 +1,5 @@
application/vnd.sun.xml.calc
- description=%PRODUCTNAME Spreadsheet
+ description=OpenOffice.org 1.0 Spreadsheet
default_action_type=application
short_list_application_ids_for_novice_user_level=openoffice,staroffice,starsuite
short_list_application_ids_for_intermediate_user_level=openoffice,staroffice,starsuite
diff --git a/sysui/desktop/mimetypes/text-template.desktop b/sysui/desktop/mimetypes/text-template.desktop
index 3b858fc..b51f010 100755
--- a/sysui/desktop/mimetypes/text-template.desktop
+++ b/sysui/desktop/mimetypes/text-template.desktop
@@ -23,4 +23,4 @@ Icon=text-template
Type=MimeType
Patterns=*.stw
MimeType=application/vnd.sun.xml.writer.template
-Comment=%PRODUCTNAME Text Document Template
+Comment=OpenOffice.org 1.0 Text Document Template
diff --git a/sysui/desktop/mimetypes/text-template.keys b/sysui/desktop/mimetypes/text-template.keys
index ef9d424..0f6f4eb 100755
--- a/sysui/desktop/mimetypes/text-template.keys
+++ b/sysui/desktop/mimetypes/text-template.keys
@@ -1,5 +1,5 @@
application/vnd.sun.xml.writer.template
- description=%PRODUCTNAME Text Document Template
+ description=OpenOffice.org 1.0 Text Document Template
default_action_type=application
short_list_application_ids_for_novice_user_level=openoffice,staroffice,starsuite
short_list_application_ids_for_intermediate_user_level=openoffice,staroffice,starsuite
diff --git a/sysui/desktop/mimetypes/text.desktop b/sysui/desktop/mimetypes/text.desktop
index e7dffda..1ba19b0 100755
--- a/sysui/desktop/mimetypes/text.desktop
+++ b/sysui/desktop/mimetypes/text.desktop
@@ -23,4 +23,4 @@ Icon=text
Type=MimeType
Patterns=*.sxw
MimeType=application/vnd.sun.xml.writer
-Comment=%PRODUCTNAME Text Document
+Comment=OpenOffice.org 1.0 Text Document
diff --git a/sysui/desktop/mimetypes/text.keys b/sysui/desktop/mimetypes/text.keys
index e42244f..316f641 100755
--- a/sysui/desktop/mimetypes/text.keys
+++ b/sysui/desktop/mimetypes/text.keys
@@ -1,5 +1,5 @@
application/vnd.sun.xml.writer
- description=%PRODUCTNAME Text Document
+ description=OpenOffice.org 1.0 Text Document
default_action_type=application
short_list_application_ids_for_novice_user_level=openoffice,staroffice,starsuite
short_list_application_ids_for_intermediate_user_level=openoffice,staroffice,starsuite
diff --git a/sysui/desktop/share/documents.ulf b/sysui/desktop/share/documents.ulf
index ef07d13..cff9422 100644
--- a/sysui/desktop/share/documents.ulf
+++ b/sysui/desktop/share/documents.ulf
@@ -1,32 +1,32 @@
[text]
-en-US = "%PRODUCTNAME Text Document"
+en-US = "OpenOffice.org 1.0 Text Document"
[text-template]
-en-US = "%PRODUCTNAME Text Document Template"
+en-US = "OpenOffice.org 1.0 Text Document Template"
[master-document]
-en-US = "%PRODUCTNAME Master Document"
+en-US = "OpenOffice.org 1.0 Master Document"
[formula]
-en-US = "%PRODUCTNAME Formula"
+en-US = "OpenOffice.org 1.0 Formula"
[presentation]
-en-US = "%PRODUCTNAME Presentation"
+en-US = "OpenOffice.org 1.0 Presentation"
[presentation-template]
-en-US = "%PRODUCTNAME Presentation Template"
+en-US = "OpenOffice.org 1.0 Presentation Template"
[drawing]
-en-US = "%PRODUCTNAME Drawing"
+en-US = "OpenOffice.org 1.0 Drawing"
[drawing-template]
-en-US = "%PRODUCTNAME Drawing Template"
+en-US = "OpenOffice.org 1.0 Drawing Template"
[spreadsheet]
-en-US = "%PRODUCTNAME Spreadsheet"
+en-US = "OpenOffice.org 1.0 Spreadsheet"
[spreadsheet-template]
-en-US = "%PRODUCTNAME Spreadsheet Template"
+en-US = "OpenOffice.org 1.0 Spreadsheet Template"
[oasis-text]
en-US = "OpenDocument Text"
commit 5b609aebc4cc36a2ed79535bbb04f88a780c9571
Author: Michael Stahl <mstahl at redhat.com>
Date: Sun Nov 3 23:47:20 2013 +0100
gbuild: fix gb_Extension_use_default_description
Passing a target local variable like $(LOCATION) to
gb_Extension_add_file does not result in an actual dependency on the file.
Change-Id: Ide77ab81f19877267056bf8e50d69c9cfedcda79
diff --git a/mysqlc/Extension_mysql-connector-ooo.mk b/mysqlc/Extension_mysql-connector-ooo.mk
index d949057..1ca1f58 100644
--- a/mysqlc/Extension_mysql-connector-ooo.mk
+++ b/mysqlc/Extension_mysql-connector-ooo.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Extension_Extension,mysql-connector-ooo,mysqlc/source))
-$(eval $(call gb_Extension_use_default_description,mysql-connector-ooo))
+$(eval $(call gb_Extension_use_default_description,mysql-connector-ooo,mysqlc/source/description-en-US.txt))
$(eval $(call gb_Extension_use_default_license,mysql-connector-ooo))
$(eval $(call gb_Extension_add_library,mysql-connector-ooo,mysqlc))
diff --git a/nlpsolver/Extension_nlpsolver.mk b/nlpsolver/Extension_nlpsolver.mk
index 1dd3c75..8ec0e1a 100644
--- a/nlpsolver/Extension_nlpsolver.mk
+++ b/nlpsolver/Extension_nlpsolver.mk
@@ -11,7 +11,7 @@
$(eval $(call gb_Extension_Extension,nlpsolver,nlpsolver/src/com/sun/star/comp/Calc/NLPSolver))
-$(eval $(call gb_Extension_use_default_description,nlpsolver))
+$(eval $(call gb_Extension_use_default_description,nlpsolver,nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description-en-US.txt))
$(eval $(call gb_Extension_use_default_license,nlpsolver))
$(eval $(call gb_Extension_add_file,nlpsolver,components.rdb,$(SRCDIR)/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/components.rdb))
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index b4ac8a2..8ec2fc4 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -254,9 +254,9 @@ $(foreach lang,$(gb_Extension_ALL_LANGS), \
endef
-# Use the default description file
+# Use the given file as description-en-US.txt
define gb_Extension_use_default_description
-$(call gb_Extension_add_file,$(1),description-en-US.txt,$$(LOCATION)/description-en-US.txt)
+$(call gb_Extension_add_file,$(1),description-en-US.txt,$(SRCDIR)/$(2))
$(call gb_Extension_get_target,$(1)) : DESCRIPTION := $(true)
ifneq ($(strip $(gb_WITH_LANG)),)
$(call gb_Extension_get_target,$(1)) : FILES += $(foreach lang,$(gb_Extension_TRANS_LANGS),description-$(lang).txt)
diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk
index d43eb00..aeaff27 100644
--- a/swext/Extension_wiki-publisher.mk
+++ b/swext/Extension_wiki-publisher.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_Extension_Extension,wiki-publisher,swext/mediawiki/src))
$(eval $(call gb_Extension_use_unpacked,wiki-publisher,xsltml))
-$(eval $(call gb_Extension_use_default_description,wiki-publisher))
+$(eval $(call gb_Extension_use_default_description,wiki-publisher,swext/mediawiki/src/description-en-US.txt))
$(eval $(call gb_Extension_use_default_license,wiki-publisher))
ifneq ($(SYSTEM_APACHE_COMMONS),YES)
commit 1a940ae2128cb680069a3926151a6dab7db3e735
Author: Michael Stahl <mstahl at redhat.com>
Date: Sun Nov 3 22:32:44 2013 +0100
filter: define filter_XcuResTarget_get_clean_target
Change-Id: I8f830790935a05a0413187b6e21002e0f2563adf
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 7102e27..bbb3892 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -176,6 +176,8 @@ filter_XcuFilterUiCleanTarget = $(WORKDIR)/Clean/XcuFilterUiTarget/filter_ui.xcu
filter_XCU_filter := org/openoffice/TypeDetection/Filter.xcu
filter_XcuResTarget_get_target = \
$(call gb_XcuResTarget_get_target,fcfg_langpack/$(1)/$(filter_XCU_filter))
+filter_XcuResTarget_get_clean_target = \
+ $(call gb_XcuResTarget_get_clean_target,fcfg_langpack/$(1)/$(filter_XCU_filter))
$(filter_XcuFilterUiTarget) : $(filter_MERGE_TARGET)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),FIU,1)
commit 937242db93bd25d094d19193cd802e272718cfb8
Author: Michael Stahl <mstahl at redhat.com>
Date: Sun Nov 3 22:23:47 2013 +0100
gbuild: remove error stubs for renamed/removed functions
Change-Id: If1d0d5294af87f2b780deadb21d12a6ee90dead6
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index f05bae7..f5ab797 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -140,10 +140,6 @@ $(call gb_CppunitTest_get_target,$(1)) : SAL_DIAGNOSE_ABORT := TRUE
endef
-define gb_CppunitTest_set_args
-$$(call gb_Output_error,gb_CppunitTest_set_args: use gb_CppunitTest_add_arguments instead.))
-endef
-
# Add additional command line arguments for the test.
#
# You should practically never need to use this, as there are special
@@ -153,10 +149,6 @@ $(call gb_CppunitTest_get_target,$(1)) : ARGS += $(2)
endef
-define gb_CppunitTest_uses_ure
-$$(call gb_Output_error,gb_CppunitTest_uses_ure: use gb_CppunitTest_use_ure instead.))
-endef
-
define gb_CppunitTest_use_ure
$(call gb_CppunitTest_use_rdb,$(1),ure/services)
$(call gb_CppunitTest_get_target,$(1)) : URE := $(true)
@@ -168,32 +160,12 @@ $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Package_get_target,cppuhelper
endef
-define gb_CppunitTest_add_type_rdb
-$$(call gb_Output_error,\
- gb_CppunitTest_add_type_rdb: use gb_CppunitTest_use_api instead.)
-endef
-
-define gb_CppunitTest_use_type_rdb
-$$(call gb_Output_error,\
- gb_CppunitTest_use_type_rdb: use gb_CppunitTest_use_api instead.)
-endef
-
define gb_CppunitTest__use_api
$(call gb_CppunitTest_get_target,$(1)) : $(call gb_UnoApi_get_target,$(2))
$(call gb_CppunitTest_get_target,$(1)) : UNO_TYPES += $(call gb_UnoApi_get_target,$(2))
endef
-define gb_CppunitTest_add_type_rdbs
-$$(call gb_Output_error,\
- gb_CppunitTest_add_type_rdbs: use gb_CppunitTest_use_api instead.)
-endef
-
-define gb_CppunitTest_use_type_rdbs
-$$(call gb_Output_error,\
- gb_CppunitTest_use_type_rdbs: use gb_CppunitTest_use_api instead.)
-endef
-
define gb_CppunitTest_use_api
$(call gb_LinkTarget_use_api,$(call gb_CppunitTest_get_linktarget,$(1)),$(2))
$(foreach rdb,$(2),$(call gb_CppunitTest__use_api,$(1),$(rdb)))
@@ -210,40 +182,17 @@ $(call gb_CppunitTest_use_api,$(1),udkapi offapi)
endef
-define gb_CppunitTest_add_service_rdb
-$$(call gb_Output_error,\
- gb_CppunitTest_add_service_rdb: use gb_CppunitTest_use_rdb instead.)
-endef
-
-define gb_CppunitTest_use_service_rdb
-$$(call gb_Output_error,gb_CppunitTest_use_service_rdb: use gb_CppunitTest_use_rdb instead.))
-endef
-
define gb_CppunitTest_use_rdb
$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Rdb_get_target_for_build,$(2))
$(call gb_CppunitTest_get_target,$(1)) : UNO_SERVICES += $(call gb_Rdb_get_target_for_build,$(2))
endef
-define gb_CppunitTest_add_service_rdbs
-$$(call gb_Output_error,\
- gb_CppunitTest_add_service_rdbs: use gb_CppunitTest_use_rdbs instead.)
-endef
-
-define gb_CppunitTest_use_service_rdbs
-$$(call gb_Output_error,gb_CppunitTest_use_service_rdbs: use gb_CppunitTest_use_rdbs instead.))
-endef
-
define gb_CppunitTest_use_rdbs
$(foreach rdb,$(2),$(call gb_CppunitTest_use_rdb,$(1),$(rdb)))
endef
-define gb_CppunitTest_add_component
-$$(call gb_Output_error,\
- gb_CppunitTest_add_component: use gb_CppunitTest_use_component instead.)
-endef
-
define gb_CppunitTest_use_component
$(call gb_CppunitTest_get_target,$(1)) : \
$(call gb_ComponentTarget_get_target,$(2))
@@ -266,11 +215,6 @@ $(filter-out \
forms/util/frm),$(1))
endef
-define gb_CppunitTest_add_components
-$$(call gb_Output_error,\
- gb_CppunitTest_add_components: use gb_CppunitTest_use_components instead.)
-endef
-
define gb_CppunitTest_use_components
$(foreach component,$(call gb_CppunitTest__filter_not_built_components,$(2)),$(call gb_CppunitTest_use_component,$(1),$(component)))
@@ -316,13 +260,9 @@ $(eval $(foreach method,\
add_cxxobject \
add_cxxobjects \
add_exception_objects \
- add_executable_objects \
use_executable_objects \
- add_library_objects \
use_library_objects \
- add_linked_libs \
use_libraries \
- add_linked_static_libs \
use_static_libraries \
add_objcobject \
add_objcobjects \
@@ -330,11 +270,9 @@ $(eval $(foreach method,\
add_objcxxobjects \
add_asmobject \
add_asmobjects \
- add_package_headers \
use_package \
use_packages \
set_precompiled_header \
- add_precompiled_header \
add_sdi_headers \
add_cflags \
set_cflags \
@@ -343,7 +281,6 @@ $(eval $(foreach method,\
add_objcflags \
add_objcxxflags \
add_defs \
- set_defs \
set_include \
add_ldflags \
set_ldflags \
@@ -355,8 +292,6 @@ $(eval $(foreach method,\
use_internal_bootstrap_api \
use_internal_comprehensive_api \
set_library_path_flags \
- set_objcflags \
- set_objcxxflags \
use_external \
use_externals \
use_custom_headers \
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 974e1b3..11312ea 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -85,10 +85,6 @@ define gb_Executable_set_targettype_gui
$(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktarget,$(1))) : TARGETGUI := $(2)
endef
-define gb_Executable_add_auxtarget
-$(call gb_Output_error,gb_Executable_add_auxtarget should no longer be necessary)
-endef
-
define gb_Executable_forward_to_Linktarget
gb_Executable_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_Executable_get_linktarget,$$(1)),$$(2),$$(3),Executable_$$(1))
@@ -112,15 +108,10 @@ $(eval $(foreach method,\
add_generated_cxxobjects \
add_generated_exception_objects \
add_cflags \
- set_cflags \
add_cxxflags \
- set_cxxflags \
add_objcflags \
add_objcxxflags \
- set_objcflags \
- set_objcxxflags \
add_defs \
- set_defs \
set_include \
add_ldflags \
set_ldflags \
@@ -132,27 +123,19 @@ $(eval $(foreach method,\
use_api \
use_sdk_api \
use_udk_api \
- add_internal_api \
use_internal_api \
- add_internal_bootstrap_api \
use_internal_bootstrap_api \
- add_internal_comprehensive_api \
use_internal_comprehensive_api \
- add_linked_libs \
use_libraries \
- add_linked_static_libs \
use_static_libraries \
use_external \
use_externals \
- add_custom_headers \
use_custom_headers \
- add_package_headers \
use_package \
use_packages \
use_unpacked \
add_sdi_headers \
set_precompiled_header \
- add_precompiled_header \
add_nativeres \
set_warnings_not_errors \
set_generated_cxx_suffix \
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 62e33d5..1253c22 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -167,18 +167,7 @@ $(foreach sourcefile,$(2),$(call gb_Jar_add_generated_sourcefile,$(1),$(sourcefi
endef
-define gb_JarTest_set_classpath
-$$(call gb_Output_error,\
- gb_JarTest_set_classpath: use gb_JavaClassSet_add_classpath instead.)
-endef
-
# JARCLASSPATH is the class path that is written to the manifest of the jar
-define gb_Jar_set_jarclasspath
-$$(call gb_Output_error,\
- gb_Jar_set_jarclasspath: use gb_Jar_add_manifest_classpath instead.)
-
-endef
-
define gb_Jar_add_manifest_classpath
$(call gb_Jar_get_target,$(1)) : JARCLASSPATH += $(2)
@@ -193,11 +182,6 @@ $(call gb_Jar_get_target,$(1)) : $(2)
endef
-define gb_Jar_add_jar
-$$(call gb_Output_error,\
- gb_Jar_add_jar: use gb_Jar_use_jar instead.)
-endef
-
# URE jars are not added to manifest classpath; and neither is unoil.jar, which
# is available at runtime via URE_MORE_JAVA_TYPES:
gb_Jar_default_jars := $(gb_Jar_URE) unoil
@@ -210,11 +194,6 @@ $(if $(filter-out $(gb_Jar_default_jars),$(2)),\
endef
-define gb_Jar_add_system_jar
-$$(call gb_Output_error,\
- gb_Jar_add_system_jar: use gb_Jar_use_system_jar instead.)
-endef
-
define gb_Jar_use_system_jar
$(call gb_JavaClassSet_use_system_jar,$(call gb_Jar_get_classsetname,$(1)),$(2))
$(call gb_Jar_add_manifest_classpath,$(1),$(call gb_Helper_make_url,$(2)))
@@ -229,22 +208,12 @@ $(call gb_Jar_add_manifest_classpath,$(1),$(3))
endef
-define gb_Jar_add_jars
-$$(call gb_Output_error,\
- gb_Jar_add_jars: use gb_Jar_use_jars instead.)
-endef
-
# specify jars with imported modules
define gb_Jar_use_jars
$(foreach jar,$(2),$(call gb_Jar_use_jar,$(1),$(jar)))
endef
-define gb_Jar_add_system_jars
-$$(call gb_Output_error,\
- gb_Jar_add_system_jars: use gb_Jar_use_system_jars instead.)
-endef
-
define gb_Jar_use_system_jars
$(foreach jar,$(2),$(call gb_Jar_use_system_jar,$(1),$(jar)))
@@ -264,21 +233,11 @@ $(foreach external,$(2),$(call gb_Jar_use_external,$(1),$(external)))
endef
-define gb_Jar_add_customtarget_dependency
-$$(call gb_Output_error,\
- gb_Jar_add_customtarget_dependency: use gb_Jar_use_customtarget instead.)
-endef
-
define gb_Jar_use_customtarget
$(call gb_JavaClassSet_use_customtarget,$(call gb_Jar_get_classsetname,$(1)),$(2))
endef
-define gb_Jar_add_customtarget_dependencies
-$$(call gb_Output_error,\
- gb_Jar_add_customtarget_dependencies: use gb_Jar_use_customtargets instead.)
-endef
-
define gb_Jar_use_customtargets
$(foreach customtarget,$(2),$(call gb_Jar_use_customtarget,$(1),$(customtarget)))
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 5d96749..b24cdef 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -100,21 +100,11 @@ $(foreach sourcefile,$(2),$(call gb_JavaClassSet_add_generated_sourcefile,$(1),$
endef
-define gb_JavaClassSet_set_classpath
-$$(call gb_Output_error,\
- gb_JavaClassSet_set_classpath: use gb_JavaClassSet_add_classpath instead.)
-endef
-
define gb_JavaClassSet_add_classpath
$(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(if $$(T_CP),$$(T_CP)$$(gb_CLASSPATHSEP))$(strip $(2))
endef
-define gb_JavaClassSet_add_jar
-$$(call gb_Output_error,\
- gb_JavaClassSet_add_jar: use gb_JavaClassSet_use_jar instead.)
-endef
-
define gb_JavaClassSet_use_jar
ifneq (,$$(filter-out $(gb_Jar_KNOWN),$(2)))
$$(eval $$(call gb_Output_info,currently known jars are: $(sort $(gb_Jar_KNOWN)),ALL))
@@ -127,41 +117,21 @@ $(call gb_JavaClassSet_add_classpath,$(1),$(call gb_Jar_get_target,$(2)))
endef
# this does not generate dependency on the jar
-define gb_JavaClassSet_add_system_jar
-$$(call gb_Output_error,\
- gb_JavaClassSet_add_system_jar: use gb_JavaClassSet_use_system_jar instead.)
-endef
-
define gb_JavaClassSet_use_system_jar
$(call gb_JavaClassSet_add_classpath,$(1),$(2))
endef
-define gb_JavaClassSet_add_jars
-$$(call gb_Output_error,\
- gb_JavaClassSet_add_jars: use gb_JavaClassSet_use_jars instead.)
-endef
-
define gb_JavaClassSet_use_jars
$(foreach jar,$(2),$(call gb_JavaClassSet_use_jar,$(1),$(jar)))
endef
-define gb_JavaClassSet_add_system_jars
-$$(call gb_Output_error,\
- gb_JavaClassSet_add_system_jars: use gb_JavaClassSet_use_system_jars instead.)
-endef
-
define gb_JavaClassSet_use_system_jars
$(foreach jar,$(2),$(call gb_JavaClassSet_use_system_jar,$(1),$(jar)))
endef
-define gb_JavaClassSet_add_jar_classset
-$$(call gb_Output_error,\
- gb_JavaClassSet_add_jar_classset: use gb_JavaClassSet_use_jar_classset instead.)
-endef
-
# gb_JavaClassSet_use_jar_classset: Like gb_JavaClassSet_use_jar, but instead of
# using the jar, use the directory tree with the class files that make up the
# jar. This is sometimes necessary in JunitTests that have test classes in
@@ -175,21 +145,6 @@ $(call gb_JavaClassSet_add_classpath,$(1),$(call gb_JavaClassSet_get_classdir,$(
endef
-define gb_JavaClassSet_use_external
-$$(call gb_Output_error,\
- gb_JavaClassSet_use_external: use gb_Jar_use_external instead.)
-endef
-
-define gb_JavaClassSet_use_externals
-$(foreach external,$(2),$(call gb_JavaClassSet_use_external,$(1),$(external)))
-
-endef
-
-define gb_JavaClassSet_add_customtarget_dependency
-$$(call gb_Output_error,\
- gb_JavaClassSet_add_customtarget_dependency: use gb_JavaClassSet_use_customtarget instead.)
-endef
-
define gb_JavaClassSet_use_customtarget
$(call gb_JavaClassSet_get_preparation_target,$(1)) : \
$(call gb_CustomTarget_get_target,$(2))
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 5e6e695..aee3edf 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -95,11 +95,6 @@ $(foreach sourcefile,$(2),$(call gb_JunitTest_add_sourcefile,$(1),$(sourcefile))
endef
-define gb_JunitTest_add_jar
-$$(call gb_Output_error,\
- gb_JunitTest_add_jar: use gb_JunitTest_use_jar instead.)
-endef
-
define gb_JunitTest_use_jar
$(call gb_JavaClassSet_use_jar,$(call gb_JunitTest_get_classsetname,$(1)),$(2))
$(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$$(gb_CLASSPATHSEP)$(call gb_Jar_get_target,$(2))
@@ -107,21 +102,11 @@ $(call gb_JunitTest_get_target,$(1)) : $(call gb_Jar_get_target,$(2))
endef
-define gb_JunitTest_add_jars
-$$(call gb_Output_error,\
- gb_JunitTest_add_jars: use gb_JunitTest_use_jars instead.)
-endef
-
define gb_JunitTest_use_jars
$(foreach jar,$(2),$(call gb_JunitTest_use_jar,$(1),$(jar)))
endef
-define gb_JunitTest_add_jar_classset
-$$(call gb_Output_error,\
- gb_JunitTest_add_jar_classset: use gb_JunitTest_use_jar_classset instead.)
-endef
-
# see gb_JavaClassSet_use_jar_classset
define gb_JunitTest_use_jar_classset
$(call gb_JavaClassSet_use_jar_classset,$(call gb_JunitTest_get_classsetname,$(1)),$(2))
@@ -153,22 +138,12 @@ $(foreach external,$(2),$(call gb_JunitTest_use_external,$(1),$(external)))
endef
-define gb_JunitTest_add_customtarget_dependency
-$$(call gb_Output_error,\
- gb_JunitTest_add_customtarget_dependency: use gb_Jar_use_customtarget instead.)
-endef
-
define gb_JunitTest_use_customtarget
$(call gb_JavaClassSet_use_customtarget,$(call gb_JunitTest_get_classsetname,$(1)),$(2))
$(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$$(gb_CLASSPATHSEP)$(call gb_CustomTarget_get_workdir,$(2))
endef
-define gb_JunitTest_add_customtarget_dependencies
-$$(call gb_Output_error,\
- gb_JunitTest_add_customtarget_dependencies: use gb_Jar_use_customtargets instead.)
-endef
-
define gb_JunitTest_use_customtargets
$(foreach dependency,$(2),$(call gb_JunitTest_use_customtarget,$(1),$(dependency)))
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index a0c3e70..61b5b0f 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -97,14 +97,6 @@ $(call gb_Helper_make_userfriendly_targets,$(1),Library,$(call gb_Library_get_ex
endef
-define gb_Library_add_auxtarget
-$(call gb_Output_error,gb_Library_add_auxtarget should no longer be necessary)
-endef
-
-define gb_Library_add_auxtargets
-$(call gb_Output_error,gb_Library_add_auxtargets should no longer be necessary)
-endef
-
# we actually (ab)use ILIBTARGET here to store the unversioned symlink -
# it serves a similar purpose to an MSVC import library, as input for linker
# call gb_Library__add_soversion_link,library,linkname
@@ -193,22 +185,16 @@ $(eval $(foreach method,\
add_generated_cobjects \
add_generated_cxxobjects \
add_generated_exception_objects \
- add_library_objects \
use_library_objects \
add_grammar \
add_grammars \
add_scanner \
add_scanners \
add_cflags \
- set_cflags \
add_cxxflags \
- set_cxxflags \
add_objcxxflags \
add_objcflags \
- set_objcflags \
- set_objcxxflags \
add_defs \
- set_defs \
set_include \
add_ldflags \
set_ldflags \
@@ -221,28 +207,20 @@ $(eval $(foreach method,\
use_api \
use_sdk_api \
use_udk_api \
- add_internal_api \
use_internal_api \
- add_internal_bootstrap_api \
use_internal_bootstrap_api \
- add_internal_comprehensive_api \
use_internal_comprehensive_api \
- add_linked_libs \
use_libraries \
- add_linked_static_libs \
use_static_libraries \
use_external \
use_externals \
- add_custom_headers \
use_custom_headers \
use_package \
use_packages \
use_unpacked \
use_restarget \
- add_package_headers \
add_sdi_headers \
set_precompiled_header \
- add_precompiled_header \
export_objects_list \
add_nativeres \
set_nativeres \
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 8e7e002..4f71cf1 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -627,54 +627,22 @@ $(call gb_LinkTarget_get_target,$(1)) : DEFS += $(2)
$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS += $(2)
endef
-define gb_LinkTarget_set_defs
-$$(call gb_Output_error,\
- gb_LinkTarget_set_defs: use gb_LinkTarget_add_defs instead.)
-endif
-
-endef
-
# call gb_LinkTarget_add_cflags,linktarget,cflags
define gb_LinkTarget_add_cflags
$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS_APPEND += $(2)
endef
-define gb_LinkTarget_set_cflags
-$$(call gb_Output_error,\
- gb_LinkTarget_set_cflags: use gb_LinkTarget_add_cflags instead.)
-endif
-
-endef
-
# call gb_LinkTarget_add_cxxflags,linktarget,cxxflags
define gb_LinkTarget_add_cxxflags
$(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS_APPEND += $(2)
$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS += $(2)
endef
-define gb_LinkTarget_set_cxxflags
-$$(call gb_Output_error,\
- gb_LinkTarget_set_cxxflags: use gb_LinkTarget_add_cxxflags instead.)
-
-endef
-
# call gb_LinkTarget_add_objcxxflags,linktarget,objcxxflags
define gb_LinkTarget_add_objcxxflags
$(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS_APPEND += $(2)
endef
-define gb_LinkTarget_set_objcxxflags
-$$(call gb_Output_error,\
- gb_LinkTarget_set_objcxxflags: use gb_LinkTarget_add_objcxxflags instead.)
-
-endef
-
-define gb_LinkTarget_set_objcflags
-$$(call gb_Output_error,\
- gb_LinkTarget_set_objcflags: use gb_LinkTarget_add_objcflags instead.)
-
-endef
-
# call gb_LinkTarget_add_objcflags,linktarget,objcflags
define gb_LinkTarget_add_objcflags
$(call gb_LinkTarget_get_target,$(1)) : T_OBJCFLAGS_APPEND += $(2)
@@ -702,11 +670,6 @@ $(call gb_LinkTarget_get_target,$(1)) : INCLUDE := $(2)
endef
-define gb_LinkTarget_set_include_stl
-$$(call gb_Output_error,\
- gb_LinkTarget_set_include_stl: removed, why is anybody calling it?)
-endef
-
# call gb_LinkTarget_add_ldflags,linktarget,ldflags
define gb_LinkTarget_add_ldflags
$(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS += $(2)
@@ -773,21 +736,6 @@ $(foreach api,$(2),$(call gb_LinkTarget__use_internal_api_one,$(1),$(api),$(3)))
endef
-define gb_LinkTarget_add_internal_api
-$$(call gb_Output_error,\
- gb_LinkTarget_add_internal_api: use gb_LinkTarget_use_internal_api instead.)
-endef
-
-define gb_LinkTarget_add_internal_bootstrap_api
-$$(call gb_Output_error,\
- gb_LinkTarget_add_internal_bootstrap_api: use gb_LinkTarget_use_internal_bootstrap_api instead.)
-endef
-
-define gb_LinkTarget_add_internal_comprehensive_api
-$$(call gb_Output_error,\
- gb_LinkTarget_add_internal_comprehensive_api: use gb_LinkTarget_use_internal_comprehensive_api instead.)
-endef
-
# call gb_LinkTarget_use_internal_api,linktarget,api
define gb_LinkTarget_use_internal_api
$(call gb_LinkTarget__use_internal_api,$(1),$(2))
@@ -806,11 +754,6 @@ $(call gb_LinkTarget__use_internal_api,$(1),$(2),comprehensive_)
endef
-define gb_LinkTarget_add_linked_libs
-$$(call gb_Output_error,\
- gb_LinkTarget_add_linked_libs: use gb_LinkTarget_use_libraries instead.)
-endef
-
define gb_PrintDeps_info
$(info LibraryDep: $(1) links against $(2))
endef
@@ -898,11 +841,6 @@ endif
endef
-define gb_LinkTarget_add_linked_static_libs
-$$(call gb_Output_error,\
- gb_LinkTarget_add_linked_static_libs: use gb_LinkTarget_use_static_libraries instead.)
-endef
-
# avoid problem when a module is built partially but other modules that define
# needed static libraries is not yet built: prevent invocation of pattern rule
# for static library with invalid parameters by depending on the header target
@@ -1116,11 +1054,6 @@ define gb_LinkTarget_add_exception_object
$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS) $(call gb_LinkTarget__get_cxxflags,$(3)))
endef
-define gb_LinkTarget_add_linktarget_objects
-$$(call gb_Output_error,\
- gb_LinkTarget_add_linktarget_objects: use gb_LinkTarget__use_linktarget_objects instead.)
-endef
-
# call gb_LinkTarget__use_linktarget_objects,linktarget,linktargets
define gb_LinkTarget__use_linktarget_objects
$(call gb_LinkTarget_get_target,$(1)) : $(foreach linktarget,$(2),$(call gb_LinkTarget_get_target,$(linktarget)))
@@ -1130,11 +1063,6 @@ endif
endef
-define gb_LinkTarget_add_library_objects
-$$(call gb_Output_error,\
- gb_LinkTarget_add_library_objects: use gb_LinkTarget_use_library_objects instead.)
-endef
-
# call gb_LinkTarget_use_library_objects,linktarget,libs
define gb_LinkTarget_use_library_objects
ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2)))
@@ -1147,11 +1075,6 @@ $(call gb_LinkTarget_get_headers_target,$(1)) : \
endef
-define gb_LinkTarget_add_executable_objects
-$$(call gb_Output_error,\
- gb_LinkTarget_add_executable_objects: use gb_LinkTarget_use_executable_objects instead.)
-endef
-
# call gb_LinkTarget_use_executable_objects,linktarget,exes
define gb_LinkTarget_use_executable_objects
$(call gb_LinkTarget__use_linktarget_objects,$(1),$(foreach exe,$(2),$(call gb_Executable_get_linktarget,$(exe))))
@@ -1241,11 +1164,6 @@ $(call gb_LinkTarget_get_target,$(1)) : ILIBTARGET := $(2)
endef
-define gb_LinkTarget_set_auxtargets
-$$(call gb_Output_error,\
- gb_LinkTarget_set_auxtargets: use gb_LinkTarget_add_auxtargets instead.)
-endef
-
# Add a file that is built by the LinkTarget command and define
# a dummy touch rule for it so it can be tracked via dependencies.
# The assumption is that the file is created by linking; in case it does not
@@ -1273,11 +1191,6 @@ $(foreach aux,$(2),$(call gb_LinkTarget_add_auxtarget,$(1),$(aux)))
endef
-define gb_LinkTarget_add_custom_headers
-$$(call gb_Output_error,\
- gb_LinkTarget_add_custom_headers: use gb_LinkTarget_use_custom_headers instead.)
-endef
-
# call gb_LinkTarget__use_custom_headers,linktarget,customtarget
define gb_LinkTarget__use_custom_headers
$(call gb_LinkTarget_get_headers_target,$(1)) :| \
@@ -1292,11 +1205,6 @@ $(foreach customtarget,$(2),$(call gb_LinkTarget__use_custom_headers,$(1),$(cust
endef
-define gb_LinkTarget_add_package_headers
-$$(call gb_Output_error,\
- gb_LinkTarget_add_package_headers: use gb_LinkTarget_use_package instead.)
-endef
-
# add SDI (svidl) headers
# call gb_LinkTarget_add_sdi_headers,linktarget,sditargets
define gb_LinkTarget_add_sdi_headers
@@ -1337,11 +1245,6 @@ endif
endef
-define gb_LinkTarget_add_precompiled_header
-$$(call gb_Output_error,\
- gb_LinkTarget_add_precompiled_header: use gb_LinkTarget_set_precompiled_header instead.)
-endef
-
# use a header package, possibly from another module
# call gb_LinkTarget_use_package,linktarget,package
define gb_LinkTarget_use_package
diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk
index d65aec6..1bbc873 100644
--- a/solenv/gbuild/Rdb.mk
+++ b/solenv/gbuild/Rdb.mk
@@ -53,11 +53,6 @@ $(call gb_Helper_install_final, \
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/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index 388e6e2..1535e44 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -71,14 +71,10 @@ $(eval $(foreach method,\
add_generated_cxxobjects \
add_generated_exception_objects \
add_cflags \
- set_cflags \
add_cxxflags \
- set_cxxflags \
add_objcflags \
add_objcxxflags \
- set_objcxxflags \
add_defs \
- set_defs \
set_include \
add_ldflags \
set_ldflags \
@@ -93,9 +89,7 @@ $(eval $(foreach method,\
use_internal_comprehensive_api \
use_external \
use_externals \
- add_custom_headers \
use_custom_headers \
- add_package_headers \
use_package \
use_packages \
use_unpacked \
@@ -103,7 +97,6 @@ $(eval $(foreach method,\
use_static_libraries \
add_sdi_headers \
set_precompiled_header \
- add_precompiled_header \
set_warnings_not_errors \
set_generated_cxx_suffix \
,\
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 61fd02c..28695b8 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -208,10 +208,6 @@ $(call gb_UnoApiHeadersTarget_get_$(3),$(1)) : UNOAPI_DEPS += -X$(call gb_UnoApi
endef
-define gb_UnoApiHeadersTarget_add_rdbfile
-$$(call gb_Output_error,gb_UnoApiHeadersTarget_add_rdbfile: use gb_UnoApiHeadersTarget_use_api instead.)
-endef
-
define gb_UnoApiHeadersTarget__use_api
$(call gb_UnoApiHeadersTarget__use_api_for_target,$(1),$(2),target)
$(call gb_UnoApiHeadersTarget__use_api_for_target,$(1),$(2),bootstrap_target)
@@ -219,10 +215,6 @@ $(call gb_UnoApiHeadersTarget__use_api_for_target,$(1),$(2),comprehensive_target
endef
-define gb_UnoApiHeadersTarget_add_rdbfiles
-$$(call gb_Output_error,gb_UnoApiHeadersTarget_add_rdbfiles: use gb_UnoApiHeadersTarget_use_api instead.)
-endef
-
define gb_UnoApiHeadersTarget_use_api
$(foreach rdb,$(2),$(call gb_UnoApiHeadersTarget__use_api,$(1),$(rdb)))
diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk
index 0508bde..1d3e8c25 100644
--- a/solenv/gbuild/WinResTarget.mk
+++ b/solenv/gbuild/WinResTarget.mk
@@ -66,10 +66,6 @@ $(call gb_WinResTarget_get_clean_target,%) :
rm -f $(call gb_WinResTarget_get_target,$*) \
$(call gb_WinResTarget_get_dep_target,$*))
-define gb_WinResTarget_set_defs
-$$(call gb_Output_error,gb_WinResTarget_set_defs: use gb_WinResTarget_add_defs instead.)
-endef
-
define gb_WinResTarget_add_defs
$(call gb_WinResTarget_get_target,$(1)) : DEFS += $(2)
@@ -97,10 +93,6 @@ endif
endef
-define gb_WinResTarget_add_file
-$$(call gb_Output_error,gb_WinResTarget_add_file: use gb_WinResTarget_set_rcfile instead.)
-endef
-
define gb_WinResTarget_set_rcfile
$(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE := $(SRCDIR)/$(strip $(2)).rc
$(call gb_WinResTarget_get_target,$(1)) : RCFILE := $(SRCDIR)/$(strip $(2)).rc
More information about the Libreoffice-commits
mailing list