Build and Variables

8 files changed, 58 insertions, 67 deletions

diff --git a/src/luarocks/build.tl b/src/luarocks/build.tl
index ccb894a4..5494a84d 100644
--- a/src/luarocks/build.tl
+++ b/src/luarocks/build.tl
@@ -31,8 +31,10 @@ local deplocks = require("luarocks.deplocks")
 
 local type r = require("luarocks.core.types.rockspec")
 local type Rockspec = r.Rockspec
-local type Installs = r.Installs
-local type Install = r.Install
+
+local type i = require("luarocks.core.types.installs")
+local type Installs = i.Installs
+local type Install = i.Install
 
 local type t = require("luarocks.core.types.tree")
 local type Tree = t.Tree
@@ -95,7 +97,7 @@ end
 local function check_macosx_deployment_target(rockspec: Rockspec): boolean, string
    local target = rockspec.build.macosx_deployment_target
    local function patch_variable(var: string)
-      local rockspec_variables = rockspec.variables as {string: string}
+      local rockspec_variables = rockspec.variables
       if rockspec_variables[var]:match("MACOSX_DEPLOYMENT_TARGET") then
          rockspec_variables[var] = (rockspec_variables[var]):gsub("MACOSX_DEPLOYMENT_TARGET=[^ ]*", "MACOSX_DEPLOYMENT_TARGET="..target)
       else
diff --git a/src/luarocks/build/builtin.tl b/src/luarocks/build/builtin.tl
index c778c2bb..e26ca5a4 100644
--- a/src/luarocks/build/builtin.tl
+++ b/src/luarocks/build/builtin.tl
@@ -6,8 +6,9 @@ end
 
 local type r = require("luarocks.core.types.rockspec")
 local type Rockspec = r.Rockspec
-local type Variables = r.Variables
-local type Installs = r.Installs
+
+local type i = require("luarocks.core.types.installs")
+local type Installs = i.Installs
 
 -- This build driver checks LUA_INCDIR and LUA_LIBDIR on demand,
 -- so that pure-Lua rocks don't need to have development headers
@@ -23,7 +24,7 @@ local cfg = require("luarocks.core.cfg")
 local dir = require("luarocks.dir")
 local deps = require("luarocks.deps")
 
-local function autoextract_libs(external_dependencies: {string: {string: string}}, variables: Variables): {string}, {string}, {string}
+local function autoextract_libs(external_dependencies: {string: {string: string}}, variables: {string: string}): {string}, {string}, {string}
    if not external_dependencies then
       return nil, nil, nil
    end
