summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@digital-scurf.org>2013-11-28 13:56:59 +0100
committerDaniel Silverstone <dsilvers@digital-scurf.org>2013-11-28 13:56:59 +0100
commit8086445183e2cdb52e6c3d926f8ebdd8667c397e (patch)
tree8815543120cd51fa94e73fda418648f1b3f6ae85
parentf566f178016ae766d5c20fb7408f2280c8995c51 (diff)
downloadlace-8086445183e2cdb52e6c3d926f8ebdd8667c397e.tar.gz
Move ldoc generation into top level
-rw-r--r--.gitignore1
-rw-r--r--Makefile7
-rw-r--r--config.ld (renamed from ldoc/config.ld)2
-rw-r--r--ldoc/.gitignore1
-rw-r--r--old-docs/compilation.mdwn (renamed from doc/compilation.mdwn)0
-rw-r--r--old-docs/developing.mdwn (renamed from doc/developing.mdwn)0
-rw-r--r--old-docs/execution.mdwn (renamed from doc/execution.mdwn)0
-rw-r--r--old-docs/index.mdwn (renamed from doc/index.mdwn)0
-rw-r--r--old-docs/syntax-allow-deny.mdwn (renamed from doc/syntax-allow-deny.mdwn)0
-rw-r--r--old-docs/syntax-default.mdwn (renamed from doc/syntax-default.mdwn)0
-rw-r--r--old-docs/syntax-define.mdwn (renamed from doc/syntax-define.mdwn)0
-rw-r--r--old-docs/syntax-include.mdwn (renamed from doc/syntax-include.mdwn)0
-rw-r--r--old-docs/syntax.mdwn (renamed from doc/syntax.mdwn)0
13 files changed, 8 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 6a58e30..da8ed65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
luacov.stats.out
luacov.report.out
+html
diff --git a/Makefile b/Makefile
index 5769c6b..6d733de 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-all: test
+all: test doc
MODULES := lace lace.lex lace.compiler lace.builtin lace.engine lace.error
LUA_VER := 5.1
@@ -20,6 +20,7 @@ LUA := LUA_PATH="$(shell pwd)/lib/?.lua;$(shell pwd)/extras/luacov/src/?.lua;;"
clean:
$(RM) luacov.report.out luacov.stats.out
+ $(RM) -r html
distclean: clean
find . -name "*~" -delete
@@ -43,3 +44,7 @@ test:
.PHONY: interactive
interactive:
$(LUA) -e'lace=require"lace"' -i
+
+doc:
+ @echo "Running LDoc"
+ @ldoc .
diff --git a/ldoc/config.ld b/config.ld
index 57c2914..37ac80a 100644
--- a/ldoc/config.ld
+++ b/config.ld
@@ -1,4 +1,4 @@
-file = {"../lib"}
+file = {"lib"}
format = "discount"
project = "Lua Access Control Engine"
title = "Lace - Lua Access Control Engine"
diff --git a/ldoc/.gitignore b/ldoc/.gitignore
deleted file mode 100644
index 1936cc1..0000000
--- a/ldoc/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-html
diff --git a/doc/compilation.mdwn b/old-docs/compilation.mdwn
index 37876db..37876db 100644
--- a/doc/compilation.mdwn
+++ b/old-docs/compilation.mdwn
diff --git a/doc/developing.mdwn b/old-docs/developing.mdwn
index f82a593..f82a593 100644
--- a/doc/developing.mdwn
+++ b/old-docs/developing.mdwn
diff --git a/doc/execution.mdwn b/old-docs/execution.mdwn
index 50049a9..50049a9 100644
--- a/doc/execution.mdwn
+++ b/old-docs/execution.mdwn
diff --git a/doc/index.mdwn b/old-docs/index.mdwn
index 2b7f485..2b7f485 100644
--- a/doc/index.mdwn
+++ b/old-docs/index.mdwn
diff --git a/doc/syntax-allow-deny.mdwn b/old-docs/syntax-allow-deny.mdwn
index c227abf..c227abf 100644
--- a/doc/syntax-allow-deny.mdwn
+++ b/old-docs/syntax-allow-deny.mdwn
diff --git a/doc/syntax-default.mdwn b/old-docs/syntax-default.mdwn
index 2304ed5..2304ed5 100644
--- a/doc/syntax-default.mdwn
+++ b/old-docs/syntax-default.mdwn
diff --git a/doc/syntax-define.mdwn b/old-docs/syntax-define.mdwn
index 579fe44..579fe44 100644
--- a/doc/syntax-define.mdwn
+++ b/old-docs/syntax-define.mdwn
diff --git a/doc/syntax-include.mdwn b/old-docs/syntax-include.mdwn
index a95f489..a95f489 100644
--- a/doc/syntax-include.mdwn
+++ b/old-docs/syntax-include.mdwn
diff --git a/doc/syntax.mdwn b/old-docs/syntax.mdwn
index 75a2b1e..75a2b1e 100644
--- a/doc/syntax.mdwn
+++ b/old-docs/syntax.mdwn