@@ -182,7 +182,7 @@ function _instance:_copiedfiles(filetype, outputdir, pathfilter)
182
182
if not copiedfiles then return end
183
183
184
184
-- get the extra information
185
- local extrainfo = table .wrap (self :get ( " __extra_ " .. filetype ))
185
+ local extrainfo = table .wrap (self :extraconf ( filetype ))
186
186
187
187
-- get the source paths and destinate paths
188
188
local srcfiles = {}
@@ -1403,7 +1403,7 @@ end
1403
1403
1404
1404
-- get the config info of the given package
1405
1405
function _instance :pkgconfig (pkgname )
1406
- local extra_packages = self :get ( " __extra_packages " )
1406
+ local extra_packages = self :extraconf ( " packages " )
1407
1407
if extra_packages then
1408
1408
return extra_packages [pkgname ]
1409
1409
end
@@ -1773,12 +1773,10 @@ end
1773
1773
1774
1774
-- get the config info of the given source file
1775
1775
function _instance :fileconfig (sourcefile )
1776
-
1777
- -- get files config
1778
1776
local filesconfig = self ._FILESCONFIG
1779
1777
if not filesconfig then
1780
1778
filesconfig = {}
1781
- for filepath , fileconfig in pairs (table .wrap (self :get ( " __extra_files " ))) do
1779
+ for filepath , fileconfig in pairs (table .wrap (self :extraconf ( " files " ))) do
1782
1780
1783
1781
-- match source files
1784
1782
local results = os .match (filepath )
@@ -1801,8 +1799,6 @@ function _instance:fileconfig(sourcefile)
1801
1799
end
1802
1800
self ._FILESCONFIG = filesconfig
1803
1801
end
1804
-
1805
- -- get file config
1806
1802
return filesconfig [sourcefile ]
1807
1803
end
1808
1804
@@ -2055,7 +2051,7 @@ function _instance:headerfiles(outputdir, opt)
2055
2051
end
2056
2052
2057
2053
-- get the extra information
2058
- local extrainfo = table .wrap (self :get ( " __extra_headerfiles " ))
2054
+ local extrainfo = table .wrap (self :extraconf ( " headerfiles " ))
2059
2055
2060
2056
-- get the source paths and destinate paths
2061
2057
local srcheaders = {}
0 commit comments