Skip to content

Commit b7ef860

Browse files
waruqiwaruqi
committed
rename api
1 parent 8317c65 commit b7ef860

File tree

5 files changed

+69
-69
lines changed

5 files changed

+69
-69
lines changed

‎xmake/modules/package/tools/autoconf.lua

+25-25
Original file line numberDiff line numberDiff line change
@@ -188,13 +188,13 @@ function _get_cflags_from_packagedeps(package, opt)
188188
local result = {}
189189
if values then
190190
if values.defines then
191-
table.join2(result, toolchain_utils.map_compflags(package, "cxx", "define", values.defines))
191+
table.join2(result, toolchain_utils.map_compflags_for_package(package, "cxx", "define", values.defines))
192192
end
193193
if values.includedirs then
194-
table.join2(result, _translate_paths(toolchain_utils.map_compflags(package, "cxx", "includedir", values.includedirs)))
194+
table.join2(result, _translate_paths(toolchain_utils.map_compflags_for_package(package, "cxx", "includedir", values.includedirs)))
195195
end
196196
if values.sysincludedirs then
197-
table.join2(result, _translate_paths(toolchain_utils.map_compflags(package, "cxx", "sysincludedir", values.sysincludedirs)))
197+
table.join2(result, _translate_paths(toolchain_utils.map_compflags_for_package(package, "cxx", "sysincludedir", values.sysincludedirs)))
198198
end
199199
end
200200
return result
@@ -219,16 +219,16 @@ function _get_ldflags_from_packagedeps(package, opt)
219219
local result = {}
220220
if values then
221221
if values.linkdirs then
222-
table.join2(result, _translate_paths(toolchain_utils.map_linkflags(package, "binary", {"cxx"}, "linkdir", values.linkdirs)))
222+
table.join2(result, _translate_paths(toolchain_utils.map_linkflags_for_package(package, "binary", {"cxx"}, "linkdir", values.linkdirs)))
223223
end
224224
if values.links then
225-
table.join2(result, toolchain_utils.map_linkflags(package, "binary", {"cxx"}, "link", values.links))
225+
table.join2(result, toolchain_utils.map_linkflags_for_package(package, "binary", {"cxx"}, "link", values.links))
226226
end
227227
if values.syslinks then
228-
table.join2(result, _translate_paths(toolchain_utils.map_linkflags(package, "binary", {"cxx"}, "syslink", values.syslinks)))
228+
table.join2(result, _translate_paths(toolchain_utils.map_linkflags_for_package(package, "binary", {"cxx"}, "syslink", values.syslinks)))
229229
end
230230
if values.frameworks then
231-
table.join2(result, toolchain_utils.map_linkflags(package, "binary", {"cxx"}, "framework", values.frameworks))
231+
table.join2(result, toolchain_utils.map_linkflags_for_package(package, "binary", {"cxx"}, "framework", values.frameworks))
232232
end
233233
end
234234
return result
@@ -295,21 +295,21 @@ function buildenvs(package, opt)
295295
table.join2(cxxflags, _get_cflags_from_packagedeps(package, opt))
296296
table.join2(cppflags, _get_cflags_from_packagedeps(package, opt))
297297
table.join2(ldflags, _get_ldflags_from_packagedeps(package, opt))
298-
table.join2(cflags, toolchain_utils.map_compflags(package, "c", "define", defines))
299-
table.join2(cflags, toolchain_utils.map_compflags(package, "c", "includedir", includedirs))
300-
table.join2(cflags, toolchain_utils.map_compflags(package, "c", "sysincludedir", sysincludedirs))
301-
table.join2(asflags, toolchain_utils.map_compflags(package, "as", "define", defines))
302-
table.join2(asflags, toolchain_utils.map_compflags(package, "as", "includedir", includedirs))
303-
table.join2(asflags, toolchain_utils.map_compflags(package, "as", "sysincludedir", sysincludedirs))
304-
table.join2(cxxflags, toolchain_utils.map_compflags(package, "cxx", "define", defines))
305-
table.join2(cxxflags, toolchain_utils.map_compflags(package, "cxx", "includedir", includedirs))
306-
table.join2(cxxflags, toolchain_utils.map_compflags(package, "cxx", "sysincludedir", sysincludedirs))
307-
table.join2(ldflags, toolchain_utils.map_linkflags(package, "binary", {"cxx"}, "link", links))
308-
table.join2(ldflags, toolchain_utils.map_linkflags(package, "binary", {"cxx"}, "syslink", syslinks))
309-
table.join2(ldflags, toolchain_utils.map_linkflags(package, "binary", {"cxx"}, "linkdir", linkdirs))
310-
table.join2(shflags, toolchain_utils.map_linkflags(package, "shared", {"cxx"}, "link", links))
311-
table.join2(shflags, toolchain_utils.map_linkflags(package, "shared", {"cxx"}, "syslink", syslinks))
312-
table.join2(shflags, toolchain_utils.map_linkflags(package, "shared", {"cxx"}, "linkdir", linkdirs))
298+
table.join2(cflags, toolchain_utils.map_compflags_for_package(package, "c", "define", defines))
299+
table.join2(cflags, toolchain_utils.map_compflags_for_package(package, "c", "includedir", includedirs))
300+
table.join2(cflags, toolchain_utils.map_compflags_for_package(package, "c", "sysincludedir", sysincludedirs))
301+
table.join2(asflags, toolchain_utils.map_compflags_for_package(package, "as", "define", defines))
302+
table.join2(asflags, toolchain_utils.map_compflags_for_package(package, "as", "includedir", includedirs))
303+
table.join2(asflags, toolchain_utils.map_compflags_for_package(package, "as", "sysincludedir", sysincludedirs))
304+
table.join2(cxxflags, toolchain_utils.map_compflags_for_package(package, "cxx", "define", defines))
305+
table.join2(cxxflags, toolchain_utils.map_compflags_for_package(package, "cxx", "includedir", includedirs))
306+
table.join2(cxxflags, toolchain_utils.map_compflags_for_package(package, "cxx", "sysincludedir", sysincludedirs))
307+
table.join2(ldflags, toolchain_utils.map_linkflags_for_package(package, "binary", {"cxx"}, "link", links))
308+
table.join2(ldflags, toolchain_utils.map_linkflags_for_package(package, "binary", {"cxx"}, "syslink", syslinks))
309+
table.join2(ldflags, toolchain_utils.map_linkflags_for_package(package, "binary", {"cxx"}, "linkdir", linkdirs))
310+
table.join2(shflags, toolchain_utils.map_linkflags_for_package(package, "shared", {"cxx"}, "link", links))
311+
table.join2(shflags, toolchain_utils.map_linkflags_for_package(package, "shared", {"cxx"}, "syslink", syslinks))
312+
table.join2(shflags, toolchain_utils.map_linkflags_for_package(package, "shared", {"cxx"}, "linkdir", linkdirs))
313313
envs.CC = package:build_getenv("cc")
314314
envs.AS = package:build_getenv("as")
315315
envs.AR = package:build_getenv("ar")
@@ -330,9 +330,9 @@ function buildenvs(package, opt)
330330
end
331331
local runtimes = package:runtimes()
332332
if runtimes then
333-
table.join2(cxxflags, toolchain_utils.map_compflags(package, "cxx", "runtime", runtimes))
334-
table.join2(ldflags, toolchain_utils.map_linkflags(package, "binary", {"cxx"}, "runtime", runtimes))
335-
table.join2(shflags, toolchain_utils.map_linkflags(package, "shared", {"cxx"}, "runtime", runtimes))
333+
table.join2(cxxflags, toolchain_utils.map_compflags_for_package(package, "cxx", "runtime", runtimes))
334+
table.join2(ldflags, toolchain_utils.map_linkflags_for_package(package, "binary", {"cxx"}, "runtime", runtimes))
335+
table.join2(shflags, toolchain_utils.map_linkflags_for_package(package, "shared", {"cxx"}, "runtime", runtimes))
336336
end
337337
if package:config("asan") then
338338
table.join2(cflags, package:_generate_sanitizer_configs("address", "cc").cflags)

