Use basic_source class interface and drop scm

Signed-off-by: Tobias Ulmer <tu@emlix.com>

diff --git a/local/e2-fetch-sources.lua b/local/e2-fetch-sources.lua
index 2de1a41370df7dbf4e7b822c51eee2a80ca184b6..9011b35babf1da3309e904b1acad04d785687a45 100644 (file)
--- a/local/e2-fetch-sources.lua
+++ b/local/e2-fetch-sources.lua
@@ -25,7 +25,6 @@ local e2option = require("e2option")
 local e2tool = require("e2tool")
 local err = require("err")
 local result = require("result")
-local scm = require("scm")
 local source = require("source")
 
 local function e2_fetch_source(arg)
@@ -117,10 +116,10 @@ local function e2_fetch_source(arg)
         local e = err.new()  -- no message yet, append the summary later on
 
         -- fetch
-        for sourcename, _ in pairs(source.sources) do
+        for sourcename, src in pairs(source.sources) do
             if opts.fetch and sel[sourcename] then
                 e2lib.logf(1, "fetching working copy for source %s", sourcename)
-                rc, re = scm.fetch_source(info, sourcename)
+                rc, re = src:fetch_source()
                 if not rc then
                     e:cat(re)
                 end
@@ -128,10 +127,10 @@ local function e2_fetch_source(arg)
         end
 
         -- update
-        for sourcename, _ in pairs(source.sources) do
+        for sourcename, src in pairs(source.sources) do
             if opts.update and sel[sourcename] then
                 e2lib.logf(1, "updating working copy for %s", sourcename)
-                rc, re = scm.update(info, sourcename)
+                rc, re = src:update_source()
                 if not rc then
                     e:cat(re)
                 end

diff --git a/local/e2build.lua b/local/e2build.lua
index de87e13d0ed5a5233f168f4f1ccadadab75a7efb..685639509ff836dd0121f1ce570d6969eaf98502 100644 (file)
--- a/local/e2build.lua
+++ b/local/e2build.lua
@@ -32,7 +32,7 @@ local environment = require("environment")
 local err = require("err")
 local project = require("project")
 local result = require("result")
-local scm = require("scm")
+local source = require("source")
 local strict = require("strict")
 local tools = require("tools")
 
@@ -694,17 +694,17 @@ end
 
 ---
 function e2build.build_process_class:_install_sources(res, return_flags)
-    local rc, re, e, bc, destdir, source_set, info
+    local rc, re, e, bc, destdir, source_set, src
 
     bc = res:build_config()
-    info = e2tool.info()
+    destdir = e2lib.join(bc.T, "build")
+    source_set = res:build_mode().source_set()
 
     for sourcename in res:sources_list():iter() do
         e = err.new("installing source failed: %s", sourcename)
+        src = source.sources[sourcename]
 
-        destdir = e2lib.join(bc.T, "build")
-        source_set = res:build_mode().source_set()
-        rc, re = scm.prepare_source(info, sourcename, source_set, destdir)
+        rc, re = src:prepare_source(source_set, destdir)
         if not rc then
             return false, e:cat(re)
         end