Skip to content

Commit

Permalink
More package cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Nexela committed Mar 3, 2020
1 parent e659103 commit eddef0d
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 117 deletions.
2 changes: 1 addition & 1 deletion .circleci/makedocs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ rm -rf 'stdlib-docs'
mkdir -p 'stdlib-docs'
cp doc/spectre.min.css 'stdlib-docs/spectre.min.css'
cp doc/spectre-icons.min.css 'stdlib-docs/spectre-icons.min.css'
ldoc -ic doc/package.ld -l doc -s doc stdlib
ldoc -ic doc/config.ld -l doc -s doc stdlib
19 changes: 8 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
#lua files in root
#/control.lua
#/data.lua
#/data-updates.lua
#/data-final-fixes.lua
/*.lua
*.lua

# Exclude the build directory
.build/
# Exclude the api docs directory
stdlib-docs/

.temp/
.trash/
.test/
stdlib-docs/
.history/

# Exclude the output directory
.output/
.build/

# vim swapfiles
.*.swp
Expand All @@ -23,10 +20,10 @@ stdlib-docs/
/stdlib/tags

# Ignore temp.lua files
*.ign.lua
*.tmp.lua
*.tmp
temp*.lua
*.stackdump
*.bak.*

# Compiled Lua sources
luac.out
Expand Down
2 changes: 1 addition & 1 deletion .publish/prepackage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ rm -rf 'stdlib-docs'
mkdir -p 'stdlib-docs'
cp doc/spectre.min.css 'stdlib-docs/spectre.min.css'
cp doc/spectre-icons.min.css 'stdlib-docs/spectre-icons.min.css'
ldoc -ic doc/package.ld -l doc -s doc stdlib
ldoc -ic doc/config.ld -l doc -s doc stdlib

echo ''
luacheck ./stdlib
Expand Down
5 changes: 3 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
"files.exclude": {
"**/.build": true,
"**/.trash": true,
"**/.history": true,
},
"search.exclude": {
"**/.test": true,
"**/api-docs": true,
"**/.temp": true,
"**/stdlib-docs": true,
}
}
8 changes: 3 additions & 5 deletions doc/config.ld
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ full_description = [[
The Factorio Standard Library aims to extend the Factorio Lua API with well-tested, documented, and easy-to-use functions to make modding easier.
]]

local BUILD_DIR = "../.build/"

no_lua_ref = true
convert_opt = true
sort = false
Expand All @@ -18,9 +16,9 @@ merge = false
backtick_references = false
format = "discount"
template_escape = ">"
dir = BUILD_DIR .. "doc"
examples = {"../doc/examples"}
topics = {"../readme.md", "../changelog.txt", "../LICENSE", "../doc/contributing.md", "../doc/style-guide.md"}
dir = "stdlib-docs"
examples = {"./doc/examples"}
topics = {"./readme.md", "./changelog.txt", "./LICENSE", "./doc/contributing.md", "./doc/style-guide.md"}

new_type("event", "Events", false, "Event Parameters")

Expand Down
97 changes: 0 additions & 97 deletions doc/package.ld

This file was deleted.

0 comments on commit eddef0d

Please sign in to comment.