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
|
diff --git a/scp2/InstallModule_draw.mk b/scp2/InstallModule_draw.mk
index a7c02be..d48edf2 100644
--- a/scp2/InstallModule_draw.mk
+++ b/scp2/InstallModule_draw.mk
@@ -10,6 +10,7 @@
$(eval $(call gb_InstallModule_InstallModule,scp2/draw))
$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/draw,\
+ draw \
draw_brand \
))
diff --git a/scp2/source/draw/module_draw.scp b/scp2/source/draw/module_draw.scp
index 8737579..0913c61 100644
--- a/scp2/source/draw/module_draw.scp
+++ b/scp2/source/draw/module_draw.scp
@@ -18,6 +18,7 @@
#include "macros.inc"
+#include "AutoInstall/draw"
#include "AutoInstall/draw_brand"
Module gid_Module_Prg_Draw
@@ -34,7 +35,8 @@ Module gid_Module_Prg_Draw_Bin
Sortkey = "100";
Default = YES;
Styles = (HIDDEN_ROOT);
- Files = (gid_File_Extra_Urldesktop_Draw,gid_File_Extra_Urlnew_Draw,gid_File_Extra_Urlstart_Draw,gid_File_Extra_Urltasks_Draw,
+ Files = (auto_draw_ALL,
+ gid_File_Extra_Urldesktop_Draw,gid_File_Extra_Urlnew_Draw,gid_File_Extra_Urlstart_Draw,gid_File_Extra_Urltasks_Draw,
gid_File_Share_Registry_Draw_Xcd,
gid_File_Tmp_Userinstall_Draw_Inf);
End
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 7d2a347..a15ac52 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_AutoInstall_add_module,base_brand,,LIBO_EXECUTABLE,,PACKAGE_FIL
$(eval $(call gb_AutoInstall_add_module,brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
$(eval $(call gb_AutoInstall_add_module,calc,LIBO_LIB_FILE,,,PACKAGE_FILELIST))
$(eval $(call gb_AutoInstall_add_module,calc_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,draw,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,draw_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
$(eval $(call gb_AutoInstall_add_module,extensions_ct2n,,,,PACKAGE_FILELIST))
$(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE))
diff --git a/Repository.mk b/Repository.mk
index 36b35b7a4262..25f202cb0983 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -245,13 +245,29 @@ $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,base, \
abp \
+ calc \
+ dba \
+ dbahsql \
+ $(call gb_Helper_optional,DBCONNECTIVITY, \
+ dbase \
+ dbaxml) \
dbp \
dbu \
+ $(call gb_Helper_optional,DBCONNECTIVITY,flat) \
+ $(if $(ENABLE_JAVA),jdbc) \
+ $(call gb_Helper_optional,DBCONNECTIVITY,mysql_jdbc) \
+ $(call gb_Helper_optional,MARIADBC,$(call gb_Helper_optional,DBCONNECTIVITY,mysqlc)) \
+ odbc \
+))
+
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,base, \
+ $(call gb_Helper_optional,DBCONNECTIVITY,dbpool2) \
+ $(if $(ENABLE_JAVA),hsqldb) \
+ sdbc2 \
))
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,calc, \
analysis \
- $(call gb_Helper_optional,DBCONNECTIVITY,calc) \
date \
pricing \
sc \
@@ -263,6 +279,14 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,calc, \
$(call gb_Helper_optional,SCRIPTING,vbaobj) \
))
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,draw, \
+ animcore \
+ sd \
+ sdd \
+ sdfilt \
+ sdui \
+))
+
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,graphicfilter, \
svgfilter \
wpftdraw \
@@ -271,10 +295,10 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,graphicfilter, \
))
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,impress, \
- animcore \
PresenterScreen \
PresentationMinimizer \
wpftimpress \
+ slideshow \
))
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,onlineupdate, \
@@ -349,11 +349,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
configmgr \
ctl \
cui \
- dba \
- dbahsql \
- $(call gb_Helper_optional,DBCONNECTIVITY, \
- dbase \
- dbaxml) \
dbtools \
deploymentmisc \
$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
@@ -366,7 +386,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
evtatt \
expwrap \
$(call gb_Helper_optional,DBCONNECTIVITY, \
- flat \
file) \
filterconfig \
fps_office \
@@ -387,7 +406,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
gie \
hyphen \
icg \
- $(if $(ENABLE_JAVA),jdbc) \
$(if $(ENABLE_LDAP),ldapbe2) \
$(if $(filter WNT,$(OS)),WinUserInfoBe) \
localebe1 \
@@ -403,10 +421,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
msfilter \
$(call gb_Helper_optional,SCRIPTING,msforms) \
mtfrenderer \
- $(call gb_Helper_optional,DBCONNECTIVITY,mysql_jdbc) \
- $(call gb_Helper_optional,MARIADBC,$(call gb_Helper_optional,DBCONNECTIVITY,mysqlc)) \
numbertext \
- odbc \
odfflatxml \
offacc \
oox \
@@ -419,13 +434,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
sb \
$(call gb_Helper_optional,DBCONNECTIVITY,sdbt) \
scn \
- sd \
- sdd \
- sdfilt \
- sdui \
sfx \
simplecanvas \
- slideshow \
sot \
$(if $(filter-out iOS,$(OS)),spell) \
$(if $(DISABLE_GUI),,spl) \
@@ -437,7 +447,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
svt \
svx \
svxcore \
- sw \
syssh \
textconversiondlgs \
textfd \
@@ -522,6 +531,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,writer, \
hwp \
$(if $(ENABLE_LWP),lwpft) \
msword \
+ sw \
swd \
swui \
t602filter \
@@ -600,14 +610,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
cached1 \
collator_data \
comphelper \
- $(call gb_Helper_optional,DBCONNECTIVITY,dbpool2) \
$(call gb_Helper_optional,BREAKPAD,crashreport) \
deployment \
deploymentgui \
dict_ja \
dict_zh \
embobj \
- $(if $(ENABLE_JAVA),hsqldb) \
i18nutil \
index_data \
$(if $(and $(ENABLE_GTK3), $(filter LINUX %BSD SOLARIS,$(OS))), libreofficekitgtk) \
@@ -623,7 +631,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
emboleobj \
package2 \
$(call gb_Helper_optional,SCRIPTING,scriptframe) \
- sdbc2 \
sofficeapp \
srtrs1 \
$(if $(filter $(OS),WNT),sysdtrans) \
|
