Skip to content

Commit afa5eda

Browse files
(GH-1153) Move library crates into lib folder
This change moves the library crates, which don't have an executable, into the `lib` folder. This makes discovering shared libraries easier, instead of relying on the `_lib` convention the crates use. This change doesn't rename the libraries, 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.
1 parent af02445 commit afa5eda

Some content is hidden

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

108 files changed

+22
-22
lines changed

Cargo.toml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ resolver = "2"
44
# the path to a crate.
55
members = [
66
"dsc",
7-
"dsc_lib",
7+
"lib/dsc_lib",
88
"dscecho",
99
"lib/osinfo_lib",
1010
"osinfo",
11-
"pal",
11+
"lib/pal",
1212
"process",
1313
"registry",
14-
"registry_lib",
14+
"lib/registry_lib",
1515
"runcommandonset",
16-
"security_context_lib",
16+
"lib/security_context_lib",
1717
"sshdconfig",
1818
"tools/dsctest",
1919
"tools/test_group_resource",
@@ -26,16 +26,16 @@ members = [
2626
# avoid unintentionally modifying this value.
2727
default-members = [
2828
"dsc",
29-
"dsc_lib",
29+
"lib/dsc_lib",
3030
"dscecho",
3131
"lib/osinfo_lib",
3232
"osinfo",
33-
"pal",
33+
"lib/pal",
3434
"process",
3535
"registry",
36-
"registry_lib",
36+
"lib/registry_lib",
3737
"runcommandonset",
38-
"security_context_lib",
38+
"lib/security_context_lib",
3939
"sshdconfig",
4040
"tools/dsctest",
4141
"tools/test_group_resource",
@@ -50,16 +50,16 @@ default-members = [
5050
# current operating system to enable faster builds.
5151
Windows = [
5252
"dsc",
53-
"dsc_lib",
53+
"lib/dsc_lib",
5454
"dscecho",
5555
"lib/osinfo_lib",
5656
"osinfo",
57-
"pal",
57+
"lib/pal",
5858
"process",
5959
"registry",
60-
"registry_lib",
60+
"lib/registry_lib",
6161
"runcommandonset",
62-
"security_context_lib",
62+
"lib/security_context_lib",
6363
"sshdconfig",
6464
"tools/dsctest",
6565
"tools/test_group_resource",
@@ -69,13 +69,13 @@ Windows = [
6969
]
7070
macOS = [
7171
"dsc",
72-
"dsc_lib",
72+
"lib/dsc_lib",
7373
"dscecho",
7474
"lib/osinfo_lib",
7575
"osinfo",
7676
"process",
7777
"runcommandonset",
78-
"security_context_lib",
78+
"lib/security_context_lib",
7979
"sshdconfig",
8080
"tools/dsctest",
8181
"tools/test_group_resource",
@@ -85,13 +85,13 @@ macOS = [
8585
]
8686
Linux = [
8787
"dsc",
88-
"dsc_lib",
88+
"lib/dsc_lib",
8989
"dscecho",
9090
"lib/osinfo_lib",
9191
"osinfo",
9292
"process",
9393
"runcommandonset",
94-
"security_context_lib",
94+
"lib/security_context_lib",
9595
"sshdconfig",
9696
"tools/dsctest",
9797
"tools/test_group_resource",
@@ -203,9 +203,9 @@ cc = { version = "1.2" }
203203
static_vcruntime = { version = "2.0" }
204204

205205
# Workspace crates as dependencies
206-
dsc_lib = { path = "dsc_lib" }
206+
dsc_lib = { path = "lib/dsc_lib" }
207207
osinfo_lib = { path = "lib/osinfo_lib" }
208-
security_context_lib = { path = "security_context_lib" }
208+
security_context_lib = { path = "lib/security_context_lib" }
209209
tree-sitter-dscexpression = { path = "tree-sitter-dscexpression" }
210-
registry_lib = { path = "registry_lib" }
210+
registry_lib = { path = "lib/registry_lib" }
211211
tree-sitter-ssh-server-config = { path = "tree-sitter-ssh-server-config" }

build.ps1

Lines changed: 3 additions & 3 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 = @("pal", "registry_lib", "registry", "reboot_pending", "wmi-adapter", "configurations/windows", 'extensions/appx')
350+
$windows_projects = @("lib/pal", "lib/registry_lib", "registry", "reboot_pending", "wmi-adapter", "configurations/windows", 'extensions/appx')
351351
$macOS_projects = @("resources/brew")
352352
$linux_projects = @("resources/apt")
353353

@@ -356,9 +356,9 @@ if (!$SkipBuild) {
356356
".",
357357
"tree-sitter-dscexpression",
358358
"tree-sitter-ssh-server-config",
359-
"security_context_lib",
359+
"lib/security_context_lib",
360360
"lib/osinfo_lib",
361-
"dsc_lib",
361+
"lib/dsc_lib",
362362
"dsc",
363363
"dscecho",
364364
"extensions/bicep",
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.
File renamed without changes.

0 commit comments

Comments
 (0)