25
25
using namespace rime ;
26
26
using namespace std ::placeholders;
27
27
28
- // assuming member is a pointer in struct *p
28
+ // assume member is a non-null pointer in struct *p.
29
29
#define PROVIDED (p, member ) ((p) && RIME_STRUCT_HAS_MEMBER(*(p), (p)->member) && (p)->member)
30
30
31
- static void setup_deployer (RimeTraits *traits) {
32
- if (!traits) return ;
33
- Deployer &deployer (Service::instance ().deployer ());
34
- if (PROVIDED (traits, shared_data_dir))
35
- deployer.shared_data_dir = traits->shared_data_dir ;
36
- if (PROVIDED (traits, user_data_dir))
37
- deployer.user_data_dir = traits->user_data_dir ;
38
- if (PROVIDED (traits, distribution_name))
39
- deployer.distribution_name = traits->distribution_name ;
40
- if (PROVIDED (traits, distribution_code_name))
41
- deployer.distribution_code_name = traits->distribution_code_name ;
42
- if (PROVIDED (traits, distribution_version))
43
- deployer.distribution_version = traits->distribution_version ;
44
- if (PROVIDED (traits, prebuilt_data_dir))
45
- deployer.prebuilt_data_dir = traits->prebuilt_data_dir ;
46
- else
47
- deployer.prebuilt_data_dir = deployer.shared_data_dir / " build" ;
48
- if (PROVIDED (traits, staging_dir))
49
- deployer.staging_dir = traits->staging_dir ;
50
- else
51
- deployer.staging_dir = deployer.user_data_dir / " build" ;
52
- }
53
-
54
31
RIME_API void RimeSetupLogging (const char * app_name) {
55
32
SetupLogging (app_name);
56
33
}
@@ -74,7 +51,7 @@ static void rime_declare_module_dependencies() {
74
51
RIME_API void RimeSetup (RimeTraits *traits) {
75
52
rime_declare_module_dependencies ();
76
53
77
- setup_deployer (traits);
54
+ SetupDeployer (traits);
78
55
if (PROVIDED (traits, app_name)) {
79
56
if (RIME_STRUCT_HAS_MEMBER (*traits, traits->min_log_level ) &&
80
57
RIME_STRUCT_HAS_MEMBER (*traits, traits->log_dir )) {
@@ -97,7 +74,7 @@ RIME_API void RimeSetNotificationHandler(RimeNotificationHandler handler,
97
74
}
98
75
99
76
RIME_API void RimeInitialize (RimeTraits *traits) {
100
- setup_deployer (traits);
77
+ SetupDeployer (traits);
101
78
LoadModules (PROVIDED (traits, modules) ? traits->modules : kDefaultModules );
102
79
Service::instance ().StartService ();
103
80
}
@@ -152,7 +129,7 @@ RIME_API void RimeJoinMaintenanceThread() {
152
129
// deployment
153
130
154
131
RIME_API void RimeDeployerInitialize (RimeTraits *traits) {
155
- setup_deployer (traits);
132
+ SetupDeployer (traits);
156
133
LoadModules (PROVIDED (traits, modules) ? traits->modules : kDeployerModules );
157
134
}
158
135
0 commit comments