maxmustermann/pulumi
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "move sdk/python/cmd/pulumi-language-python -> pkg/cmd/pulumi-language-python"

Browse source 
This reverts commit e2ee46fb23.
This commit is contained in:
evanboyle 2020-03-18 17:11:56 -07:00
parent d65c65122f
commit 48250176a1
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.proj
View file

@ -219,7 +219,7 @@
<Exec Command="pipenv run python setup.py build bdist_wheel --universal" <Exec Command="pipenv run python setup.py build bdist_wheel --universal"
WorkingDirectory="$(PythonSdkDirectory)\env\src" /> WorkingDirectory="$(PythonSdkDirectory)\env\src" />
<ItemGroup> <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> </ItemGroup>
<Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/go/common/version.Version=$(Version)&quot; %(PythonPackagesToBuild.Identity)" /> <Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/go/common/version.Version=$(Version)&quot; %(PythonPackagesToBuild.Identity)" />
</Target> </Target>
@ -236,7 +236,7 @@
<Copy SourceFiles="@(PythonDistFiles)" <Copy SourceFiles="@(PythonDistFiles)"
DestinationFolder="$(PulumiBin)\" /> DestinationFolder="$(PulumiBin)\" />
<ItemGroup> <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> </ItemGroup>
<Exec Command="&quot;$(MSBuildThisFileDirectory)\scripts\get-version.cmd&quot;" ConsoleToMSBuild="true"> <Exec Command="&quot;$(MSBuildThisFileDirectory)\scripts\get-version.cmd&quot;" ConsoleToMSBuild="true">
<Output TaskParameter="ConsoleOutput" PropertyName="Version" /> <Output TaskParameter="ConsoleOutput" PropertyName="Version" />

8
scripts/make_release.ps1
View file

@ -28,10 +28,10 @@ function CopyPackage($pathToModule, $moduleName) {
} }
RunGoBuild "github.com/pulumi/pulumi" RunGoBuild "github.com/pulumi/pulumi"
RunGoBuild "github.com/pulumi/pulumi/pkg/cmd/pulumi-language-nodejs" RunGoBuild "github.com/pulumi/pulumi/sdk/nodejs/cmd/pulumi-language-nodejs"
RunGoBuild "github.com/pulumi/pulumi/pkg/cmd/pulumi-language-python" RunGoBuild "github.com/pulumi/pulumi/sdk/python/cmd/pulumi-language-python"
RunGoBuild "github.com/pulumi/pulumi/pkg/cmd/pulumi-language-dotnet" RunGoBuild "github.com/pulumi/pulumi/sdk/dotnet/cmd/pulumi-language-dotnet"
RunGoBuild "github.com/pulumi/pulumi/pkg/cmd/pulumi-language-go" RunGoBuild "github.com/pulumi/pulumi/sdk/go/pulumi-language-go"
CopyPackage "$Root\sdk\nodejs\bin" "pulumi" CopyPackage "$Root\sdk\nodejs\bin" "pulumi"
Copy-Item "$Root\sdk\nodejs\dist\pulumi-resource-pulumi-nodejs.cmd" "$PublishDir\bin" Copy-Item "$Root\sdk\nodejs\dist\pulumi-resource-pulumi-nodejs.cmd" "$PublishDir\bin"

8
scripts/make_release.sh
View file

@ -47,10 +47,10 @@ copy_package() {
# Build binaries # Build binaries
run_go_build "${ROOT}" run_go_build "${ROOT}"
run_go_build "${ROOT}/pkg/cmd/pulumi-language-nodejs" run_go_build "${ROOT}/sdk/nodejs/cmd/pulumi-language-nodejs"
run_go_build "${ROOT}/pkg/cmd/pulumi-language-python" run_go_build "${ROOT}/sdk/python/cmd/pulumi-language-python"
run_go_build "${ROOT}/pkg/cmd/pulumi-language-dotnet" run_go_build "${ROOT}/sdk/dotnet/cmd/pulumi-language-dotnet"
run_go_build "${ROOT}/pkg/cmd/pulumi-language-go" run_go_build "${ROOT}/sdk/go/pulumi-language-go"
# Copy over the language and dynamic resource providers. # Copy over the language and dynamic resource providers.
cp "${ROOT}/sdk/nodejs/dist/pulumi-resource-pulumi-nodejs" "${PUBDIR}/bin/" cp "${ROOT}/sdk/nodejs/dist/pulumi-resource-pulumi-nodejs" "${PUBDIR}/bin/"

2
sdk/python/Makefile
View file

@ -1,5 +1,5 @@
PROJECT_NAME := Pulumi Python SDK 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) VERSION := $(shell ../../scripts/get-py-version HEAD)
PYENV := ./env PYENV := ./env

0
pkg/cmd/pulumi-language-python/main.go → sdk/python/cmd/pulumi-language-python/main.go
View file