From 1f19758614aaad31a95c05bad8d3d5880ad85c07 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Tue, 12 Apr 2016 12:10:54 -0700 Subject: [PATCH 1/5] Remove OMI and provider submodules --- .gitmodules | 7 ------- src/omi | 1 - src/omi-provider | 1 - 3 files changed, 9 deletions(-) delete mode 160000 src/omi delete mode 160000 src/omi-provider diff --git a/.gitmodules b/.gitmodules index 6fc1171a3e..fc9b7ccdf0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,10 +1,3 @@ -[submodule "src/omi"] - path = src/omi - url = https://github.com/Microsoft/omi.git - branch = psrp/features -[submodule "src/omi-provider"] - path = src/omi-provider - url = https://github.com/PowerShell/psl-omi-provider.git [submodule "src/windows-build"] path = src/windows-build url = https://github.com/PowerShell/psl-windows-build.git diff --git a/src/omi b/src/omi deleted file mode 160000 index 6fbc8b0b62..0000000000 --- a/src/omi +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6fbc8b0b6297a67993b280deeb47af97896511c5 diff --git a/src/omi-provider b/src/omi-provider deleted file mode 160000 index 4f49eae9a8..0000000000 --- a/src/omi-provider +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4f49eae9a80e87219b284728960b41efbbc40a8c From a2fc6c330aa0c052655492aee0b378ac463e650a Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Tue, 12 Apr 2016 15:18:27 -0700 Subject: [PATCH 2/5] Remove PSRP building documentation Migrated to PSRP repository --- docs/building/psrp.md | 106 ------------------------------------------ 1 file changed, 106 deletions(-) delete mode 100644 docs/building/psrp.md diff --git a/docs/building/psrp.md b/docs/building/psrp.md deleted file mode 100644 index 1d1018b34d..0000000000 --- a/docs/building/psrp.md +++ /dev/null @@ -1,106 +0,0 @@ -PowerShell Remoting Protocol -============================ - -This guide supplements the [Linux instructions](./linux.md), as -building PowerShell Remoting Protocol (PSRP) support first requires -PowerShell on Linux built. - -PSRP communication is tunneled through the Open Management -Infrastructure (OMI) using the [OMI provider][]. - -> PSRP has been observed working on OS X, but the changes made to OMI to -> accomplish this are not even beta-ready and need to be done correctly. They -> exist on the `andschwa-osx` branch of the OMI repository. - -[OMI provider]: https://github.com/PowerShell/psl-omi-provider/ - -Environment -=========== - -Toolchain Setup ---------------- - -PSRP requires the following additional packages: - -```sh -sudo apt-get install libpam0g-dev libssl-dev libcurl4-openssl-dev libboost-filesystem-dev -``` - -Git Setup ---------- - -Two additional submodules need to be initialized: - -```sh -git submodule update --init -- src/omi src/omi-provider -``` - -The `src/omi` submodule requires your GitHub user to have joined the -Microsoft organization. If it fails to check out, Git will give up and -not check out further submodules either. Please follow the -instructions on the [Open Source Hub][]. - -[Open Source Hub]: https://opensourcehub.microsoft.com/articles/how-to-join-microsoft-github-org-self-service - -Building -======== - -Run `./omibuild.sh` to build OMI and the provider. - -This script first builds OMI in developer mode: - -```sh -pushd src/omi/Unix -./configure --dev -make -j -popd -``` - -Then it builds and registers the provider: - -```sh -pushd src/omi-provider -cmake -DCMAKE_BUILD_TYPE=Debug . -make -j -popd -``` - -The provider maintains its own native host library to initialize the -CLR, but there are plans to refactor .NET's packaged host as a shared -library. - -Running -------- - -Some initial setup on Windows is required. Open an administrative command -prompt and execute the following: - -```cmd -winrm set winrm/config/Client @{AllowUnencrypted="true"} -winrm set winrm/config/Client @{TrustedHosts="*"} -``` - -> You can also set the `TrustedHosts` to include the target's IP address. - -Then on Linux, launch `omiserver` (after building with the -instructions above): - -```sh -./psrp.sh -``` - -Now in a PowerShell prompt on Windows (opened after setting the WinRM client -configurations): - -```powershell -Enter-PSSession -ComputerName -Credential $cred -Authentication basic -``` - -> The `$cred` variable can be empty; a credentials prompt will appear, enter -> any fake credentials you wish as authentication is not yet implemented. - -The IP address of the Linux machine can be obtained with: - -```sh -ip -f inet addr show dev eth0 -``` From b8f326adf5fec1e4e134c73b8f8d8e86b9527229 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Tue, 12 Apr 2016 15:59:38 -0700 Subject: [PATCH 3/5] Redirect PSRP documentation to other repo --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c0e7396183..b57ca8598d 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Get PowerShell | | Linux | Windows .NET Core | Windows .NET Full | OS X | PSRP | |-----------------------|-------|-------------------|-------------------|------|------| -| Build from **Source** | [Instructions](docs/building/linux.md) | [Instructions](docs/building/windows-core.md) | [Instructions](docs/building/windows-full.md) | [Instructions](docs/building/osx.md) | [Instructions](docs/building/psrp.md) | +| Build from **Source** | [Instructions](docs/building/linux.md) | [Instructions](docs/building/windows-core.md) | [Instructions](docs/building/windows-full.md) | [Instructions](docs/building/osx.md) | [Instructions][psrp] | | Get **Binaries** | [Releases][] | [Artifacts][] | [Artifacts][] | [Releases][] | TBD | Building summary: `Start-PSBuild` from the module @@ -38,6 +38,7 @@ instructions. [releases]: https://github.com/PowerShell/PowerShell/releases [artifacts]: https://ci.appveyor.com/project/PowerShell/powershell-linux/build/artifacts +[psrp]: https://github.com/PowerShell/psl-omi-provider Team coordination ----------------- From 285253da02ae687e0ead0902cdb9c7de58e97054 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Tue, 12 Apr 2016 16:00:05 -0700 Subject: [PATCH 4/5] Disable xUnit tests on Travis temporarily Until #806 is resolved. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0ea3ad8e41..5cc937b31e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: - ./download.sh - sudo dpkg -i ./powershell.deb script: - - powershell -c "Import-Module ./PowerShellGitHubDev.psm1; Start-PSBuild; Start-PSxUnit; Start-PSPester" + - powershell -c "Import-Module ./PowerShellGitHubDev.psm1; Start-PSBuild; Start-PSPester" notifications: slack: secure: sKYd4n61+ZFzGZuWGUl8V1kN0NM16wRVOFVlNhlFCwnkrEsKROb++EvXf5uwnKuzxkhEjvPWO+UFgeshQDoR93y4s5YLfhC5JupK4nUzjPzWs208KTrh8u/x9MY8X6Ojxi85EEAiku5GzMoMlkucSStZUYwbIfnelzqdw8uoRwmm2MW4XCPwsuEuDUVghyiva0Mdx1G6MopCrK8T96WywJXT3chhfZQgVt+sQCBt9g+2kjDaObKrzG0P07IVK43ZpDgnu6AoxlyBzIx9mJH2Oa/tki3/kTO72Wcp3ps3qvmiStADamzVKR9p1VlWCLWAd6VOehxuByCGEyujpzk135Wud2DZYO+8LD6inZVhFe3Wt5pCU9BDXZppiATfMCqgXEH7nK54pEn79yHcjthRJ2+Z9ot7As2fu3RSBmTAi8nRP0fxRyX/jctR3S6P0qt0y1ynx9nzBfhmhPQW0PMVazWS/nruQIvK/3iiYXjZxM5bBwIvabmwV00EYeTdbL6ufXWNgQcG1ZWkDsi2I3vst/ytUbHwaFYg83bXWpxg9DCzJeWLVUvE5/3NfBxRAuCTot/fgTEA9IYScvrlL7Q/bT0cOt0vEM98MPf1UO+WP85uxhsRgHtwDEo+jMaL6ZFkPhlV6mmmED4NdY2//a571cLNXdnuMAze5O3TWGBG53g= From 841f76ec37c2afde3b7e575d9d1497bfe2672d00 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Tue, 12 Apr 2016 16:16:17 -0700 Subject: [PATCH 5/5] Update Git setup documentation Now that everyone needs all the submodules. Much simpler. --- README.md | 32 +++++++++++++++++++++++++++++--- docs/building/linux.md | 10 +--------- docs/building/windows-core.md | 10 +--------- 3 files changed, 31 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index b57ca8598d..22c7170827 100644 --- a/README.md +++ b/README.md @@ -68,6 +68,32 @@ rules, and Git best practices. Clone this repository. It is a "superproject" and has a number of other repositories embedded within it as submodules. *Please* see the -contributing guidelines and learn about submodules. Not every -submodule is required on every system; see the individual build -instructions for the necessary subsets. +contributing guidelines and learn about submodules. To make things +easy, we can just clone recursively. + +```sh +git clone --recursive https://github.com/PowerShell/PowerShell.git +``` + +You can verify that the submodules were initialized properly with: + +```sh +git submodule status +``` + +If they're initialized, it will look like this: + +``` + f23641488f8d7bf8630ca3496e61562aa3a64009 src/Modules/Pester (f23641488) + c99458533a9b4c743ed51537e25989ea55944908 src/libpsl-native/test/googletest (release-1.7.0) + e6bf85694ae8352d77175c4c7d304946e018808c src/windows-build (monad/cc6afbeb-3/31) +``` + +If they're not, there will be minuses in front (and the folders will +be empty): + +``` +-f23641488f8d7bf8630ca3496e61562aa3a64009 src/Modules/Pester (f23641488) +-c99458533a9b4c743ed51537e25989ea55944908 src/libpsl-native/test/googletest (release-1.7.0) +-e6bf85694ae8352d77175c4c7d304946e018808c src/windows-build (monad/cc6afbeb-3/31) +``` diff --git a/docs/building/linux.md b/docs/building/linux.md index 88275f544a..5e4076f7ed 100644 --- a/docs/building/linux.md +++ b/docs/building/linux.md @@ -59,17 +59,9 @@ Git Setup --------- Using Git requires it to be setup correctly; refer to the +[README](../../README.md) and [Contributing Guidelines](../../CONTRIBUTING.md). -Please clone the superproject (this repo) and initialize a subset of -the submodules: - -```sh -git clone https://github.com/PowerShell/PowerShell.git -cd PowerShell -git submodule update --init -- src/windows-build src/Modules/Pester src/libpsl-native/test/googletest -``` - Build using our module ====================== diff --git a/docs/building/windows-core.md b/docs/building/windows-core.md index c4821468e9..31def61ac7 100644 --- a/docs/building/windows-core.md +++ b/docs/building/windows-core.md @@ -47,17 +47,9 @@ Git Setup --------- Using Git requires it to be setup correctly; refer to the +[README](../../README.md) and [Contributing Guidelines](../../CONTRIBUTING.md). -Please clone the superproject (this repo) and initialize a subset of -the submodules: - -```sh -git clone https://github.com/PowerShell/PowerShell.git -cd PowerShell -git submodule update --init -- src/windows-build src/Modules/Pester -``` - Build using our module ======================