Skip to content

Commit cd8cd2b

Browse files
committed
Merge branch 'dev'
2 parents 2611164 + 2caf1c4 commit cd8cd2b

5 files changed

Lines changed: 89 additions & 247 deletions

File tree

README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,11 @@ Compiles the *AMX Mod X* plugin source file `plugin2.sma` *without* using the mo
6464
Compile-SourceScript -File ~/servers/cstrike/addons/amxmodx/scripting/plugin2.sma -SkipWrapper -Force
6565
```
6666

67-
### Script
68-
69-
The script version of `Compile-SourceScript` is also provided and can be found [here](src/script/Compile-SourceScript.ps1).
70-
7167
### VSCode
7268

73-
`Compile-SourceScript` can be invoked via [Build Tasks](https://code.visualstudio.com/docs/editor/tasks#vscode) in **VSCode**. A sample tasks file can be found [here](docs/samples/.vscode/tasks.json.sample).
69+
`Compile-SourceScript` can be invoked via [Build Tasks](https://code.visualstudio.com/docs/editor/tasks#vscode) in **VSCode**.
70+
71+
Sample tasks files can be found [here](docs/samples/.vscode).
7472

7573
## Administration
7674

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "[pwsh] Compile-SourceScript",
6+
"type": "process",
7+
"command": "pwsh",
8+
"args": [
9+
"-Command",
10+
"Import-Module ~/path/to/Compile-SourceScript/src/Compile-SourceScript/Compile-SourceScript.psm1; Compile-SourceScript",
11+
"-File",
12+
"${file}",
13+
"-Force"
14+
],
15+
"group": "build",
16+
"problemMatcher": []
17+
},
18+
{
19+
"label": "[pwsh] Compile-SourceScript -SkipWrapper",
20+
"type": "process",
21+
"command": "pwsh",
22+
"args": [
23+
"-Command",
24+
"Import-Module C:/path/to/Compile-SourceScript/src/Compile-SourceScript/Compile-SourceScript.psm1; Compile-SourceScript",
25+
"-File",
26+
"${file}",
27+
"-SkipWrapper",
28+
"-Force"
29+
],
30+
"group": "build",
31+
"problemMatcher": []
32+
}
33+
]
34+
}
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "[pwsh] Compile-SourceScript",
6+
"type": "process",
7+
"command": "pwsh",
8+
"args": [
9+
"-Command",
10+
"Compile-SourceScript",
11+
"-File",
12+
"${file}",
13+
"-Force"
14+
],
15+
"group": "build",
16+
"problemMatcher": []
17+
},
18+
{
19+
"label": "[pwsh] Compile-SourceScript -SkipWrapper",
20+
"type": "process",
21+
"command": "pwsh",
22+
"args": [
23+
"-Command",
24+
"Compile-SourceScript",
25+
"-File",
26+
"${file}",
27+
"-SkipWrapper",
28+
"-Force"
29+
],
30+
"group": "build",
31+
"problemMatcher": []
32+
}
33+
]
34+
}

docs/samples/.vscode/tasks.json.sample renamed to docs/samples/.vscode/tasks.json.installed.windows.sample

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"version": "2.0.0",
33
"tasks": [
44
{
5-
"label": "Compile-SourceScript (pwsh)",
5+
"label": "[pwsh] Compile-SourceScript",
66
"type": "process",
77
"command": "pwsh",
88
"args": [
@@ -12,49 +12,52 @@
1212
"${file}",
1313
"-Force"
1414
],
15-
"group": {
16-
"kind": "build",
17-
"isDefault": true
18-
}
15+
"group": "build",
16+
"problemMatcher": []
1917
},
2018
{
21-
"label": "Compile-SourceScript (powershell)",
19+
"label": "[pwsh] Compile-SourceScript -SkipWrapper",
2220
"type": "process",
23-
"command": "powershell",
21+
"command": "pwsh",
2422
"args": [
2523
"-Command",
2624
"Compile-SourceScript",
2725
"-File",
2826
"${file}",
27+
"-SkipWrapper",
2928
"-Force"
3029
],
31-
"group": "build"
30+
"group": "build",
31+
"problemMatcher": []
3232
},
3333
{
34-
"label": "Compile-SourceScript.ps1 (pwsh)",
34+
"label": "[powershell] Compile-SourceScript",
3535
"type": "process",
36-
"command": "pwsh",
36+
"command": "powershell",
3737
"args": [
3838
"-Command",
39-
"D:/path/to/Compile-SourceScript/src/script/Compile-SourceScript.ps1",
39+
"Compile-SourceScript",
4040
"-File",
4141
"${file}",
4242
"-Force"
4343
],
44-
"group": "build"
44+
"group": "build",
45+
"problemMatcher": []
4546
},
4647
{
47-
"label": "Compile-SourceScript.ps1 (powershell)",
48+
"label": "[powershell] Compile-SourceScript -SkipWrapper",
4849
"type": "process",
4950
"command": "powershell",
5051
"args": [
5152
"-Command",
52-
"D:/path/to/Compile-SourceScript/src/script/Compile-SourceScript.ps1",
53+
"Compile-SourceScript",
5354
"-File",
5455
"${file}",
56+
"-SkipWrapper",
5557
"-Force"
5658
],
57-
"group": "build"
59+
"group": "build",
60+
"problemMatcher": []
5861
}
5962
]
6063
}

src/script/Compile-SourceScript.ps1

Lines changed: 0 additions & 227 deletions
This file was deleted.

0 commit comments

Comments
 (0)