From 8147deba3eb4a06b23153c0bae6edeb253cca6be Mon Sep 17 00:00:00 2001 From: Tobias Ulmer Date: Wed, 4 Dec 2013 14:23:39 +0100 Subject: [PATCH] Provide global for e2version file and use it Signed-off-by: Tobias Ulmer --- generic/e2lib.lua | 1 + global/e2-create-project.lua | 2 +- global/e2-install-e2.lua | 3 ++- local/e2-build.lua | 2 +- local/e2tool.lua | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/generic/e2lib.lua b/generic/e2lib.lua index 9a3d6f0..79735b4 100644 --- a/generic/e2lib.lua +++ b/generic/e2lib.lua @@ -86,6 +86,7 @@ e2lib.globals = strict.lock({ e2config = false, global_interface_version_file = ".e2/global-version", project_location_file = ".e2/project-location", + e2version_file = ".e2/e2version", logrotate = 5, -- configurable via config.log.logrotate _version = "e2factory, the emlix embedded build system, version " .. buildconfig.VERSION, diff --git a/global/e2-create-project.lua b/global/e2-create-project.lua index 9823911..41de794 100644 --- a/global/e2-create-project.lua +++ b/global/e2-create-project.lua @@ -259,7 +259,7 @@ local function e2_create_project(arg) { filename = "proj/env", content=env }, { filename = "proj/config", content=pconfig }, { filename = ".e2/syntax", content=syntax }, - { filename = ".e2/e2version", content=e2version }, + { filename = e2lib.globals.e2version_file, content=e2version }, { filename = ".gitignore", content=gitignore }, } for _,f in ipairs(files) do diff --git a/global/e2-install-e2.lua b/global/e2-install-e2.lua index 014a5c4..457e554 100644 --- a/global/e2-install-e2.lua +++ b/global/e2-install-e2.lua @@ -127,7 +127,8 @@ local function e2_install_e2(arg) extensions = {} -- empty list end - local s, re = eio.file_read_line(".e2/e2version") + local ef = e2lib.join(root, e2lib.globals.e2version_file) + local s, re = eio.file_read_line(ef) local branch, tag = s:match("(%S+) (%S+)") if not branch or not tag then e:cat(re) diff --git a/local/e2-build.lua b/local/e2-build.lua index 168793d..13ba36c 100644 --- a/local/e2-build.lua +++ b/local/e2-build.lua @@ -199,7 +199,7 @@ local function e2_build(arg) if opts.release then local version_table, re = e2lib.parse_e2versionfile( - e2lib.join(info.root, ".e2/e2version")) + e2lib.join(info.root, e2lib.globals.e2version_file)) if not version_table then return false, re end diff --git a/local/e2tool.lua b/local/e2tool.lua index 1b0594a..f3000a3 100644 --- a/local/e2tool.lua +++ b/local/e2tool.lua @@ -1342,7 +1342,7 @@ function e2tool.collect_project_info(info, skip_load_config) end if e2option.opts["check"] then - local f = ".e2/e2version" + local f = e2lib.join(info.root, e2lib.globals.e2version_file) local v, re = e2lib.parse_e2versionfile(f) if not v then return false, re -- 2.39.5