diff --git a/.gitmodules b/.gitmodules index 992364ebb..81c55df8f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,9 +2,9 @@ path = src/monad url = https://msostc.visualstudio.com/DefaultCollection/PS/_git/monad branch = develop -[submodule "src/monad-native"] - path = src/monad-native - url = https://msostc.visualstudio.com/DefaultCollection/PS/_git/monad-native +[submodule "src/libpsl-native"] + path = src/libpsl-native + url = https://github.com/PowerShell/psl-native.git [submodule "ext-src/pester"] path = ext-src/pester url = https://msostc.visualstudio.com/DefaultCollection/PS/_git/Pester diff --git a/build.sh b/build.sh index 819f0f1d1..a6b7fbc2e 100755 --- a/build.sh +++ b/build.sh @@ -16,12 +16,11 @@ mkdir -p $BIN/Modules # Build native components ( - cd src/monad-native + cd src/libpsl-native cmake -DCMAKE_BUILD_TYPE=Debug . make -j ctest -V - # Deploy development copy of libpsnative - cp native/libpsnative.so $BIN + cp src/libpsl-native.so $BIN ) # Build registry stub (this should go away, again) diff --git a/src/libpsl-native b/src/libpsl-native new file mode 160000 index 000000000..6e8565967 --- /dev/null +++ b/src/libpsl-native @@ -0,0 +1 @@ +Subproject commit 6e8565967274f1b2ff6d29246e3aa5356639dd92 diff --git a/src/monad-native b/src/monad-native deleted file mode 160000 index 5bcd71489..000000000 --- a/src/monad-native +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5bcd7148939db50e586291f874f0002a2dd1886f