Producing rockspec 2.2.2-1

.gitignore

@@ -1 +1,3 @@
-*.lua
+bin/*.lua
+moonbuild/*.lua
+moonbuild/*/*.lua

Alfons.moon

@@ -1,7 +1,13 @@
 tasks:
-	build: =>
+	bootstrap: => sh "moon bin/moonbuild.moon -jy"
-		sh "moon bin/moonbuild.moon -jy"
+	bootstrapinstall: => sh "moon bin/moonbuild.moon install -jy"
+
 	release: =>
 		error "no version provided" unless @v
 		tasks.build!
 		sh "rockbuild -m -t #{@v} upload"
+
+	build: => (require 'moonbuild') j: true
+	install: => (require 'moonbuild') 'install', j: true
+	clean: => (require 'moonbuild') 'clean'
+	mrproper: => (require 'moonbuild') 'mrproper'

Build.moon

@@ -17,9 +17,20 @@ with public default target 'all'
 	\after 'lib'
 
 with public target 'install'
+	\after 'install-bin'
+	\after 'install-lib'
+
+with public target 'install-bin'
 	\depends 'out/moonbuild'
 	\produces '/usr/local/bin/moonbuild'
 	\fn => _.cmd 'sudo', 'cp', @infile, @outfile
+	\sync!
+
+with public target 'install-lib'
+	\depends 'out/moonbuild.lua'
+	\produces "/usr/local/share/lua/#{LUA\gsub 'lua', ''}/moonbuild.lua"
+	\fn => _.cmd 'sudo', 'cp', @infile, @outfile
+	\sync!
 
 with public target 'clean'
 	\fn => _.cmd RM, LIB_LUA
@@ -37,14 +48,19 @@ with public target 'lib'
 
 with target BIN, pattern: 'out/%'
 	\depends 'bin/%.lua'
-	\depends LIB_LUA
 	\produces 'out/%'
 	\mkdirs!
 	\fn =>
-		_.cmd AMALG, '-o', @outfile, '-s', @infile, MODULES
+		_.writefile @outfile, "#!/usr/bin/env #{LUA}\n#{_.readfile @infile}"
-		_.writefile @outfile, "#!/usr/bin/env #{LUA}\n#{_.readfile @outfile}"
 		_.cmd 'chmod', '+x', @outfile
 
+with target 'out/moonbuild.lua'
+	\depends 'moonbuild/init.lua'
+	\depends LIB_LUA
+	\produces '%'
+	\fn =>
+		_.cmd AMALG, '-o', @outfile, '-s', @infile, _.exclude MODULES, 'moonbuild.init'
+
 with target {LIB_LUA, BIN_LUA}, pattern: '%.lua'
 	\depends '%.moon'
 	\produces '%.lua'

README.md

