Sitelet https://github.com/lua-stdlib/lua-stdlib/commit/d272ca370752aab6bb689eddd6eb007e6778172e
Skip to content

Commit d272ca3

Browse files
gvvaughangvvaughan
committed
doc: keep the LDoc configuration out of luarcoks doc tree.
* doc/config.ld.in: Move from here... * build-aux/config.ld.in: ...to here. * Makefile (doc, config.ld): Adjust accordingly. * .gitignore: Update. Signed-off-by: Gary V. Vaughan <gary@gnu.org>
1 parent c82405a commit d272ca3

3 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎.gitignore‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
*~
12
.DS_Store
2-
/.gitmodules
3+
/*.src.rock
34
/Makefile
5+
/build-aux/config.ld
46
/doc
5-
!/doc/config.ld.in
67
/lib/std/version.lua
7-
/stdlib-*.rockspec
8-
!/stdlib-git-*.rockspec
8+
/luacov.*.out
9+
/stdlib-*.tar.gz

‎Makefile‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,11 @@ $(luadir)/version.lua: .FORCE
3131
mv '$@T' '$@'; \
3232
fi
3333

34-
doc: doc/config.ld $(SOURCES)
35-
$(LDOC) -c doc/config.ld .
34+
doc: build-aux/config.ld $(SOURCES)
35+
$(LDOC) -c build-aux/config.ld .
3636

37-
doc/config.ld: doc/config.ld.in
38-
version=`LUA_PATH=$$(pwd)'/lib/?.lua;;' $(LUA) -e 'io.stdout:write(require"std.version")'`; \
39-
$(SED) -e "s,@PACKAGE_VERSION@,$$version," '$<' > '$@'
37+
build-aux/config.ld: build-aux/config.ld.in
38+
$(SED) -e "s,@PACKAGE_VERSION@,$(VERSION)," '$<' > '$@'
4039

4140

4241
CHECK_ENV = LUA=$(LUA)

doc/config.ld.in renamed to build-aux/config.ld.in

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,27 @@ The code is copyright by its respective authors, and released under the
2424
MIT license (the same license as Lua itself). There is no warranty.
2525
]]
2626

27-
dir = '.'
27+
dir = '../doc'
2828

2929
file = {
30-
'../lib/std/init.lua',
31-
'../lib/std/debug.lua',
32-
'../lib/std/io.lua',
33-
'../lib/std/math.lua',
34-
'../lib/std/package.lua',
35-
'../lib/std/string.lua',
36-
'../lib/std/table.lua',
30+
'../lib/std/init.lua',
31+
'../lib/std/debug.lua',
32+
'../lib/std/io.lua',
33+
'../lib/std/math.lua',
34+
'../lib/std/package.lua',
35+
'../lib/std/string.lua',
36+
'../lib/std/table.lua',
3737
}
3838

3939
new_type ('corefunction', 'Core_Functions', true)
4040
new_type ('corelibrary', 'Core_Libraries', true)
4141

4242
function postprocess_html(s)
43-
s = s:gsub('<h1>%s*Corefunction (.-)</p>', '<h1>Module %1</h1>')
44-
s = s:gsub('<h1>%s*Corelibrary (.-)</p>', '<h1>Module %1</h1>')
45-
s = s:gsub('<h2>Core_Functions</h2>', '<h2>Core Functions</h2>')
46-
s = s:gsub('<h2>Core_Libraries</h2>', '<h2>Core Libraries</h2>')
47-
return s
43+
s = s:gsub('<h1>%s*Corefunction (.-)</p>', '<h1>Module %1</h1>')
44+
s = s:gsub('<h1>%s*Corelibrary (.-)</p>', '<h1>Module %1</h1>')
45+
s = s:gsub('<h2>Core_Functions</h2>', '<h2>Core Functions</h2>')
46+
s = s:gsub('<h2>Core_Libraries</h2>', '<h2>Core Libraries</h2>')
47+
return s
4848
end
4949

5050
new_type ('init', 'Initialisation', false, 'Parameters')

0 commit comments

Comments
 (0)