From b25adb25e2b543e7bc2d767ca62046baeb8886b8 Mon Sep 17 00:00:00 2001
From: Gordon Hecker <gh@emlix.com>
Date: Thu, 21 Jan 2010 19:32:50 +0100
Subject: [PATCH] cleanup: turn policy module into a proper lua module and
 install on its own

Signed-off-by: Gordon Hecker <gh@emlix.com>
---
 local/Makefile   |  4 ++--
 local/e2tool.lua |  1 +
 local/policy.lua | 46 ++++++++++++++--------------------------------
 3 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/local/Makefile b/local/Makefile
index c59ae6f..d73c9e5 100644
--- a/local/Makefile
+++ b/local/Makefile
@@ -46,6 +46,7 @@ LUA_LIBS = e2option.lua luafile.lua generic_git.lua err.lua
 LUA_LIBS += e2tool.lua scm.lua git.lua svn.lua cvs.lua files.lua
 LUA_LIBS += tools.lua transport.lua cache.lua
 LUA_LIBS += environment.lua plugin.lua url.lua hash.lua lock.lua
+LUA_LIBS += policy.lua
 LOCALTOOLS = $(LOCALSHTOOLS) $(LOCALLUATOOLS)
 
 SYMLINKS_2_1 = lookup-server use-source prepare-cargo sync-results cleanup \
@@ -121,8 +122,7 @@ clean:
 e2local.lc: strict.lua \
 		collection.lua \
 		e2lib.lua \
-		e2build.lua \
-		policy.lua
+		e2build.lua
 	$(LUAC) -o $@ $^
 
 linux32: linux32.c
diff --git a/local/e2tool.lua b/local/e2tool.lua
index af36022..9517c5d 100644
--- a/local/e2tool.lua
+++ b/local/e2tool.lua
@@ -49,6 +49,7 @@ require("luafile_ll")
 require("e2option")
 require("luafile")
 require("generic_git")
+require("policy")
 
 -- Information gathering and inquiry
 --
diff --git a/local/policy.lua b/local/policy.lua
index e1d99d6..66cfd88 100644
--- a/local/policy.lua
+++ b/local/policy.lua
@@ -25,18 +25,18 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ]]
 
-e2policy = e2lib.module("e2policy")
+module("policy", package.seeall)
 
-local function source_set_lazytag()
+function source_set_lazytag()
 	return "lazytag"
 end
-local function source_set_tag()
+function source_set_tag()
 	return "tag"
 end
-local function source_set_branch()
+function source_set_branch()
 	return "branch"
 end
-local function source_set_working_copy()
+function source_set_working_copy()
 	return "working-copy"
 end
 
@@ -44,30 +44,30 @@ end
 local results_server = "results"
 local release_server = "releases"
 local local_server = "."
-local function storage_release(location, release_id)
+function storage_release(location, release_id)
 	return release_server, string.format("%s/release/%s", location,
 								release_id)
 end
-local function storage_default(location, release_id)
+function storage_default(location, release_id)
 	return results_server, string.format("%s/shared", location)
 end
-local function storage_local(location, release_id)
+function storage_local(location, release_id)
 	return local_server, string.format("out")
 end
 
 
-local function dep_set_buildid(buildid)
+function dep_set_buildid(buildid)
 	return buildid
 end
-local function dep_set_last(buildid)
+function dep_set_last(buildid)
 	return "last"
 end
 
 
-local function buildid_buildid(buildid)
+function buildid_buildid(buildid)
 	return buildid
 end
-local function buildid_scratch(buildid)
+function buildid_scratch(buildid)
 	return "scratch"
 end
 
@@ -78,7 +78,7 @@ end
 -- 			buildid
 -- @param val the function to use : storage_*, source_set_*, etc.
 -- @return nil
-local function set(mode, id, val)
+function set(mode, id, val)
 	if not id or not val then
 		print(id)
 		print(val)
@@ -94,7 +94,7 @@ end
 -- @param id string: the policy identifier: storage, source_set, dep_set, 
 -- 			buildid
 -- @return function: the policy function
-local function get(mode, id)
+function get(mode, id)
 	if type(mode) ~= "table" then
 		print(mode, id)
 		e2lib.abort("policy.get() mode is not a table")
@@ -229,24 +229,7 @@ function handle_commandline_options(opts, use_default)
 	return mode
 end
 
-policy = {}
-policy.init = init
-policy.register_commandline_options = register_commandline_options
 policy.default_build_mode_name = "tag"
-policy.handle_commandline_options = handle_commandline_options
-policy.set = set
-policy.get = get
-policy.source_set_lazytag = source_set_lazytag
-policy.source_set_tag = source_set_tag
-policy.source_set_branch = source_set_branch
-policy.source_set_working_copy = source_set_working_copy
-policy.storage_release = storage_release
-policy.storage_default = storage_default
-policy.storage_local = storage_local
-policy.dep_set_buildid = dep_set_buildid
-policy.dep_set_last = dep_set_last
-policy.buildid_buildid = buildid_buildid
-policy.buildid_scratch = buildid_scratch
 
 policy.default_build_mode = {}
 policy.default_build_mode["lazytag"] = {
@@ -283,4 +266,3 @@ policy.default_build_mode["working-copy"] = {
 	buildid = policy.buildid_scratch,
 	storage = policy.storage_local,
 }
-
-- 
2.39.5