Skip to content

Commit e5a8caf

Browse files
(GH-1153) Move resource subprojects into resources folder
This change moves the resource subprojects, which have an executable, into the `resources` folder. This makes discovering which projects provide DSC resources easier, instead of checking whether the folder contains any resource manifests. This change doesn't rename the folders, it only moves them. This change doesn't require modifying any code or cargo manifests, except for pointing to the correct path in the virtual workspace and build script.
1 parent afa5eda commit e5a8caf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+34
-34
lines changed

Cargo.toml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ resolver = "2"
55
members = [
66
"dsc",
77
"lib/dsc_lib",
8-
"dscecho",
8+
"resources/dscecho",
99
"lib/osinfo_lib",
10-
"osinfo",
10+
"resources/osinfo",
1111
"lib/pal",
12-
"process",
13-
"registry",
12+
"resources/process",
13+
"resources/registry",
1414
"lib/registry_lib",
15-
"runcommandonset",
15+
"resources/runcommandonset",
1616
"lib/security_context_lib",
17-
"sshdconfig",
17+
"resources/sshdconfig",
1818
"tools/dsctest",
1919
"tools/test_group_resource",
2020
"tree-sitter-dscexpression",
@@ -27,16 +27,16 @@ members = [
2727
default-members = [
2828
"dsc",
2929
"lib/dsc_lib",
30-
"dscecho",
30+
"resources/dscecho",
3131
"lib/osinfo_lib",
32-
"osinfo",
32+
"resources/osinfo",
3333
"lib/pal",
34-
"process",
35-
"registry",
34+
"resources/process",
35+
"resources/registry",
3636
"lib/registry_lib",
37-
"runcommandonset",
37+
"resources/runcommandonset",
3838
"lib/security_context_lib",
39-
"sshdconfig",
39+
"resources/sshdconfig",
4040
"tools/dsctest",
4141
"tools/test_group_resource",
4242
"tree-sitter-dscexpression",
@@ -51,16 +51,16 @@ default-members = [
5151
Windows = [
5252
"dsc",
5353
"lib/dsc_lib",
54-
"dscecho",
54+
"resources/dscecho",
5555
"lib/osinfo_lib",
56-
"osinfo",
56+
"resources/osinfo",
5757
"lib/pal",
58-
"process",
59-
"registry",
58+
"resources/process",
59+
"resources/registry",
6060
"lib/registry_lib",
61-
"runcommandonset",
61+
"resources/runcommandonset",
6262
"lib/security_context_lib",
63-
"sshdconfig",
63+
"resources/sshdconfig",
6464
"tools/dsctest",
6565
"tools/test_group_resource",
6666
"tree-sitter-dscexpression",
@@ -70,13 +70,13 @@ Windows = [
7070
macOS = [
7171
"dsc",
7272
"lib/dsc_lib",
73-
"dscecho",
73+
"resources/dscecho",
7474
"lib/osinfo_lib",
75-
"osinfo",
76-
"process",
77-
"runcommandonset",
75+
"resources/osinfo",
76+
"resources/process",
77+
"resources/runcommandonset",
7878
"lib/security_context_lib",
79-
"sshdconfig",
79+
"resources/sshdconfig",
8080
"tools/dsctest",
8181
"tools/test_group_resource",
8282
"tree-sitter-dscexpression",
@@ -86,13 +86,13 @@ macOS = [
8686
Linux = [
8787
"dsc",
8888
"lib/dsc_lib",
89-
"dscecho",
89+
"resources/dscecho",
9090
"lib/osinfo_lib",
91-
"osinfo",
92-
"process",
93-
"runcommandonset",
91+
"resources/osinfo",
92+
"resources/process",
93+
"resources/runcommandonset",
9494
"lib/security_context_lib",
95-
"sshdconfig",
95+
"resources/sshdconfig",
9696
"tools/dsctest",
9797
"tools/test_group_resource",
9898
"tree-sitter-dscexpression",

build.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ if (!$SkipBuild) {
347347
New-Item -ItemType Directory $target -ErrorAction Ignore > $null
348348

349349
# make sure dependencies are built first so clippy runs correctly
350-
$windows_projects = @("lib/pal", "lib/registry_lib", "registry", "reboot_pending", "wmi-adapter", "configurations/windows", 'extensions/appx')
350+
$windows_projects = @("lib/pal", "lib/registry_lib", "resources/registry", "resources/reboot_pending", "wmi-adapter", "configurations/windows", 'extensions/appx')
351351
$macOS_projects = @("resources/brew")
352352
$linux_projects = @("resources/apt")
353353

@@ -360,14 +360,14 @@ if (!$SkipBuild) {
360360
"lib/osinfo_lib",
361361
"lib/dsc_lib",
362362
"dsc",
363-
"dscecho",
363+
"resources/dscecho",
364364
"extensions/bicep",
365-
"osinfo",
365+
"resources/osinfo",
366366
"powershell-adapter",
367367
'resources/PSScript',
368-
"process",
369-
"runcommandonset",
370-
"sshdconfig",
368+
"resources/process",
369+
"resources/runcommandonset",
370+
"resources/sshdconfig",
371371
"tools/dsctest",
372372
"tools/test_group_resource",
373373
"y2j"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)