@@ -24,11 +24,8 @@ You will need `argparse` and `moonscript` installed from luarocks, and `luaposix
 
 ### Bootstrapping
 You can build moonbuild with itself: `moon bin/moonbuild.moon -qjy`.  
-This will leave the binary ready to be used as `out/moonbuild`.
+This will leave the binary ready to be used as `out/moonbuild` (it will still depend on the library to be used).  
-
+The binary and library can then be installed with `bin/moonbuild install`.
-### Using make
-You can also build moonbuild with make: `make`.
-This will leave the binary ready to be used as `out/moonbuild`.
 
 ## Docs
 TODO

bin/moonbuild.moon

@@ -1,14 +1,13 @@
 -- load everything we need
 import loadfile from require 'moonscript.base'
-Context = require 'moonbuild.context'
+import Context, DepGraph, Executor from require 'moonbuild'
-Variable = require 'moonbuild.core.Variable'
+Variable = (require 'moonbuild')['core.Variable']
-DepGraph = require 'moonbuild.core.DAG'
+import parseargs from (require 'moonbuild')['_cmd.common']
-import parseargs from require 'moonbuild._cmd.common'
+argparse = require 'argparse'
 import sort, concat from table
 import exit from os
 
 -- parse the arguments
-argparse = require 'argparse'
 parser = with argparse "moonbuild", "A build system in moonscript"
 	\option '-b --buildfile', "Build file to use", 'Build.moon'
 	\option '-j --parallel', "Sets the number of parallel tasks, 'y' to run as many as we have cores", '1'
@@ -74,13 +73,6 @@ dag = DepGraph ctx, targets
 print "Created dependancy graph" if args.verbose
 
 -- execute the build
-if args.parallel==1
-	Executor = require 'moonbuild.core.singleprocessexecutor'
-	executor = Executor dag, args.parallel
-	executor\execute args
-else
-	ok, Executor = pcall -> require 'moonbuild.core.multiprocessexecutor'
-	Executor = require 'moonbuild.core.singleprocessexecutor' unless ok
 nparallel = args.parallel == 'y' and Executor\getmaxparallel! or args.parallel
 print "Building with #{nparallel} max parallel process#{nparallel>1 and "es" or ""}" if args.verbose
 executor = Executor dag, nparallel

moonbuild/_common.moon

@@ -155,6 +155,7 @@ common.includes = includes
 common.patget = patget
 common.patset = patset
 common.patsubst = patsubst
+common.exclude = exclude
 common.min = min
 common.max = max
 common.minmax = minmax

moonbuild/core/DAG.moon

@@ -1,8 +1,8 @@
-import first, filter, foreach, flatten, patsubst from require 'moonbuild._common'
+import first, filter, foreach, flatten, patsubst, includes 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'
-import sort from table
+import sort, insert, remove from table
 import huge from math
 
 local DepNode, FileTarget
@@ -76,6 +76,20 @@ class DepGraph
 	buildablenodes: =>
 		[v for k, v in pairs @nodes when v\canbuild! and not v.built]
 
+	reset: =>
+		n.built = false for k, n in pairs @nodes
+
+	resetchildren: (names) =>
+		done = {}
+		stack = [v for v in *names]
+		while #stack != 0
+			name = remove stack
+			continue if done[name]
+			done[name] = true
+			node = @nodes[name]
+			node.built = false
+			insert stack, n for n in *(node\children!)
+
 class DepNode
 	new: (@dag, target, @name) =>
 		@priority = target.priority
@@ -117,6 +131,9 @@ class DepNode
 		@deps = flatten { deps, after }
 		@built = true if #@deps == 0 and #@buildfunctions == 0
 
+	children: =>
+		[k for k, n in pairs @dag.nodes when (includes n.ins, @name) or (includes n.after, @name)]
+
 	canbuild: =>
 		for node in *flatten { @ins, @after }
 			if not @dag.nodes[node].built
@@ -130,10 +147,11 @@ class DepNode
 		force = opts.force or false
 		quiet = opts.quiet or false
 
-		return if @built
+		return false if @built or #@buildfunctions == 0
-		return unless force or @shouldbuild!
+		return false unless force or @shouldbuild!
-		print "#{@type == 'virtual' and "Running" or "Building"} #{@name}" unless quiet or #@buildfunctions == 0
+		print "#{@type == 'virtual' and "Running" or "Building"} #{@name}" unless quiet
 		@actuallybuild!
+		true
 
 
 	shouldbuild: =>

moonbuild/core/executor.moon

@@ -0,0 +1,2 @@
+ok, MultiProcessExecutor = pcall -> require 'moonbuild.core.multiprocessexecutor'
+ok and MultiProcessExecutor or require 'moonbuild.core.singleprocessexecutor'

moonbuild/core/multiprocessexecutor.moon

@@ -1,3 +1,4 @@
+SingleProcessExecutor = require 'moonbuild.core.singleprocessexecutor'
 import fork, _exit from require 'posix.unistd'
 import wait from require 'posix.sys.wait'
 import open, stderr from io
@@ -17,8 +18,12 @@ class Executor
 		@processes = {}
 		@nprocesses = 0
 		@building = {}
+		@nbuilt = 0
 
 	execute: (opts) =>
+		if @nparallel == 1
+			return (SingleProcessExecutor @dag, 1)\execute opts
+
 		block = @dag\buildablenodes!
 		while #block != 0
 			for node in *block
@@ -36,6 +41,12 @@ class Executor
 		for name, node in pairs @dag.nodes
 			error "Node #{name} wasn't built" unless node.built
 
+		unless opts.quiet
+			if @nbuilt == 0
+				print "Nothing to be done"
+			else
+				print "Built #{@nbuilt} targets"
+
 	addprocess: (node, opts) =>
 		if node.sync
 			while @nprocesses != 0
@@ -52,18 +63,20 @@ class Executor
 			@nprocesses += 1
 			@building[node] = true
 		else
-			ok, err = pcall -> node\build opts
+			ok, status = pcall -> node\build opts
 			if ok
+				_exit status and 0 or 2
 				_exit 0
 			else
-				stderr\write err
+				stderr\write status
 				_exit 1
 
 	waitprocess: =>
 		pid, ty, status = wait!
 		error "Failed to wait" unless pid
-		error "Failed to build #{@processes[pid].name}" if ty != 'exited' or status != 0
+		error "Failed to build #{@processes[pid].name}" if ty != 'exited' or status != 0 and status != 2
 		@processes[pid].built = true
 		@processes[pid]\updatecache!
 		@processes[pid] = nil
 		@nprocesses -= 1
+		@nbuilt += 1 if status == 0

moonbuild/core/singleprocessexecutor.moon

@@ -4,13 +4,21 @@ class Executor
 	new: (@dag, @nparallel) =>
 
 	execute: (opts) =>
+		nbuilt = 0
+
 		block = @dag\buildablenodes!
 		while #block != 0
 			for node in *block
-				node\build opts
+				nbuilt +=1 if node\build opts
 				node\updatecache!
 				node.built = true
 			block = @dag\buildablenodes!
 
 		for name, node in pairs @dag.nodes
 			error "Node #{name} wasn't built" unless node.built
+
+		unless opts.quiet
+			if nbuilt == 0
+				print "Nothing to be done"
+			else
+				print "Built #{nbuilt} targets"

moonbuild/init.moon

@@ -0,0 +1,60 @@
+import loadfile from require 'moonscript.base'
+Context = require 'moonbuild.context'
+DepGraph = require 'moonbuild.core.DAG'
+Executor = require 'moonbuild.core.executor'
+_ = require 'moonbuild._'
+import insert from table
+
+moonbuild = (...) ->
+	-- build argument table
+	opts = {}
+	for i=1, select '#', ...
+		arg = select i, ...
+		if (type arg) == 'string'
+			insert opts, arg
+		elseif (type arg) == 'table'
+			for k, v in pairs arg
+				opts[k] = v if (type k) != 'number'
+			for i, v in ipairs arg
+				insert opts, v
+		else
+			error "Invalid argument type #{type arg} for moonbuild"
+
+	-- resolve arguments
+	buildfile = opts.buildfile or opts.b or 'Build.moon'
+	opts.buildfile = buildfile
+	parallel = opts.parallel or opts.j or 1
+	parallel = true if parallel == 'y'
+	opts.parallel = parallel
+	quiet = opts.quiet or opts.q or false
+	opts.quiet = quiet
+	force = opts.force or opts.f or false
+	opts.force = force
+	verbose = opts.verbose or opts.v or false
+	opts.verbose = verbose
+
+	-- create context and DAG
+	ctx = Context!
+	ctx\load (loadfile buildfile), opts
+	print "Loaded buildfile" if verbose
+	ctx\init!
+	print "Initialized buildfile" if verbose
+	targets = #opts==0 and ctx.defaulttargets or opts
+	dag = DepGraph ctx, targets
+	print "Created dependancy graph" if verbose
+
+	-- and build
+	nparallel = parallel == true and Executor\getmaxparallel! or parallel
+	print "Building with #{nparallel} max parallel process#{nparallel>1 and "es" or ""}" if verbose
+	executor = Executor dag, nparallel
+	executor\execute opts
+	print "Finished" if verbose
+
+table = {
+	:moonbuild, :_
+	:Context, :DepGraph, :Executor
+}
+
+setmetatable table,
+	__call: (...) => moonbuild ...
+	__index: (name) => require "moonbuild.#{name}"

rock.yml

@@ -22,3 +22,5 @@ build:
     install:
         bin:
             moonbuild: out/moonbuild
+    modules:
+        moonbuild: out/moonbuild.lua

rockspecs/moonbuild-2.1.3-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.3",
+  url = "git://github.com/natnat-mc/moonbuild"
+}
+version = "2.1.3-2"

rockspecs/moonbuild-2.2.0-1.rockspec

@@ -0,0 +1,27 @@
+build = {
+  install = {
+    bin = {
+      moonbuild = "out/moonbuild"
+    },
+    modules = {
+      moonbuild = "out/moonbuild.lua"
+    }
+  },
+  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.2.0",
+  url = "git://github.com/natnat-mc/moonbuild"
+}
+version = "2.2.0-1"

rockspecs/moonbuild-2.2.0-2.rockspec

@@ -0,0 +1,27 @@
+build = {
+  install = {
+    bin = {
+      moonbuild = "out/moonbuild"
+    }
+  },
+  modules = {
+    moonbuild = "out/moonbuild.lua"
+  },
+  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.2.0",
+  url = "git://github.com/natnat-mc/moonbuild"
+}
+version = "2.2.0-2"

rockspecs/moonbuild-2.2.1-1.rockspec

@@ -0,0 +1,27 @@
+build = {
+  install = {
+    bin = {
+      moonbuild = "out/moonbuild"
+    }
+  },
+  modules = {
+    moonbuild = "out/moonbuild.lua"
+  },
+  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.2.1",
+  url = "git://github.com/natnat-mc/moonbuild"
+}
+version = "2.2.1-1"

rockspecs/moonbuild-2.2.2-1.rockspec

@@ -0,0 +1,27 @@
+build = {
+  install = {
+    bin = {
+      moonbuild = "out/moonbuild"
+    }
+  },
+  modules = {
+    moonbuild = "out/moonbuild.lua"
+  },
+  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.2.2",
+  url = "git://github.com/natnat-mc/moonbuild"
+}
+version = "2.2.2-1"