Producing rockspec 2.1.1-1

Build.moon

@@ -16,6 +16,11 @@ with public default target 'all'
 	\after 'bin'
 	\after 'lib'
 
+with public target 'install'
+	\depends 'out/moonbuild'
+	\produces '/usr/local/bin/moonbuild'
+	\fn => _.cmd 'sudo', 'cp', @infile, @outfile
+
 with public target 'clean'
 	\fn => _.cmd RM, LIB_LUA
 	\fn => _.cmd RM, BIN_LUA

Makefile

@@ -16,6 +16,9 @@ MODULES = $(shell echo $(foreach lib, $(LIB_LUA), $(patsubst %.lua, %, $(lib)))
 
 all: bin lib
 
+install: all
+	sudo cp out/moonbuild /usr/local/bin/moonbuild
+
 clean:
 	$(RM) $(LIB_LUA)
 	$(RM) $(BIN_LUA)

moonbuild/_util.moon

@@ -14,8 +14,8 @@ _cdeps = (cc, cflags, path) ->
 	rawlist = gsub (match raw, ':(.+)'), '\\\n', ' '
 	[v for v in gmatch rawlist, '%S+']
 cdeps = setmetatable {},
-	__index: (cc) => (cflags, path) -> _cdeps cc, cflags, path
+	__index: (cc) => (path, cflags) -> _cdeps cc, cflags, path
-	__call: (cflags, path) => _cdeps 'cc', cflags, path
+	__call: (path, cflags) => _cdeps 'cc', cflags, path
 
 readfile = (filename) ->
 	fd, err = open filename, 'rb'

moonbuild/core/DAG.moon

@@ -1,4 +1,4 @@
-import filter, foreach, flatten, patsubst from require 'moonbuild._common'
+import first, filter, foreach, flatten, patsubst from require 'moonbuild._common'
 import runwithcontext from require 'moonbuild.compat.ctx'
 globalenv = require 'moonbuild.env.global'
 import exists, parent, mkdirs, clearentry, disableentry, attributes from require 'moonbuild._fs'
@@ -12,6 +12,8 @@ nodepriority = (a, b) ->
 	tb = type b.name
 	da = #a.deps
 	db = #b.deps
+	sa = a.sync
+	sb = b.sync
 	if ta=='string' and tb!='string'
 		return true
 	elseif ta!='string' and tb=='string'
@@ -20,6 +22,10 @@ nodepriority = (a, b) ->
 		return true
 	elseif a.priority < b.priority
 		return false
+	elseif sa and not sb
+		return false
+	elseif sb and not sa
+		return true
 	else
 		return da < db
 
@@ -64,7 +70,7 @@ class DepGraph
 		nodes = foreach candidates, (candidate) -> a: {pcall -> DepNode @, candidate, name}
 		resolved = foreach (filter nodes, (node) -> node.a[1]), (node) -> node.a[2]
 		sort resolved, nodepriority
-		resolved[1] or error "Cannot resolve target #{name}"
+		resolved[1] or error "Cannot resolve target #{name}: #{#candidates} candidates, #{#resolved} resolved"
 
 	buildablenodes: =>
 		[v for k, v in pairs @nodes when v\canbuild! and not v.built]
@@ -87,16 +93,24 @@ class DepNode
 			ctx = setmetatable {},
 				__index: (_, k) ->
 					switch k
-						when 'infile' then first deps
+						when 'infile'
-						when 'infiles' then flatten deps
+							f = first deps
-						when 'outfile' then first @outs
+							f and f.name
-						when 'outfiles' then flatten @outs
+						when 'infiles'
-						when 'name' then @name
+							foreach deps, => @name
-						else error "No such field in TargetDepsContext: #{k}"
+						when 'outfile'
+							f = first @outs
+							f and f.name
+						when 'outfiles'
+							foreach @outs, => @name
+						when 'name'
+							@name
+						else
+							error "No such field in TargetDepsContext: #{k}"
 				__newindex: (k) =>
 					error "Attempt to set field #{k} of TargetDepsContext"
 			for depfn in *target.depfunctions
-				deps = flatten deps, foreach depfn, (fn) -> resolve runwithcontext fn, @dag.env, ctx
+				deps = flatten deps, foreach (runwithcontext depfn, @dag.env, ctx), resolve
 		@ins = foreach deps, (dep) -> dep.name
 		@after = foreach after, (dep) -> dep.name
 		@deps = flatten { deps, after }

moonbuild/core/multiprocessexecutor.moon

@@ -37,6 +37,14 @@ class Executor
 			error "Node #{name} wasn't built" unless node.built
 
 	addprocess: (node, opts) =>
+		if node.sync
+			while @nprocesses != 0
+				@waitprocess
+			node\build opts
+			node.built = true
+			node\updatecache!
+			return
+
 		pid = fork!
 		error "Failed to fork" unless pid
 		if pid!=0

out/moonbuild

@@ -1272,11 +1272,11 @@ _cdeps = function(cc, cflags, path)
 end
 local cdeps = setmetatable({ }, {
   __index = function(self, cc)
-    return function(cflags, path)
+    return function(path, cflags)
       return _cdeps(cc, cflags, path)
     end
   end,
-  __call = function(self, cflags, path)
+  __call = function(self, path, cflags)
     return _cdeps('cc', cflags, path)
   end
 })
@@ -1646,10 +1646,10 @@ end
 do
 local _ENV = _ENV
 package.preload[ "moonbuild.core.DAG" ] = function( ... ) local arg = _G.arg;
-local filter, foreach, flatten, patsubst
+local first, filter, foreach, flatten, patsubst
 do
   local _obj_0 = require('moonbuild._common')
-  filter, foreach, flatten, patsubst = _obj_0.filter, _obj_0.foreach, _obj_0.flatten, _obj_0.patsubst
+  first, filter, foreach, flatten, patsubst = _obj_0.first, _obj_0.filter, _obj_0.foreach, _obj_0.flatten, _obj_0.patsubst
 end
 local runwithcontext
 runwithcontext = require('moonbuild.compat.ctx').runwithcontext
@@ -1670,6 +1670,8 @@ nodepriority = function(a, b)
   local tb = type(b.name)
   local da = #a.deps
   local db = #b.deps
+  local sa = a.sync
+  local sb = b.sync
   if ta == 'string' and tb ~= 'string' then
     return true
   elseif ta ~= 'string' and tb == 'string' then
@@ -1678,6 +1680,10 @@ nodepriority = function(a, b)
     return true
   elseif a.priority < b.priority then
     return false
+  elseif sa and not sb then
+    return false
+  elseif sb and not sa then
+    return true
   else
     return da < db
   end
@@ -1753,7 +1759,7 @@ do
         return node.a[2]
       end)
       sort(resolved, nodepriority)
