From 48250176a11d22fb7acafe5746b30a8544d0119e Mon Sep 17 00:00:00 2001
From: evanboyle <evan@pulumi.com>
Date: Wed, 18 Mar 2020 17:11:56 -0700
Subject: [PATCH] Revert "move sdk/python/cmd/pulumi-language-python ->
 pkg/cmd/pulumi-language-python"

This reverts commit e2ee46fb23af980d7dea83c620fcc19d4d0cea87.
---
 build.proj                                             | 4 ++--
 scripts/make_release.ps1                               | 8 ++++----
 scripts/make_release.sh                                | 8 ++++----
 sdk/python/Makefile                                    | 2 +-
 {pkg => sdk/python}/cmd/pulumi-language-python/main.go | 0
 5 files changed, 11 insertions(+), 11 deletions(-)
 rename {pkg => sdk/python}/cmd/pulumi-language-python/main.go (100%)

diff --git a/build.proj b/build.proj
index c567a1089..0262a1e2b 100644
--- a/build.proj
+++ b/build.proj
@@ -219,7 +219,7 @@
     <Exec Command="pipenv run python setup.py build bdist_wheel --universal"
           WorkingDirectory="$(PythonSdkDirectory)\env\src" />
     <ItemGroup>
-      <PythonPackagesToBuild Include="github.com/pulumi/pulumi/pkg/cmd/pulumi-language-python" />
+      <PythonPackagesToBuild Include="github.com/pulumi/pulumi/sdk/python/cmd/pulumi-language-python" />
     </ItemGroup>
     <Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/go/common/version.Version=$(Version)&quot; %(PythonPackagesToBuild.Identity)" />
   </Target>
@@ -236,7 +236,7 @@
     <Copy SourceFiles="@(PythonDistFiles)"
           DestinationFolder="$(PulumiBin)\" />
     <ItemGroup>
-      <PythonPackagesToBuild Include="github.com/pulumi/pulumi/pkg/cmd/pulumi-language-python" />
+      <PythonPackagesToBuild Include="github.com/pulumi/pulumi/sdk/python/cmd/pulumi-language-python" />
     </ItemGroup>
     <Exec Command="&quot;$(MSBuildThisFileDirectory)\scripts\get-version.cmd&quot;" ConsoleToMSBuild="true">
       <Output TaskParameter="ConsoleOutput" PropertyName="Version" />
diff --git a/scripts/make_release.ps1 b/scripts/make_release.ps1
index 73da5356d..e4ec6394d 100644
--- a/scripts/make_release.ps1
+++ b/scripts/make_release.ps1
@@ -28,10 +28,10 @@ function CopyPackage($pathToModule, $moduleName) {
 }
 
 RunGoBuild "github.com/pulumi/pulumi"
-RunGoBuild "github.com/pulumi/pulumi/pkg/cmd/pulumi-language-nodejs"
-RunGoBuild "github.com/pulumi/pulumi/pkg/cmd/pulumi-language-python"
-RunGoBuild "github.com/pulumi/pulumi/pkg/cmd/pulumi-language-dotnet"
-RunGoBuild "github.com/pulumi/pulumi/pkg/cmd/pulumi-language-go"
+RunGoBuild "github.com/pulumi/pulumi/sdk/nodejs/cmd/pulumi-language-nodejs"
+RunGoBuild "github.com/pulumi/pulumi/sdk/python/cmd/pulumi-language-python"
+RunGoBuild "github.com/pulumi/pulumi/sdk/dotnet/cmd/pulumi-language-dotnet"
+RunGoBuild "github.com/pulumi/pulumi/sdk/go/pulumi-language-go"
 CopyPackage "$Root\sdk\nodejs\bin" "pulumi"
 
 Copy-Item "$Root\sdk\nodejs\dist\pulumi-resource-pulumi-nodejs.cmd" "$PublishDir\bin"
diff --git a/scripts/make_release.sh b/scripts/make_release.sh
index 0eea7ce95..b32ab46ba 100755
--- a/scripts/make_release.sh
+++ b/scripts/make_release.sh
@@ -47,10 +47,10 @@ copy_package() {
 
 # Build binaries
 run_go_build "${ROOT}"
-run_go_build "${ROOT}/pkg/cmd/pulumi-language-nodejs"
-run_go_build "${ROOT}/pkg/cmd/pulumi-language-python"
-run_go_build "${ROOT}/pkg/cmd/pulumi-language-dotnet"
-run_go_build "${ROOT}/pkg/cmd/pulumi-language-go"
+run_go_build "${ROOT}/sdk/nodejs/cmd/pulumi-language-nodejs"
+run_go_build "${ROOT}/sdk/python/cmd/pulumi-language-python"
+run_go_build "${ROOT}/sdk/dotnet/cmd/pulumi-language-dotnet"
+run_go_build "${ROOT}/sdk/go/pulumi-language-go"
 
 # Copy over the language and dynamic resource providers.
 cp "${ROOT}/sdk/nodejs/dist/pulumi-resource-pulumi-nodejs" "${PUBDIR}/bin/"
diff --git a/sdk/python/Makefile b/sdk/python/Makefile
index 1da8e7fda..f72e19a24 100644
--- a/sdk/python/Makefile
+++ b/sdk/python/Makefile
@@ -1,5 +1,5 @@
 PROJECT_NAME     := Pulumi Python SDK
-LANGHOST_PKG     := github.com/pulumi/pulumi/pkg/cmd/pulumi-language-python
+LANGHOST_PKG     := github.com/pulumi/pulumi/sdk/python/cmd/pulumi-language-python
 VERSION          := $(shell ../../scripts/get-py-version HEAD)
 
 PYENV := ./env
diff --git a/pkg/cmd/pulumi-language-python/main.go b/sdk/python/cmd/pulumi-language-python/main.go
similarity index 100%
rename from pkg/cmd/pulumi-language-python/main.go
rename to sdk/python/cmd/pulumi-language-python/main.go