Skip to content

Fix build when the installer is re-cloned #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ader1990 merged 1 commit into from
Apr 23, 2026
Merged

Fix build when the installer is re-cloned #55

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions BuildAutomation/BuildCloudbaseInitSetup.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ Param(
[string]$CloudbaseInitRepoBranch = "master",
# Use an already available installer or clone a new one.
[switch]$ClonePullInstallerRepo = $true,
[string]$InstallerDir = $null,
[string]$VSRedistDir = "${ENV:ProgramFiles(x86)}\Common Files\Merge Modules",
[string]$SignTimestampUrl = "http://timestamp.digicert.com?alg=sha256",
[string]$VCVars="2019"
Expand All @@ -33,10 +32,8 @@ SetVCVars $VCVars $platformVCVarsRequired
# Needed for SSH
$ENV:HOME = $ENV:USERPROFILE

$python_dir = Join-Path $repoRootPath "CloudbaseInitSetup\Python_CloudbaseInit"
$basepath = Join-path $scriptPath "build\cloudbase-init"

$ENV:PATH = "$python_dir\;$python_dir\scripts;$ENV:PATH"
$ENV:PATH += ";$ENV:ProgramFiles (x86)\Git\bin\"
$ENV:PATH += ";$ENV:ProgramFiles\7-zip\"

Expand All @@ -62,11 +59,7 @@ try
}
else
{
if (!$InstallerDir)
{
# No path provided, so use the current installer script path.
$InstallerDir = (Join-Path -Path $PSScriptRoot -ChildPath ..\ -Resolve)
}
$InstallerDir = (Join-Path -Path $PSScriptRoot -ChildPath ..\ -Resolve)
if (Test-Path $InstallerDir)
{
$cloudbaseInitInstallerDir = $InstallerDir
Expand All @@ -76,6 +69,8 @@ try
throw "Installer path not present: $InstallerDir"
}
}
$python_dir = join-path $cloudbaseInitInstallerDir "CloudbaseInitSetup\Python_CloudbaseInit"
$ENV:PATH = "$python_dir\;$python_dir\scripts;$ENV:PATH"

$python_template_dir = join-path $cloudbaseInitInstallerDir "Python$($pythonversion.replace('.', ''))_${platform}_Template"

Expand Down
Loading