-      return resolved[1] or error("Cannot resolve target " .. tostring(name))
+      return resolved[1] or error("Cannot resolve target " .. tostring(name) .. ": " .. tostring(#candidates) .. " candidates, " .. tostring(#resolved) .. " resolved")
     end,
     buildablenodes = function(self)
       local _accum_0 = { }
@@ -1936,13 +1942,19 @@ do
           __index = function(_, k)
             local _exp_0 = k
             if 'infile' == _exp_0 then
-              return first(deps)
+              local f = first(deps)
+              return f and f.name
             elseif 'infiles' == _exp_0 then
-              return flatten(deps)
+              return foreach(deps, function(self)
+                return self.name
+              end)
             elseif 'outfile' == _exp_0 then
-              return first(self.outs)
+              local f = first(self.outs)
+              return f and f.name
             elseif 'outfiles' == _exp_0 then
-              return flatten(self.outs)
+              return foreach(self.outs, function(self)
+                return self.name
+              end)
             elseif 'name' == _exp_0 then
               return self.name
             else
@@ -1956,9 +1968,7 @@ do
         local _list_0 = target.depfunctions
         for _index_0 = 1, #_list_0 do
           local depfn = _list_0[_index_0]
-          deps = flatten(deps, foreach(depfn, function(fn)
+          deps = flatten(deps, foreach((runwithcontext(depfn, self.dag.env, ctx)), resolve))
-            return resolve(runwithcontext(fn, self.dag.env, ctx))
-          end))
         end
       end
       self.ins = foreach(deps, function(dep)
@@ -2244,6 +2254,15 @@ do
       end
     end,
     addprocess = function(self, node, opts)
+      if node.sync then
+        while self.nprocesses ~= 0 do
+          local _ = self.waitprocess
+        end
+        node:build(opts)
+        node.built = true
+        node:updatecache()
+        return 
+      end
       local pid = fork()
       if not (pid) then
         error("Failed to fork")

rockspecs/moonbuild-2.1.0-1.rockspec

@@ -0,0 +1,24 @@
+build = {
+  install = {
+    bin = {
+      moonbuild = "out/moonbuild"
+    }
+  },
+  type = "builtin"
+}
+dependencies = {
+  "lua >= 5.1",
+  "argparse >= 0.7.1-1",
+  "moonscript >= 0.5.0-1"
+}
+description = {
+  detailed = "moonbuild is a small build system that simplifies your build definitions by allowing you to use declarative as well as imperative rules. It represents the build as a DAG with explicit ordering, and doesn't give you any default confusing rules (unlike make). If you can, installing luaposix and/or luafilesystem will speed up builds and increase stability.\n",
+  summary = "Small build system in between make and a build.sh"
+}
+package = "moonbuild"
+rockspec_format = "3.0"
+source = {
+  tag = "v2.1.0",
+  url = "git://github.com/natnat-mc/moonbuild"
+}
+version = "2.1.0-1"

rockspecs/moonbuild-2.1.0-2.rockspec

@@ -0,0 +1,24 @@
+build = {
+  install = {
+    bin = {
+      moonbuild = "out/moonbuild"
+    }
+  },
+  type = "builtin"
+}
+dependencies = {
+  "lua >= 5.1",
+  "argparse >= 0.7.1-1",
+  "moonscript >= 0.5.0-1"
+}
+description = {
+  detailed = "moonbuild is a small build system that simplifies your build definitions by allowing you to use declarative as well as imperative rules. It represents the build as a DAG with explicit ordering, and doesn't give you any default confusing rules (unlike make). If you can, installing luaposix and/or luafilesystem will speed up builds and increase stability.\n",
+  summary = "Small build system in between make and a build.sh"
+}
+package = "moonbuild"
+rockspec_format = "3.0"
+source = {
+  tag = "v2.1.0",
+  url = "git://github.com/natnat-mc/moonbuild"
+}
+version = "2.1.0-2"

rockspecs/moonbuild-2.1.0-3.rockspec

@@ -0,0 +1,24 @@
+build = {
+  install = {
+    bin = {
+      moonbuild = "out/moonbuild"
+    }
+  },
+  type = "builtin"
+}
+dependencies = {
+  "lua >= 5.1",
+  "argparse >= 0.7.1-1",
+  "moonscript >= 0.5.0-1"
+}
+description = {
+  detailed = "moonbuild is a small build system that simplifies your build definitions by allowing you to use declarative as well as imperative rules. It represents the build as a DAG with explicit ordering, and doesn't give you any default confusing rules (unlike make). If you can, installing luaposix and/or luafilesystem will speed up builds and increase stability.\n",
+  summary = "Small build system in between make and a build.sh"
+}
+package = "moonbuild"
+rockspec_format = "3.0"
+source = {
+  tag = "v2.1.0",
+  url = "git://github.com/natnat-mc/moonbuild"
+}
+version = "2.1.0-3"

rockspecs/moonbuild-2.1.1-1.rockspec

@@ -0,0 +1,24 @@
+build = {
+  install = {
+    bin = {
+      moonbuild = "out/moonbuild"
+    }
+  },
+  type = "builtin"
+}
+dependencies = {
+  "lua >= 5.1",
+  "argparse >= 0.7.1-1",
+  "moonscript >= 0.5.0-1"
+}
+description = {
+  detailed = "moonbuild is a small build system that simplifies your build definitions by allowing you to use declarative as well as imperative rules. It represents the build as a DAG with explicit ordering, and doesn't give you any default confusing rules (unlike make). If you can, installing luaposix and/or luafilesystem will speed up builds and increase stability.\n",
+  summary = "Small build system in between make and a build.sh"
+}
+package = "moonbuild"
+rockspec_format = "3.0"
+source = {
+  tag = "v2.1.1",
+  url = "git://github.com/natnat-mc/moonbuild"
+}
+version = "2.1.1-1"