Skip to content

Commit 20ee427

Browse files
Merge pull request #2413 from Jarod42/docs
Improve some doc
2 parents 4804a89 + 7cd607b commit 20ee427

File tree

4 files changed

+42
-12
lines changed

4 files changed

+42
-12
lines changed

premake5.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ if premake.action.supports("None") then
355355
{
356356
"website/blog/**",
357357
"website/community/**",
358-
"website/doc/**",
358+
"website/docs/**",
359359
"website/src/**",
360360
"website/static/**",
361361
"website/*"

website/docs/bindirs.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
bindirs
1+
Specifies extra paths to use when executing build commands
22

33
```lua
4-
bindirs { "directory" }
4+
bindirs { "directories" }
55
```
66

77
### Parameters ###
88

9-
`directory` - needs documentation.
9+
`directories` - paths containing executable to run when building command.
1010

1111
### Applies To ###
1212

@@ -19,6 +19,6 @@ Premake 5.0.0 alpha 12 or later.
1919
### Examples ###
2020

2121
```lua
22-
bindirs { "directory" }
22+
bindirs { "bin/", "scripts/" }
2323
```
2424

website/docs/compilebuildoutputs.md

+17-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
compilebuildoutputs
1+
Specify if generated file from [`buildcommands`](buildcommands.md) should be compiled or not.
22

33
```lua
44
compilebuildoutputs "value"
@@ -7,8 +7,8 @@ compilebuildoutputs "value"
77
### Parameters ###
88

99
`value` one of:
10-
* `on` - needs documentation.
11-
* `off` - needs documentation.
10+
* `on` - generated file should be compiled.
11+
* `off` - generated file should not be compiled.
1212

1313
### Applies To ###
1414

@@ -21,6 +21,19 @@ Premake 5.0.0 alpha 12 or later.
2121
### Examples ###
2222

2323
```lua
24-
compilebuildoutputs "value"
24+
filter "files:**.cpp.in"
25+
buildmessage "generate %{file.basename} from %{file.relpath}"
26+
buildoutputs { "%{cfg.objdir}/%{file.basename}") }
27+
buildcommands { "MyScript %[%{!file.abspath}] %[%{!cfg.objdir}/%{file.basename}]" }
28+
compilebuildoutputs "on"
29+
filter "files:**.h.in"
30+
buildmessage "generate %{file.basename} from %{file.relpath}"
31+
buildoutputs { "%{cfg.objdir}/%{file.basename}") }
32+
buildcommands { "MyScript %[%{!file.abspath}] %[%{!cfg.objdir}/%{file.basename}]" }
33+
compilebuildoutputs "off"
34+
filter {}
2535
```
2636

37+
## See Also ##
38+
39+
* [Custom Build Commands](Custom-Build-Commands.md)

website/docs/display.md

+20-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
display
1+
Text to display for rule or property definition
22

33
```lua
44
display "value"
55
```
66

77
### Parameters ###
88

9-
`value` - needs documentation.
9+
`value` - Text shown for the rule or property definition.
1010

1111
### Applies To ###
1212

@@ -19,6 +19,23 @@ Premake 5.0.0 alpha 12 or later.
1919
### Examples ###
2020

2121
```lua
22-
display "value"
22+
rule "myrule"
23+
display "My custom rule"
24+
fileextension ".in"
25+
26+
propertydefinition {
27+
name = "myoption",
28+
display = "My option",
29+
description = "Select the option to use",
30+
values = { [0] = "option1", [1] = "option2"},
31+
value = 1
32+
}
33+
34+
buildmessage 'custom rule: {copy} %{file.relpath} %{file.basename}'
35+
buildoutputs { "%{sln.location}/%{file.basename}" }
36+
buildcommands { "MyScript {myoption} %[%{!file.abspath}] %[%{!sln.location}/%{file.basename}]" }
2337
```
2438

39+
## See Also ##
40+
41+
* [Custom Rules](Custom-Rules.md)

0 commit comments

Comments
 (0)