1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
|
diff --git a/testtools/CustomTarget_bridgetest.mk b/testtools/CustomTarget_bridgetest.mk
index 9e934f03498a..7da8883c8e7c 100644
--- a/testtools/CustomTarget_bridgetest.mk
+++ b/testtools/CustomTarget_bridgetest.mk
@@ -28,7 +28,7 @@ $(testtools_BRIDGEDIR)/bridgetest_server$(testtools_BATCHSUFFIX) :| $(testtools_
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH)
$(call gb_Helper_abbreviate_dirs,\
echo \
- "$(call gb_Executable_get_target_for_build,uno)" \
+ "/usr/lib/libreoffice/program/uno" \
"-s com.sun.star.test.bridge.CppTestObject" \
"-u 'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test'" \
"--singleaccept" \
@@ -63,7 +63,7 @@ $(testtools_BRIDGEDIR)/bridgetest_client$(testtools_BATCHSUFFIX) :| $(testtools_
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH)
$(call gb_Helper_abbreviate_dirs,\
echo \
- "$(call gb_Executable_get_target_for_build,uno)" \
+ "/usr/lib/libreoffice/program/uno" \
"-s com.sun.star.test.bridge.BridgeTest --" \
"-u 'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test'" \
"-env:LO_BUILD_LIB_DIR=$(call gb_Helper_make_url,$(gb_Library_WORKDIR_FOR_BUILD))" \
diff --git a/testtools/CustomTarget_uno_test.mk b/testtools/CustomTarget_uno_test.mk
index 04d600b17c64..c3b6069acc42 100644
--- a/testtools/CustomTarget_uno_test.mk
+++ b/testtools/CustomTarget_uno_test.mk
@@ -30,14 +30,14 @@ ifneq ($(gb_SUPPRESS_TESTS),)
@true
else
$(call gb_Helper_abbreviate_dirs,\
- $(call gb_Executable_get_command,uno) \
+ /usr/lib/libreoffice/program/uno \
-s com.sun.star.test.bridge.BridgeTest \
-- com.sun.star.test.bridge.CppTestObject \
-env:LO_BUILD_LIB_DIR=$(call gb_Helper_make_url,$(gb_Library_WORKDIR_FOR_BUILD)) \
-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target,uno_services)) \
-env:URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb) \
$(if $(ENABLE_JAVA), && \
- $(call gb_Executable_get_command,uno) \
+ /usr/lib/libreoffice/program/uno \
-s com.sun.star.test.bridge.BridgeTest \
-- com.sun.star.test.bridge.JavaTestObject noCurrentContext \
-env:LO_BUILD_LIB_DIR=$(call gb_Helper_make_url,$(gb_Library_WORKDIR_FOR_BUILD)) \
#diff --git a/testtools/Library_bridgetest-common.mk b/testtools/Library_bridgetest-common.mk
#index 1ca38bca6b49..cbc793c36d39 100644
#--- a/testtools/Library_bridgetest-common.mk
#+++ b/testtools/Library_bridgetest-common.mk
#@@ -20,16 +20,6 @@ $(eval $(call gb_Library_use_internal_api,testtools_bridgetest-common,\
# bridgetest \
# ))
#
#-$(eval $(call gb_Library_use_libraries,testtools_bridgetest-common, \
#- cppu \
#- cppuhelper \
#- sal \
#-))
#-
#-$(eval $(call gb_Library_use_api,testtools_bridgetest-common,\
#- udkapi \
#-))
#-
# $(eval $(call gb_Library_add_exception_objects,testtools_bridgetest-common,\
# testtools/source/bridgetest/currentcontextchecker \
# testtools/source/bridgetest/multi \
#diff --git a/testtools/Library_bridgetest.mk b/testtools/Library_bridgetest.mk
#index 52f335761fdf..f0bafca0998f 100644
#--- a/testtools/Library_bridgetest.mk
#+++ b/testtools/Library_bridgetest.mk
#@@ -15,16 +15,9 @@ $(eval $(call gb_Library_use_internal_api,testtools_bridgetest,\
# bridgetest \
# ))
#
#-$(eval $(call gb_Library_use_api,testtools_bridgetest,\
#- udkapi \
#-))
#-
# $(eval $(call gb_Library_use_external,testtools_bridgetest,boost_headers))
#
# $(eval $(call gb_Library_use_libraries,testtools_bridgetest,\
#- cppu \
#- cppuhelper \
#- sal \
# testtools_bridgetest-common \
# ))
#
#diff --git a/testtools/Library_constructors.mk b/testtools/Library_constructors.mk
#index 516c05d62db8..3a2a4b8bca24 100644
#--- a/testtools/Library_constructors.mk
#+++ b/testtools/Library_constructors.mk
#@@ -22,16 +22,6 @@ $(eval $(call gb_Library_use_internal_api,testtools_constructors,\
# bridgetest \
# ))
#
#-$(eval $(call gb_Library_use_api,testtools_constructors,\
#- udkapi \
#-))
#-
#-$(eval $(call gb_Library_use_libraries,testtools_constructors,\
#- cppu \
#- cppuhelper \
#- sal \
#-))
#-
# $(eval $(call gb_Library_add_exception_objects,testtools_constructors,\
# testtools/source/bridgetest/constructors \
# ))
#diff --git a/testtools/Library_cppobj.mk b/testtools/Library_cppobj.mk
#index 086b1fa0b6f5..9348254b6da8 100644
#--- a/testtools/Library_cppobj.mk
#+++ b/testtools/Library_cppobj.mk
#@@ -20,16 +20,9 @@ $(eval $(call gb_Library_use_internal_api,testtools_cppobj,\
# bridgetest \
# ))
#
#-$(eval $(call gb_Library_use_api,testtools_cppobj,\
#- udkapi \
#-))
#-
# $(eval $(call gb_Library_use_external,testtools_cppobj,boost_headers))
#
# $(eval $(call gb_Library_use_libraries,testtools_cppobj,\
#- cppu \
#- cppuhelper \
#- sal \
# testtools_bridgetest-common \
# ))
#
#diff --git a/unoidl/Executable_unoidl-check.mk b/unoidl/Executable_unoidl-check.mk
#index 36dfc44de635..a1bb6ed14d80 100644
#--- a/unoidl/Executable_unoidl-check.mk
#+++ b/unoidl/Executable_unoidl-check.mk
#@@ -15,10 +15,13 @@ $(eval $(call gb_Executable_add_exception_objects,unoidl-check, \
#
# $(eval $(call gb_Executable_use_libraries,unoidl-check, \
# unoidl \
#- $(if $(filter TRUE,$(DISABLE_DYNLOADING)),reg) \
#- $(if $(filter TRUE,$(DISABLE_DYNLOADING)),store) \
#- salhelper \
#- sal \
#+))
#+
#+$(eval $(call gb_Executable_add_ldflags,unoidl-check, \
#+ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-L/usr/lib/libreoffice/program/ -lreglo) \
#+ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-L/usr/lib/libreoffice/program/ -lstorelo) \
#+ -L/usr/lib/libreoffice/sdk/lib/ -luno_sal \
#+ -L/usr/lib/libreoffice/sdk/lib/ -luno_salhelpergcc3 \
# ))
#
# # vim: set noet sw=4 ts=4:
#diff --git a/unoidl/Executable_unoidl-read.mk b/unoidl/Executable_unoidl-read.mk
#index b134c30b1a72..2bfd0ea3057f 100644
#--- a/unoidl/Executable_unoidl-read.mk
#+++ b/unoidl/Executable_unoidl-read.mk
#@@ -15,10 +15,13 @@ $(eval $(call gb_Executable_add_exception_objects,unoidl-read, \
#
# $(eval $(call gb_Executable_use_libraries,unoidl-read, \
# unoidl \
#- $(if $(filter TRUE,$(DISABLE_DYNLOADING)),reg) \
#- $(if $(filter TRUE,$(DISABLE_DYNLOADING)),store) \
#- salhelper \
#- sal \
#+))
#+
#+$(eval $(call gb_Executable_add_ldflags,unoidl-read, \
#+ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-L/usr/lib/libreoffice/program/ -lreglo) \
#+ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-L/usr/lib/libreoffice/program/ -lstorelo) \
#+ -L/usr/lib/libreoffice/sdk/lib/ -luno_sal \
#+ -L/usr/lib/libreoffice/sdk/lib/ -luno_salhelpergcc3 \
# ))
#
# # vim: set noet sw=4 ts=4:
#diff --git a/unoidl/Executable_unoidl-write.mk b/unoidl/Executable_unoidl-write.mk
#index 9accb31ac14d..f69d78a09c32 100644
#--- a/unoidl/Executable_unoidl-write.mk
#+++ b/unoidl/Executable_unoidl-write.mk
#@@ -15,10 +15,15 @@ $(eval $(call gb_Executable_add_exception_objects,unoidl-write, \
#
# $(eval $(call gb_Executable_use_libraries,unoidl-write, \
# unoidl \
#- $(if $(filter TRUE,$(DISABLE_DYNLOADING)),reg) \
#- $(if $(filter TRUE,$(DISABLE_DYNLOADING)),store) \
#- salhelper \
#- sal \
# ))
#
#+$(eval $(call gb_Executable_add_ldflags,unoidl-write, \
#+ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-L/usr/lib/libreoffice/program/ -lreglo) \
#+ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-L/usr/lib/libreoffice/program/ -lstorelo) \
#+ -L/usr/lib/libreoffice/sdk/lib/ -luno_sal \
#+ -L/usr/lib/libreoffice/sdk/lib/ -luno_salhelpergcc3 \
#+))
#+
#+
#+
# # vim: set noet sw=4 ts=4:
#diff --git a/unoidl/Library_unoidl.mk b/unoidl/Library_unoidl.mk
#index c98fc69f4945..bdc8285fe234 100644
#--- a/unoidl/Library_unoidl.mk
#+++ b/unoidl/Library_unoidl.mk
#@@ -32,10 +32,10 @@ $(eval $(call gb_Library_set_include,unoidl, \
# -I$(SRCDIR)/unoidl/source \
# ))
#
#-$(eval $(call gb_Library_use_libraries,unoidl, \
#- reg \
#- sal \
#- salhelper \
#+$(eval $(call gb_Library_add_libs,unoidl, \
#+ -L/usr/lib/libreoffice/program/ -lreglo \
#+ -L/usr/lib/libreoffice/sdk/lib/ -luno_sal \
#+ -L/usr/lib/libreoffice/sdk/lib/ -luno_salhelpergcc3 \
# ))
#
# # vim: set noet sw=4 ts=4:
|
