diff options
author | Boris Nagaev <bnagaev@gmail.com> | 2015-08-31 20:24:28 (GMT) |
---|---|---|
committer | Boris Nagaev <bnagaev@gmail.com> | 2015-09-04 07:36:40 (GMT) |
commit | f4048f6f869f52526ea1f01e09bf608f420693a6 (patch) | |
tree | 68acaa1181aec56ab360f702a95ef2a7d7bd7add /tools | |
parent | 422a2615d07c42335090564cb05038e136c2e117 (diff) | |
download | mxe-f4048f6f869f52526ea1f01e09bf608f420693a6.zip mxe-f4048f6f869f52526ea1f01e09bf608f420693a6.tar.gz mxe-f4048f6f869f52526ea1f01e09bf608f420693a6.tar.bz2 |
build-pkg: a function to generate .list file name
This operation (package_name .. '.list') was coded many times in
many functions. I move it to function listFile(pkg) to keep it in
one place.
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/build-pkg.lua | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index 0705e95..bf3c46b 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -232,6 +232,10 @@ local function protectVersion(ver) end end +local function listFile(pkg) + return pkg .. '.list' +end + local CONTROL = [[Package: %s Version: %s Section: devel @@ -328,7 +332,7 @@ local function buildPackages(pkgs, pkg2deps) if not brokenDep(pkg) then local files = buildPackage(pkg) if isBuilt(pkg, files) then - saveFileList(pkg .. '.list', files) + saveFileList(listFile(pkg), files) table.insert(unbroken, pkg) else -- broken package @@ -345,7 +349,7 @@ local function buildPackages(pkgs, pkg2deps) end local function filterFiles(pkg, filter_common) - local list = readFileList(pkg .. '.list') + local list = readFileList(listFile(pkg)) local list2 = {} local common_list = COMMON_FILES[pkg] for _, installed_file in ipairs(list) do @@ -359,7 +363,7 @@ end local function excludeCommon(pkg) local noncommon_files = filterFiles(pkg, false) - saveFileList(pkg .. '.list', noncommon_files) + saveFileList(listFile(pkg), noncommon_files) end local function makeCommonDeb(pkg, ver) @@ -376,7 +380,7 @@ local function makeDebs(pkgs, pkg2deps, pkg2ver) for _, pkg in ipairs(pkgs) do local deps = assert(pkg2deps[pkg], pkg) local ver = assert(pkg2ver[pkg], pkg) - local list_path = pkg .. '.list' + local list_path = listFile(pkg) local add_common = false if COMMON_FILES[pkg] then if target == ARCH_FOR_COMMON then |