Skip to content

Commit 6b79d8b

Browse files
FlamefireFlamefire
committed
Refactor ICU search for more clarity
1 parent bce1f9e commit 6b79d8b

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed

‎build/Jamfile.v2‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ if $(.icu-path)
9595
debug-message ICU path set to "$(.icu-path)" ;
9696
}
9797

98-
rule path_options ( properties * )
98+
rule icu_search_paths ( properties * )
9999
{
100100
local result ;
101101
if <address-model>64 in $(properties) && <toolset>msvc in $(properties)
@@ -126,53 +126,53 @@ if [ modules.peek : ICU_ICUIN_NAME ]
126126

127127
if $(ICU_ICUUC_NAME)
128128
{
129-
searched-lib icuuc : : <name>$(ICU_ICUUC_NAME) <conditional>@path_options ;
129+
searched-lib icuuc : : <name>$(ICU_ICUUC_NAME) <conditional>@icu_search_paths ;
130130
debug-message Using "$(ICU_ICUUC_NAME)" for library "icuuc" ;
131131
}
132132
else
133133
{
134-
searched-lib icuuc : : <runtime-link>shared <conditional>@path_options ;
135-
searched-lib icuuc : : <toolset>msvc <variant>debug <name>icuucd <runtime-link>shared <conditional>@path_options ;
136-
searched-lib icuuc : : <toolset>intel <target-os>windows <variant>debug <name>icuucd <runtime-link>shared <conditional>@path_options ;
137-
searched-lib icuuc : : <name>sicuuc <runtime-link>static <conditional>@path_options ;
138-
searched-lib icuuc : : <toolset>msvc <variant>debug <name>sicuucd <runtime-link>static <conditional>@path_options ;
139-
searched-lib icuuc : : <toolset>intel <target-os>windows <variant>debug <name>sicuucd <runtime-link>static <conditional>@path_options ;
134+
searched-lib icuuc : : <name>icuuc <runtime-link>shared <conditional>@icu_search_paths ;
135+
searched-lib icuuc : : <toolset>msvc <variant>debug <name>icuucd <runtime-link>shared <conditional>@icu_search_paths ;
136+
searched-lib icuuc : : <toolset>intel <target-os>windows <variant>debug <name>icuucd <runtime-link>shared <conditional>@icu_search_paths ;
137+
searched-lib icuuc : : <name>sicuuc <runtime-link>static <conditional>@icu_search_paths ;
138+
searched-lib icuuc : : <toolset>msvc <variant>debug <name>sicuucd <runtime-link>static <conditional>@icu_search_paths ;
139+
searched-lib icuuc : : <toolset>intel <target-os>windows <variant>debug <name>sicuucd <runtime-link>static <conditional>@icu_search_paths ;
140140
searched-lib icuuc : : <name>this_is_an_invalid_library_name ;
141141
}
142142

143143
if $(ICU_ICUDT_NAME)
144144
{
145-
searched-lib icudt : : <name>$(ICU_ICUDT_NAME) <conditional>@path_options ;
145+
searched-lib icudt : : <name>$(ICU_ICUDT_NAME) <conditional>@icu_search_paths ;
146146
debug-message Using "$(ICU_ICUDT_NAME)" for library "icudt" ;
147147
}
148148
else
149149
{
150-
searched-lib icudt : : <name>icudata <runtime-link>shared <conditional>@path_options ;
151-
searched-lib icudt : : <name>icudt <toolset>msvc <runtime-link>shared <conditional>@path_options ;
152-
searched-lib icudt : : <name>icudt <toolset>intel <target-os>windows <runtime-link>shared <conditional>@path_options ;
153-
searched-lib icudt : : <name>sicudata <runtime-link>static <conditional>@path_options ;
154-
searched-lib icudt : : <name>sicudt <toolset>msvc <runtime-link>static <conditional>@path_options ;
155-
searched-lib icudt : : <name>sicudt <toolset>intel <target-os>windows <runtime-link>static <conditional>@path_options ;
150+
searched-lib icudt : : <name>icudata <runtime-link>shared <conditional>@icu_search_paths ;
151+
searched-lib icudt : : <toolset>msvc <name>icudt <runtime-link>shared <conditional>@icu_search_paths ;
152+
searched-lib icudt : : <toolset>intel <target-os>windows <name>icudt <runtime-link>shared <conditional>@icu_search_paths ;
153+
searched-lib icudt : : <name>sicudata <runtime-link>static <conditional>@icu_search_paths ;
154+
searched-lib icudt : : <toolset>msvc <name>sicudt <runtime-link>static <conditional>@icu_search_paths ;
155+
searched-lib icudt : : <toolset>intel <target-os>windows <name>sicudt <runtime-link>static <conditional>@icu_search_paths ;
156156
searched-lib icudt : : <name>this_is_an_invalid_library_name ;
157157
}
158158

159159
if $(ICU_ICUIN_NAME)
160160
{
161-
searched-lib icuin : : <name>$(ICU_ICUIN_NAME) <conditional>@path_options ;
161+
searched-lib icuin : : <name>$(ICU_ICUIN_NAME) <conditional>@icu_search_paths ;
162162
debug-message Using "$(ICU_ICUIN_NAME)" for library "icuin" ;
163163
}
164164
else
165165
{
166-
searched-lib icuin : : <name>icui18n <runtime-link>shared <conditional>@path_options ;
167-
searched-lib icuin : : <toolset>msvc <variant>debug <name>icuind <runtime-link>shared <conditional>@path_options ;
168-
searched-lib icuin : : <toolset>msvc <name>icuin <runtime-link>shared <conditional>@path_options ;
169-
searched-lib icuin : : <toolset>intel <target-os>windows <variant>debug <name>icuind <runtime-link>shared <conditional>@path_options ;
170-
searched-lib icuin : : <toolset>intel <target-os>windows <name>icuin <runtime-link>shared <conditional>@path_options ;
171-
searched-lib icuin : : <name>sicui18n <runtime-link>static <conditional>@path_options ;
172-
searched-lib icuin : : <toolset>msvc <variant>debug <name>sicuind <runtime-link>static <conditional>@path_options ;
173-
searched-lib icuin : : <toolset>msvc <name>sicuin <runtime-link>static <conditional>@path_options ;
174-
searched-lib icuin : : <toolset>intel <target-os>windows <variant>debug <name>sicuind <runtime-link>static <conditional>@path_options ;
175-
searched-lib icuin : : <toolset>intel <target-os>windows <name>sicuin <runtime-link>static <conditional>@path_options ;
166+
searched-lib icuin : : <name>icui18n <runtime-link>shared <conditional>@icu_search_paths ;
167+
searched-lib icuin : : <toolset>msvc <variant>debug <name>icuind <runtime-link>shared <conditional>@icu_search_paths ;
168+
searched-lib icuin : : <toolset>msvc <name>icuin <runtime-link>shared <conditional>@icu_search_paths ;
169+
searched-lib icuin : : <toolset>intel <target-os>windows <variant>debug <name>icuind <runtime-link>shared <conditional>@icu_search_paths ;
170+
searched-lib icuin : : <toolset>intel <target-os>windows <name>icuin <runtime-link>shared <conditional>@icu_search_paths ;
171+
searched-lib icuin : : <name>sicui18n <runtime-link>static <conditional>@icu_search_paths ;
172+
searched-lib icuin : : <toolset>msvc <variant>debug <name>sicuind <runtime-link>static <conditional>@icu_search_paths ;
173+
searched-lib icuin : : <toolset>msvc <name>sicuin <runtime-link>static <conditional>@icu_search_paths ;
174+
searched-lib icuin : : <toolset>intel <target-os>windows <variant>debug <name>sicuind <runtime-link>static <conditional>@icu_search_paths ;
175+
searched-lib icuin : : <toolset>intel <target-os>windows <name>sicuin <runtime-link>static <conditional>@icu_search_paths ;
176176
searched-lib icuin : : <name>this_is_an_invalid_library_name ;
177177
}
178178

0 commit comments

Comments
 (0)