Skip to content

Commit

Permalink
Clarified ScriptExtensions list; require full package names.
Browse files Browse the repository at this point in the history
Closes GH-45.
  • Loading branch information
deplinenoise committed Oct 8, 2010
1 parent 2f36a92 commit d9ad231
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
13 changes: 8 additions & 5 deletions doc/manual.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -648,14 +648,17 @@ are supported:

=== Syntax Extensions ===

Tundra provides a small set of syntax extensions by default.
Tundra provides a small set of syntax extensions by default. To use syntax
extensions, add a SyntaxExtensions list to the `tundra.lua` file specifying the
extensions you want to enable. These are Lua package names.

==== File Globbing ====

Globbing basically means pattern matching over filenames. It is a convenient
way to use the filesystem as the index of what files to build rather than to
manually type every file out in the `Sources` list. You can also combine the
two for greater control by mixing globs and filenames.
The `tundra.syntax.glob` extension provides file globbing (pattern matching
over filenames.) It is a convenient way to use the filesystem as the index of
what files to build rather than to manually type every file out in the
`Sources` list. You can also combine the two for greater control by mixing
globs and filenames.

Globs come in two versions, `Glob` and `FGlob`.

Expand Down
2 changes: 1 addition & 1 deletion scripts/tundra/boot.lua
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ function load_toolset(id, ...)
end

function load_syntax(id, decl, passes)
apply_extension_module(id, "tundra.syntax.", decl, passes)
apply_extension_module(id, "", decl, passes)
end

local function member(list, item)
Expand Down
2 changes: 1 addition & 1 deletion tundra.lua
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Build {
LuaCompile = { Name = "Compile Lua sources for embedding", BuildOrder = 2 },
Tundra = { Name = "Main compile pass", BuildOrder = 3 },
},
SyntaxExtensions = { "glob", "embed_lua" },
SyntaxExtensions = { "tundra.syntax.glob", "tundra.syntax.embed_lua" },
Configs = {
Config { Name = "macosx-clang", Inherit = common, Tools = { "clang-osx" }, DefaultOnHost = "macosx" },
Config { Name = "macosx-gcc", Inherit = common, Tools = { "gcc-osx" } },
Expand Down

0 comments on commit d9ad231

Please sign in to comment.