@@ -33,8 +34,8 @@ local function autoextract_libs(external_dependencies: {string: {string: string}
    for name, data in pairs(external_dependencies) do
       if data.library then
          table.insert(libs, data.library)
-         table.insert(incdirs, (variables as {string: string})[name .. "_INCDIR"])
-         table.insert(libdirs, (variables as {string: string})[name .. "_LIBDIR"])
+         table.insert(incdirs, variables[name .. "_INCDIR"])
+         table.insert(libdirs, variables[name .. "_LIBDIR"])
       end
    end
    return libs, incdirs, libdirs
@@ -134,7 +135,7 @@ function builtin.run(rockspec: Rockspec, no_install: boolean)
    local compile_object, compile_library, compile_static_library
 
    local build = rockspec.build
-   local variables = rockspec.variables as {string: string}
+   local variables = rockspec.variables
    local checked_lua_h = false
 
    for _, var in ipairs{ "CC", "CFLAGS", "LDFLAGS" } do
diff --git a/src/luarocks/core/cfg.d.tl b/src/luarocks/core/cfg.d.tl
index 82b7c502..a342fe35 100644
--- a/src/luarocks/core/cfg.d.tl
+++ b/src/luarocks/core/cfg.d.tl
@@ -1,6 +1,5 @@
 local type r = require("luarocks.core.types.rockspec")
 local type Rockspec = r.Rockspec
-local type Variables = r.Variables
 
 local type t = require("luarocks.core.types.tree")
 local type Tree = t.Tree
@@ -32,7 +31,7 @@ local record cfg
       rocks_provided: {string: string} --? right type? infered from src/luarocks/util
    end
 
-   variables: Variables
+   variables: {string: string}
    rocks_provided: {Rockspec}
    -- persist
    home: string
diff --git a/src/luarocks/core/types/build.d.tl b/src/luarocks/core/types/build.d.tl
new file mode 100644
index 00000000..82d3dba9
--- /dev/null
+++ b/src/luarocks/core/types/build.d.tl
@@ -0,0 +1,16 @@
+local type i = require("luarocks.core.types.installs")
+local type Installs = i.Installs
+
+local record build
+    record Build
+        type: string
+        modules: {string: {string: string | {string}}}
+        copy_directories: string
+        install: Installs
+        extra_files: {string : string}
+        patches: {string : string}
+        macosx_deployment_target: string
+    end
+end
+
+return build
\ No newline at end of file
diff --git a/src/luarocks/core/types/installs.d.tl b/src/luarocks/core/types/installs.d.tl
new file mode 100644
index 00000000..9e919233
--- /dev/null
+++ b/src/luarocks/core/types/installs.d.tl
@@ -0,0 +1,15 @@
+local record installs
+    record Install
+        name: string
+        is_module_path: boolean
+        perms: string
+    end
+  
+    record Installs
+        lua: Install
+        lib: Install
+        conf: Install
+        bin: Install
+    end
+end
+return installs
\ No newline at end of file
diff --git a/src/luarocks/core/types/rockspec.tl b/src/luarocks/core/types/rockspec.tl
index 6cd708cf..ca12bf94 100644
--- a/src/luarocks/core/types/rockspec.tl
+++ b/src/luarocks/core/types/rockspec.tl
@@ -1,6 +1,12 @@
 local type q = require("luarocks.core.types.query")
 local type Query = q.Query
 
+local type b = require("luarocks.core.types.build")
+local type Build = b.Build
+
+local type i = require("luarocks.core.types.installs")
+local type Installs = i.Installs
+
 local record rockspec
     record Description
         summary: string
@@ -12,31 +18,6 @@ local record rockspec
         labels: any --!
     end
   
-    record Variables
-        HG: string
-        CVS: string
-        LUA: string
-        GPG: string
-        GIT: string
-        SVN: string
-        CURL: string
-        SSCM: string
-        PREFIX: string
-        LUADIR: string
-        LIBDIR: string
-        CONFDIR: string
-        BINDIR: string
-        DOCDIR: string
-        CURLNOCERTFLAG: string
-        LUA_INCDIR_OK: string
-        LUA_INCDIR: string
-        LUA_DIR: string
-        LUA_LIBDIR_OK: string
-        LUA_LIBDIR: string
-        LUA_LIBDIR_FILE: string
-        LUALIB: string
-    end
-  
     record Source
         url: string
         module: string
@@ -60,29 +41,6 @@ local record rockspec
         busted_executable: string
         flags: {string}
     end
-
-    record Install
-        name: string
-        is_module_path: boolean
-        perms: string
-    end
-  
-    record Installs
-        lua: Install
-        lib: Install
-        conf: Install
-        bin: Install
-    end
-  
-    record Build
-        type: string
-        modules: {string: {string: string | {string}}}
-        copy_directories: string
-        install: Installs
-        extra_files: {string : string}
-        patches: {string : string}
-        macosx_deployment_target: string
-    end
   
     record Dependencies
         {string} 
@@ -114,7 +72,7 @@ local record rockspec
         test_dependencies: Dependencies
         supported_platforms: {string}
         external_dependencies: {string: {string: string}}
-        variables: Variables
+        variables: {string: string}
         hooks: Hooks
         test: Test
         deploy: Deploy
diff --git a/src/luarocks/deps.tl b/src/luarocks/deps.tl
index 97f051d1..1ce163c3 100644
--- a/src/luarocks/deps.tl
+++ b/src/luarocks/deps.tl
@@ -15,9 +15,10 @@ local deplocks = require("luarocks.deplocks")
 
 local type r = require("luarocks.core.types.rockspec")
 local type Rockspec = r.Rockspec
-local type Build = r.Build
 local type Dependencies = r.Dependencies
-local type Variables = r.Variables
+
+local type b = require("luarocks.core.types.build")
+local type Build = b.Build
 
 local type t = require("luarocks.core.types.tree")
 local type Tree = t.Tree
@@ -759,7 +760,7 @@ local function find_lua_incdir(prefix: string, luaver: string, luajitver: string
    return nil, mainerr
 end
 
-function deps.check_lua_incdir(vars: Variables): boolean | string, string, string
+function deps.check_lua_incdir(vars: {string: string}): boolean | string, string, string
    if vars.LUA_INCDIR_OK == "ok"
       then return true
    end
@@ -787,7 +788,7 @@ function deps.check_lua_incdir(vars: Variables): boolean | string, string, strin
    return nil, "Failed finding Lua headers; neither LUA_DIR or LUA_INCDIR are set. You may need to install them or configure LUA_INCDIR.", "dependency"
 end
 
-function deps.check_lua_libdir(vars: Variables): boolean, string, string, {string : {string}}
+function deps.check_lua_libdir(vars: {string: string}): boolean, string, string, {string : {string}}
    if vars.LUA_LIBDIR_OK == "ok" --! fix later
       then return true
    end
diff --git a/src/luarocks/rockspecs.tl b/src/luarocks/rockspecs.tl
index e532c6c7..1c01e043 100644
--- a/src/luarocks/rockspecs.tl
+++ b/src/luarocks/rockspecs.tl
@@ -13,7 +13,6 @@ local vers = require("luarocks.core.vers")
 local rock = require("luarocks.core.types.rockspec")
 local type Dependencies = rock.Dependencies
 local type Rockspec = rock.Rockspec
-local type Variables = rock.Variables
 
 local type q = require("luarocks.core.types.query")
 local type Query = q.Query
@@ -84,7 +83,7 @@ end
 -- @param rockspec table: The rockspec table.
 local function configure_paths(rockspec: Rockspec)
    local vars: {string: string} = {}
-   for k,v in pairs(cfg.variables as {string: string}) do
+   for k,v in pairs(cfg.variables) do
       vars[k] = v
    end
    local name, version = rockspec.name, rockspec.version
@@ -94,7 +93,7 @@ local function configure_paths(rockspec: Rockspec)
    vars.CONFDIR = path.conf_dir(name, version)
    vars.BINDIR = path.bin_dir(name, version)
    vars.DOCDIR = path.doc_dir(name, version)
-   rockspec.variables = vars as Variables
+   rockspec.variables = vars
 end
 
 function rockspecs.from_persisted_table(filename: string, rockspec: Rockspec, globals?: {string: any}, quick?: boolean): Rockspec, string