‎xmake/modules/package/tools/cmake.lua

+27-27
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,13 @@ function _get_cflags_from_packagedeps(package, opt)
134134
local result = {}
135135
if values then
136136
if values.defines then
137-
table.join2(result, toolchain_utils.map_compflags(package, "cxx", "define", values.defines))
137+
table.join2(result, toolchain_utils.map_compflags_for_package(package, "cxx", "define", values.defines))
138138
end
139139
if values.includedirs then
140-
table.join2(result, _translate_paths(toolchain_utils.map_compflags(package, "cxx", "includedir", values.includedirs)))
140+
table.join2(result, _translate_paths(toolchain_utils.map_compflags_for_package(package, "cxx", "includedir", values.includedirs)))
141141
end
142142
if values.sysincludedirs then
143-
table.join2(result, _translate_paths(toolchain_utils.map_compflags(package, "cxx", "sysincludedir", values.sysincludedirs)))
143+
table.join2(result, _translate_paths(toolchain_utils.map_compflags_for_package(package, "cxx", "sysincludedir", values.sysincludedirs)))
144144
end
145145
end
146146
return result
@@ -165,16 +165,16 @@ function _get_ldflags_from_packagedeps(package, opt)
165165
local result = {}
166166
if values then
167167
if values.linkdirs then
168-
table.join2(result, _translate_paths(toolchain_utils.map_linkflags(package, "binary", {"cxx"}, "linkdir", values.linkdirs)))
168+
table.join2(result, _translate_paths(toolchain_utils.map_linkflags_for_package(package, "binary", {"cxx"}, "linkdir", values.linkdirs)))
169169
end
170170
if values.links then
171-
table.join2(result, toolchain_utils.map_linkflags(package, "binary", {"cxx"}, "link", values.links))
171+
table.join2(result, toolchain_utils.map_linkflags_for_package(package, "binary", {"cxx"}, "link", values.links))
172172
end
173173
if values.syslinks then
174-
table.join2(result, _translate_paths(toolchain_utils.map_linkflags(package, "binary", {"cxx"}, "syslink", values.syslinks)))
174+
table.join2(result, _translate_paths(toolchain_utils.map_linkflags_for_package(package, "binary", {"cxx"}, "syslink", values.syslinks)))
175175
end
176176
if values.frameworks then
177-
table.join2(result, toolchain_utils.map_linkflags(package, "binary", {"cxx"}, "framework", values.frameworks))
177+
table.join2(result, toolchain_utils.map_linkflags_for_package(package, "binary", {"cxx"}, "framework", values.frameworks))
178178
end
179179
end
180180
return result
@@ -187,9 +187,9 @@ function _get_cflags(package, opt)
187187
if opt.cross then
188188
table.join2(result, package:build_getenv("cflags"))
189189
table.join2(result, package:build_getenv("cxflags"))
190-
table.join2(result, toolchain_utils.map_compflags(package, "c", "define", package:build_getenv("defines")))
191-
table.join2(result, toolchain_utils.map_compflags(package, "c", "includedir", package:build_getenv("includedirs")))
192-
table.join2(result, toolchain_utils.map_compflags(package, "c", "sysincludedir", package:build_getenv("sysincludedirs")))
190+
table.join2(result, toolchain_utils.map_compflags_for_package(package, "c", "define", package:build_getenv("defines")))
191+
table.join2(result, toolchain_utils.map_compflags_for_package(package, "c", "includedir", package:build_getenv("includedirs")))
192+
table.join2(result, toolchain_utils.map_compflags_for_package(package, "c", "sysincludedir", package:build_getenv("sysincludedirs")))
193193
end
194194
table.join2(result, package:config("cflags"))
195195
table.join2(result, package:config("cxflags"))
@@ -218,9 +218,9 @@ function _get_cxxflags(package, opt)
218218
if opt.cross then
219219
table.join2(result, package:build_getenv("cxxflags"))
220220
table.join2(result, package:build_getenv("cxflags"))
221-
table.join2(result, toolchain_utils.map_compflags(package, "cxx", "define", package:build_getenv("defines")))
222-
table.join2(result, toolchain_utils.map_compflags(package, "cxx", "includedir", package:build_getenv("includedirs")))
223-
table.join2(result, toolchain_utils.map_compflags(package, "cxx", "sysincludedir", package:build_getenv("sysincludedirs")))
221+
table.join2(result, toolchain_utils.map_compflags_for_package(package, "cxx", "define", package:build_getenv("defines")))
222+
table.join2(result, toolchain_utils.map_compflags_for_package(package, "cxx", "includedir", package:build_getenv("includedirs")))
223+
table.join2(result, toolchain_utils.map_compflags_for_package(package, "cxx", "sysincludedir", package:build_getenv("sysincludedirs")))
224224
end
225225
table.join2(result, package:config("cxxflags"))
226226
table.join2(result, package:config("cxflags"))
@@ -248,9 +248,9 @@ function _get_asflags(package, opt)
248248
local result = {}
249249
if opt.cross then
250250
table.join2(result, package:build_getenv("asflags"))
251-
table.join2(result, toolchain_utils.map_compflags(package, "as", "define", package:build_getenv("defines")))
252-
table.join2(result, toolchain_utils.map_compflags(package, "as", "includedir", package:build_getenv("includedirs")))
253-
table.join2(result, toolchain_utils.map_compflags(package, "as", "sysincludedir", package:build_getenv("sysincludedirs")))
251+
table.join2(result, toolchain_utils.map_compflags_for_package(package, "as", "define", package:build_getenv("defines")))
252+
table.join2(result, toolchain_utils.map_compflags_for_package(package, "as", "includedir", package:build_getenv("includedirs")))
253+
table.join2(result, toolchain_utils.map_compflags_for_package(package, "as", "sysincludedir", package:build_getenv("sysincludedirs")))
254254
end
255255
table.join2(result, package:config("asflags"))
256256
if opt.asflags then
@@ -267,9 +267,9 @@ function _get_ldflags(package, opt)
267267
local result = {}
268268
if opt.cross then
269269
table.join2(result, package:build_getenv("ldflags"))
270-
table.join2(result, toolchain_utils.map_linkflags(package, "binary", {"cxx"}, "link", package:build_getenv("links")))
271-
table.join2(result, toolchain_utils.map_linkflags(package, "binary", {"cxx"}, "syslink", package:build_getenv("syslinks")))
272-
table.join2(result, toolchain_utils.map_linkflags(package, "binary", {"cxx"}, "linkdir", package:build_getenv("linkdirs")))
270+
table.join2(result, toolchain_utils.map_linkflags_for_package(package, "binary", {"cxx"}, "link", package:build_getenv("links")))
271+
table.join2(result, toolchain_utils.map_linkflags_for_package(package, "binary", {"cxx"}, "syslink", package:build_getenv("syslinks")))
272+
table.join2(result, toolchain_utils.map_linkflags_for_package(package, "binary", {"cxx"}, "linkdir", package:build_getenv("linkdirs")))
273273
end
274274
table.join2(result, package:config("ldflags"))
275275
if package:config("lto") then
@@ -293,9 +293,9 @@ function _get_shflags(package, opt)
293293
local result = {}
294294
if opt.cross then
295295
table.join2(result, package:build_getenv("shflags"))
296-
table.join2(result, toolchain_utils.map_linkflags(package, "shared", {"cxx"}, "link", package:build_getenv("links")))
297-
table.join2(result, toolchain_utils.map_linkflags(package, "shared", {"cxx"}, "syslink", package:build_getenv("syslinks")))
298-
table.join2(result, toolchain_utils.map_linkflags(package, "shared", {"cxx"}, "linkdir", package:build_getenv("linkdirs")))
296+
table.join2(result, toolchain_utils.map_linkflags_for_package(package, "shared", {"cxx"}, "link", package:build_getenv("links")))
297+
table.join2(result, toolchain_utils.map_linkflags_for_package(package, "shared", {"cxx"}, "syslink", package:build_getenv("syslinks")))
298+
table.join2(result, toolchain_utils.map_linkflags_for_package(package, "shared", {"cxx"}, "linkdir", package:build_getenv("linkdirs")))
299299
end
300300
table.join2(result, package:config("shflags"))
301301
if package:config("lto") then
@@ -869,11 +869,11 @@ function _get_envs_for_runtime_flags(package, configs, opt)
869869
local envs = {}
870870
local runtimes = package:runtimes()
871871
if runtimes then
872-
envs[format("CMAKE_C_FLAGS_%s", buildtype)] = toolchain_utils.map_compflags(package, "c", "runtime", runtimes)
873-
envs[format("CMAKE_CXX_FLAGS_%s", buildtype)] = toolchain_utils.map_compflags(package, "cxx", "runtime", runtimes)
874-
envs[format("CMAKE_EXE_LINKER_FLAGS_%s", buildtype)] = toolchain_utils.map_linkflags(package, "binary", {"cxx"}, "runtime", runtimes)
875-
envs[format("CMAKE_STATIC_LINKER_FLAGS_%s", buildtype)] = toolchain_utils.map_linkflags(package, "static", {"cxx"}, "runtime", runtimes)
876-
envs[format("CMAKE_SHARED_LINKER_FLAGS_%s", buildtype)] = toolchain_utils.map_linkflags(package, "shared", {"cxx"}, "runtime", runtimes)
872+
envs[format("CMAKE_C_FLAGS_%s", buildtype)] = toolchain_utils.map_compflags_for_package(package, "c", "runtime", runtimes)
873+
envs[format("CMAKE_CXX_FLAGS_%s", buildtype)] = toolchain_utils.map_compflags_for_package(package, "cxx", "runtime", runtimes)
874+
envs[format("CMAKE_EXE_LINKER_FLAGS_%s", buildtype)] = toolchain_utils.map_linkflags_for_package(package, "binary", {"cxx"}, "runtime", runtimes)
875+
envs[format("CMAKE_STATIC_LINKER_FLAGS_%s", buildtype)] = toolchain_utils.map_linkflags_for_package(package, "static", {"cxx"}, "runtime", runtimes)
876+
envs[format("CMAKE_SHARED_LINKER_FLAGS_%s", buildtype)] = toolchain_utils.map_linkflags_for_package(package, "shared", {"cxx"}, "runtime", runtimes)
877877
end
878878
return envs
879879
end

‎xmake/modules/package/tools/make.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ function buildenvs(package)
4242
local shflags = table.copy(table.wrap(package:config("shflags")))
4343
local runtimes = package:runtimes()
4444
if runtimes then
45-
table.join2(cxxflags, toolchain_utils.map_compflags(package, "cxx", "runtime", runtimes))
46-
table.join2(ldflags, toolchain_utils.map_linkflags(package, "binary", {"cxx"}, "runtime", runtimes))
47-
table.join2(shflags, toolchain_utils.map_linkflags(package, "shared", {"cxx"}, "runtime", runtimes))
45+
table.join2(cxxflags, toolchain_utils.map_compflags_for_package(package, "cxx", "runtime", runtimes))
46+
table.join2(ldflags, toolchain_utils.map_linkflags_for_package(package, "binary", {"cxx"}, "runtime", runtimes))
47+
table.join2(shflags, toolchain_utils.map_linkflags_for_package(package, "shared", {"cxx"}, "runtime", runtimes))
4848
end
4949
if package:is_plat(os.host()) then
5050
if package:is_plat("linux") and package:is_arch("i386") then

0 commit comments

Comments
 (0)