Skip to content

Commit e97747d

Browse files
authored
Merge pull request #577 from SteveL-MSFT/config-pkg
update build script to account for configuration files
2 parents c88c4a0 + e35d416 commit e97747d

File tree

6 files changed

+58
-4
lines changed

6 files changed

+58
-4
lines changed

build.ps1

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ $filesForWindowsPackage = @(
4545
'windowspowershell.dsc.resource.json',
4646
'wmi.dsc.resource.json',
4747
'wmi.resource.ps1',
48-
'configurations/windows_baseline.dsc.yaml',
49-
'configurations/windows_inventory.dsc.yaml'
48+
'windows_baseline.dsc.yaml',
49+
'windows_inventory.dsc.yaml'
5050
)
5151

5252
$filesForLinuxPackage = @(
@@ -211,7 +211,7 @@ if (!$SkipBuild) {
211211
}
212212

213213
# make sure dependencies are built first so clippy runs correctly
214-
$windows_projects = @("pal", "registry", "reboot_pending", "wmi-adapter")
214+
$windows_projects = @("pal", "registry", "reboot_pending", "wmi-adapter", "configurations/windows")
215215
$macOS_projects = @("resources/brew")
216216
$linux_projects = @("resources/apt")
217217

configurations/windows/copy_files.txt

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
windows_baseline.dsc.yaml
2+
windows_inventory.dsc.yaml
+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
{
2+
"name": "tree-sitter-dscexpression",
3+
"version": "1.0.0",
4+
"description": "Dscexpression grammar for tree-sitter",
5+
"repository": "github:tree-sitter/tree-sitter-dscexpression",
6+
"license": "MIT",
7+
"main": "bindings/node",
8+
"types": "bindings/node",
9+
"keywords": [
10+
"incremental",
11+
"parsing",
12+
"tree-sitter",
13+
"dscexpression"
14+
],
15+
"files": [
16+
"grammar.js",
17+
"binding.gyp",
18+
"prebuilds/**",
19+
"bindings/node/*",
20+
"queries/*",
21+
"src/**",
22+
"*.wasm"
23+
],
24+
"dependencies": {
25+
"node-addon-api": "^8.1.0",
26+
"node-gyp-build": "^4.8.2"
27+
},
28+
"devDependencies": {
29+
"prebuildify": "^6.0.1",
30+
"tree-sitter-cli": "^0.24.3"
31+
},
32+
"peerDependencies": {
33+
"tree-sitter": "^0.21.1"
34+
},
35+
"peerDependenciesMeta": {
36+
"tree-sitter": {
37+
"optional": true
38+
}
39+
},
40+
"scripts": {
41+
"install": "node-gyp-build",
42+
"prestart": "tree-sitter build --wasm",
43+
"start": "tree-sitter playground",
44+
"test": "node --test bindings/node/*_test.js"
45+
},
46+
"tree-sitter": [
47+
{
48+
"scope": "source.dscexpression",
49+
"injection-regex": "^dscexpression$"
50+
}
51+
]
52+
}

wmi-adapter/Tests/wmi.tests.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Describe 'WMI adapter resource tests' {
4747
}
4848

4949
It 'Example config works' -Skip:(!$IsWindows) {
50-
$configPath = Join-Path $PSScriptRoot '..\..\configurations\windows_inventory.dsc.yaml'
50+
$configPath = Join-Path $PSScriptRoot '..\..\configurations\windows\windows_inventory.dsc.yaml'
5151
$r = dsc config get -p $configPath
5252
$LASTEXITCODE | Should -Be 0
5353
$r | Should -Not -BeNullOrEmpty

0 commit comments

Comments
 (0)