1
0
mirror of https://github.com/natnat-mc/moonbuild synced 2026-05-28 04:59:41 +02:00

20 Commits

Author SHA1 Message Date
Codinget 715aa2ebb7 Producing rockspec 2.5.1-1 2021-01-10 23:24:31 +01:00
Codinget bed119a40c added watcher to Alfons.moon 2021-01-10 22:43:18 +01:00
Codinget 57126a7973 fixed mkdirs sometimes failing due to race condition when multiprocess builds are running 2021-01-10 22:19:10 +01:00
Codinget cd9b0ab159 Producing rockspec 2.5.0-1 2020-12-02 02:49:11 +01:00
Codinget 678313d09f added pipelines, closes #18 2020-12-02 02:48:36 +01:00
Codinget ebd380fb0f Producing rockspec 2.4.0-1 2020-12-01 22:06:32 +01:00
Codinget 803d1093bb added table syntax for var, closes #19 2020-12-01 22:05:04 +01:00
Codinget ec5fc1cf7d added @in (but not working due to moonscript bug) and @out 2020-12-01 21:43:04 +01:00
Codinget 17578bb721 Producing rockspec 2.3.0-2 2020-12-01 21:35:49 +01:00
Codinget d3c8414086 Producing rockspec 2.3.0-1 2020-12-01 21:34:18 +01:00
Codinget d43e9350d3 added _.cmdline and _.cmdlinerst, closes #20 2020-12-01 21:33:59 +01:00
Codinget 0f3506c7b7 Alfons.moon handles the source ver of moonbuild, also funny number of commits haha nice 2020-11-15 16:28:30 +01:00
Codinget eb28c9c8bb rewrote Build.moon and Makefile to actually work correctly 2020-11-13 23:49:23 +01:00
Codinget e0afeaaf07 Producing rockspec 2.2.2-2 2020-11-13 20:12:52 +01:00
Codinget e13705f232 Producing rockspec 2.2.2-1 2020-11-13 20:12:38 +01:00
Codinget c6004f1582 updated the binary to not be packaged with the library 2020-11-13 20:12:24 +01:00
Codinget ce942f9da8 Producing rockspec 2.2.1-1 2020-11-13 20:03:58 +01:00
Codinget cc776ef24e fix gitignore 2020-11-13 20:03:41 +01:00
Codinget 603d09fc84 Producing rockspec 2.2.0-2 2020-11-13 19:54:54 +01:00
Codinget 2b3337fc69 Producing rockspec 2.2.0-1 2020-11-13 19:54:09 +01:00
25 changed files with 3271 additions and 2764 deletions
+3 -1
View File
@@ -1 +1,3 @@
*.lua
bin/*.lua
moonbuild/*.lua
moonbuild/*/*.lua
+8 -7
View File
@@ -1,13 +1,14 @@
tasks:
bootstrap: => sh "moon bin/moonbuild.moon -jy"
bootstrapinstall: => sh "moon bin/moonbuild.moon install -jy"
require 'moonscript'
moonbuild = require 'moonbuild'
tasks:
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'
watch: => watch {'.'}, {'.git'}, 'live', (glob '*.moon'), pcall -> moonbuild j: true
build: => moonbuild j: true
install: => moonbuild 'install', j: true
clean: => moonbuild 'clean'
mrproper: => moonbuild 'mrproper'
+35 -42
View File
@@ -1,16 +1,16 @@
public var 'MOONC', 'moonc'
public var 'AMALG', 'amalg.lua'
public var 'RM', 'rm', '-f', '--'
public var 'LUA', 'lua5.3'
public var AMALG: 'amalg.lua'
public var RM: 'rm', '-f', '--'
public var LUA: 'lua5.3'
var 'LIB_SRC', _.wildcard 'moonbuild/**.moon'
var 'BIN_SRC', _.wildcard 'bin/*.moon'
var LIB_SRC: _.wildcard 'moonbuild/**.moon'
var BIN_SRC: _.wildcard 'bin/*.moon'
var 'LIB_LUA', _.patsubst LIB_SRC, '%.moon', '%.lua'
var 'BIN_LUA', _.patsubst BIN_SRC, '%.moon', '%.lua'
var 'BIN', _.patsubst BIN_LUA, 'bin/%.lua', 'out/%'
var LIB_LUA: _.patsubst LIB_SRC, '%.moon', '%.lua'
var BIN_LUA: _.patsubst BIN_SRC, '%.moon', '%.lua'
var BIN: _.patsubst BIN_LUA, 'bin/%.lua', 'out/%'
var LIB: 'out/moonbuild.lua'
var 'MODULES', _.foreach (_.patsubst LIB_LUA, '%.lua', '%'), => @gsub '/', '.'
var MODULES: _.foreach (_.patsubst LIB_LUA, '%.lua', '%'), => @gsub '/', '.'
with public default target 'all'
\after 'bin'
@@ -21,15 +21,15 @@ with public target 'install'
\after 'install-lib'
with public target 'install-bin'
\depends 'out/moonbuild'
\produces '/usr/local/bin/moonbuild'
\fn => _.cmd 'sudo', 'cp', @infile, @outfile
\depends BIN
\produces _.patsubst BIN, 'out/%', '/usr/local/bin/%'
\fn => _.cmd 'sudo', 'cp', @infile, @out
\sync!
with public target 'install-lib'
\depends 'out/moonbuild.lua'
\depends LIB
\produces "/usr/local/share/lua/#{LUA\gsub 'lua', ''}/moonbuild.lua"
\fn => _.cmd 'sudo', 'cp', @infile, @outfile
\fn => _.cmd 'sudo', 'cp', @infile, @out
\sync!
with public target 'clean'
@@ -38,32 +38,25 @@ with public target 'clean'
with public target 'mrproper'
\after 'clean'
\fn => _.cmd RM, BIN
\fn => _.cmd RM, BIN, LIB
with public target 'bin'
\depends BIN
with pipeline! -- lib
\sources LIB_SRC
\step 'compile-lib'
pattern: {'%.moon', '%.lua'}
fn: => _.moonc @infile, @out
\step 'lib'
output: LIB
fn: => _.cmd AMALG, '-o', @out, '-s', 'moonbuild/init.lua', _.exclude MODULES, 'moonbuild.init'
with public target 'lib'
\depends LIB_LUA
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 @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'
\fn => _.moonc @infile, @outfile
with pipeline! -- bin
\sources BIN_SRC
\step 'compile-bin'
pattern: {'%.moon', '%.lua'}
fn: => _.moonc @infile, @out
\step 'bin'
pattern: {'bin/%.lua', 'out/%'}
mkdirs: true
fn: =>
_.writefile @out, "#!/usr/bin/env #{LUA}\n#{_.readfile @infile}"
_.cmd 'chmod', '+x', @out
+8 -8
View File
@@ -16,27 +16,27 @@ 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)
mrproper: clean
$(RM) $(BIN)
$(RM) $(BIN) out/moonbuild.lua
bin: $(BIN)
lib: $(LIB_LUA)
lib: $(LIB_LUA) out/moonbuild.lua
out/%: bin/%.lua $(LIB_LUA)
@mkdir -p `dirname $@`
$(AMALG) -o $@.body -s $< $(MODULES)
@printf '#!/usr/bin/env %s\n' $(LUA) > $@.headline
@cat $@.headline $@.body > $@
@rm $@.headline $@.body
@cat $@.headline $< > $@
@rm $@.headline
chmod +x $@
out/moonbuild.lua: moonbuild/init.lua $(LIB_LUA)
@mkdir -p `dirname $@`
$(AMALG) -o $@ -s $< $(MODULES)
%.lua: %.moon
moonc $^
+6 -1
View File
@@ -24,8 +24,13 @@ 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`.
You can combine these steps with `moon bin/moonbuild.moon -qjy install` which will build and install moonbuild.
### With `Alfons`
Alfons can use the devel version of moonbuild directly from its sources, so `alfons build` and `alfons install` will work directly.
## Docs
TODO
+4 -6
View File
@@ -1,15 +1,13 @@
-- load everything we need
import loadfile from require 'moonscript.base'
Context = require 'moonbuild.context'
Variable = require 'moonbuild.core.Variable'
DepGraph = require 'moonbuild.core.DAG'
Executor = require 'moonbuild.core.executor'
import parseargs from require 'moonbuild._cmd.common'
import Context, DepGraph, Executor from require 'moonbuild'
Variable = (require 'moonbuild')['core.Variable']
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'
+7 -1
View File
@@ -17,5 +17,11 @@ cmd.backend = backend
cmd.parseargs = parseargs
cmd.escape = escape
-- derived cmd functions
_cmd = cmd.cmd
_cmdrst = cmd.cmdrst
cmd.cmdline = (cmdline) -> _cmd parseargs cmdline
cmd.cmdlinerst = (cmdline) -> _cmdrst parseargs cmdline
-- the library itself
setmetatable cmd, __call: => {'cmd', 'cmdrst', 'sh'}
setmetatable cmd, __call: => {'cmd', 'cmdrst', 'cmdline', 'cmdlinerst', 'sh'}
+9 -3
View File
@@ -166,10 +166,16 @@ mkdir = (dir) ->
clearentry parent dir
mkdirs = (dir) ->
return if isdir dir
error "Can't mkdirs #{dir}: file exists" if exists dir
if attr = attributes normalizepath dir
return if attr.mode == 'directory'
error "Can't mkdirs #{dir}: file exists"
mkdirs parent dir
mkdir dir
unless pcall -> actualmkdir dir
clearentry parent dir
clearentry dir
error "Failed to mkdirs #{dir}: last mkdir failed" unless isdir dir
clearentry parent dir
clearentry dir
-- from the backend
fs = {k, withcache fn for k, fn in pairs fs}
+4 -4
View File
@@ -108,12 +108,12 @@ class DepNode
ctx = setmetatable {},
__index: (_, k) ->
switch k
when 'infile'
when 'infile', 'in'
f = first deps
f and f.name
when 'infiles'
foreach deps, => @name
when 'outfile'
when 'outfile', 'out'
f = first @outs
f and f.name
when 'outfiles'
@@ -182,9 +182,9 @@ class DepNode
ctx = setmetatable {},
__index: (_, k) ->
switch k
when 'infile' then @ins[1]
when 'infile', 'in' then @ins[1]
when 'infiles' then @ins
when 'outfile' then @outs[1]
when 'outfile', 'out' then @outs[1]
when 'outfiles' then @outs
when 'name' then @name
else error "No such field in TargetContext: #{k}"
+56
View File
@@ -0,0 +1,56 @@
Target = require 'moonbuild.core.Target'
_ = require 'moonbuild._'
import flatten, patsubst from _
class Pipeline
new: (@ctx) =>
@lastsources = {}
sources: (...) =>
@lastsources = flatten @lastsources, ...
source: (src) =>
@lastsources = flatten @lastsources, src
step: (name, params) =>
public = true
public, params = false, name if (type name) == 'table'
tgttype = if params.pattern
error "pattern must be a table with the same format as patsubst" unless (type params.pattern) == 'table' and (type params.pattern[1]) == 'string' and (type params.pattern[2]) == 'string'
'pattern'
elseif params.output or params.out
error "output must be a string" unless (type params.output or params.out) == 'string'
'single'
else
error "invalid step type for pipeline: must be pattern or single (out/output)"
tgtouts = switch tgttype
when 'pattern' then patsubst @lastsources, params.pattern[1], params.pattern[2]
when 'single' then params.output or params.out
tgtpatt = switch tgttype
when 'pattern' then params.pattern[2]
when 'single' then nil
tgtins = switch tgttype
when 'pattern' then params.pattern[1]
when 'single' then @lastsources
tgtprod = switch tgttype
when 'pattern' then params.pattern[2]
when 'single' then '%'
tgt = with Target @ctx, tgtouts, pattern: tgtpatt
\depends tgtins
\produces tgtprod
\fn params.fn or error "pipeline steps need a fn"
tgt\mkdirs! if params.mkdirs
tgt\sync! if params.sync
@ctx\addtarget tgt
if public
@ctx\addtarget with Target @ctx, name
\depends tgtouts
.public = true
@lastsources = tgtouts
+11 -1
View File
@@ -4,7 +4,17 @@ class Variable
new: (@name, ...) =>
@public = false
if (select '#', ...) !=1 or (type ...) == 'table'
if (type @name) == 'table'
error "not a valid var table: #{next @name}" unless (type next @name) == 'string'
error "more than one var at once: #{next @name}, #{next @name, (next @name)}" if next @name, (next @name)
name = next @name
@name, param = name, @name
val = param[name]
if (select '#', ...) !=0 or (type val) == 'table'
@value = flatten val, ...
else
@value = val
elseif (select '#', ...) !=1 or (type ...) == 'table'
@value = flatten ...
else
@value = ...
+7 -3
View File
@@ -1,5 +1,6 @@
Target = require 'moonbuild.core.Target'
Variable = require 'moonbuild.core.Variable'
Pipeline = require 'moonbuild.core.Pipeline'
_ = require 'moonbuild._'
import flatten from _
@@ -18,10 +19,10 @@ import flatten from _
rawset env, '_G', env
rawset env, '_ENV', env
rawset env, 'var', (name, ...) ->
var = Variable name, ...
rawset env, 'var', (...) ->
var = Variable ...
ctx\addvar var
rawset varlayer, name, var.value
rawset varlayer, var.name, var.value
var
rawset env, 'target', (name, opts) ->
@@ -29,4 +30,7 @@ import flatten from _
ctx\addtarget target
target
rawset env, 'pipeline', ->
Pipeline ctx
env, varlayer
+7 -2685
View File
File diff suppressed because it is too large Load Diff
+2834
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -22,5 +22,5 @@ build:
install:
bin:
moonbuild: out/moonbuild
modules:
moonbuild: out/moonbuild.lua
modules:
moonbuild: out/moonbuild.lua
+27
View File
@@ -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"
+27
View File
@@ -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"
+27
View File
@@ -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"
+27
View File
@@ -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"
+27
View File
@@ -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-2"
+27
View File
@@ -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.3.0",
url = "git://github.com/natnat-mc/moonbuild"
}
version = "2.3.0-1"
+27
View File
@@ -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.3.0",
url = "git://github.com/natnat-mc/moonbuild"
}
version = "2.3.0-2"
+27
View File
@@ -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.4.0",
url = "git://github.com/natnat-mc/moonbuild"
}
version = "2.4.0-1"
+27
View File
@@ -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.5.0",
url = "git://github.com/natnat-mc/moonbuild"
}
version = "2.5.0-1"
+27
View File
@@ -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.5.1",
url = "git://github.com/natnat-mc/moonbuild"
}
version = "2.5.1-1"