Skip to content

Fix paths to wixproj files #595

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
compnerd merged 2 commits into from
Jul 30, 2023
Merged

Fix paths to wixproj files #595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
293a8c9
Fix paths to wixproj files
tristanlabelle Jul 28, 2023
3c708fa
Also fix azdo
tristanlabelle Jul 28, 2023
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
14 changes: 7 additions & 7 deletions .azure/vs2022.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1582,7 +1582,7 @@ stages:
name: certificate
- task: MSBuild@1
inputs:
solution: $(Build.SourcesDirectory)/platforms/Windows/bld.wixproj
solution: $(Build.SourcesDirectory)/platforms/Windows/bld/bld.wixproj
msbuildArchitecture: $(arch)
platform: $(platform)
configuration: Release
Expand All @@ -1600,7 +1600,7 @@ stages:
-p:ProductVersion=${{ parameters.ProductVersion }}
- task: MSBuild@1
inputs:
solution: $(Build.SourcesDirectory)/platforms/Windows/cli.wixproj
solution: $(Build.SourcesDirectory)/platforms/Windows/cli/cli.wixproj
msbuildArchitecture: $(arch)
platform: $(platform)
configuration: Release
Expand All @@ -1618,7 +1618,7 @@ stages:
-p:ProductVersion=${{ parameters.ProductVersion }}
- task: MSBuild@1
inputs:
solution: $(Build.SourcesDirectory)/platforms/Windows/dbg.wixproj
solution: $(Build.SourcesDirectory)/platforms/Windows/dbg/dbg.wixproj
msbuildArchitecture: $(arch)
platform: $(platform)
configuration: Release
Expand All @@ -1636,7 +1636,7 @@ stages:
-p:ProductVersion=${{ parameters.ProductVersion }}
- task: MSBuild@1
inputs:
solution: $(Build.SourcesDirectory)/platforms/Windows/ide.wixproj
solution: $(Build.SourcesDirectory)/platforms/Windows/ide/ide.wixproj
msbuildArchitecture: $(arch)
platform: $(platform)
configuration: Release
Expand Down Expand Up @@ -1710,7 +1710,7 @@ stages:
name: certificate
- task: MSBuild@1
inputs:
solution: $(Build.SourcesDirectory)/platforms/Windows/sdk.wixproj
solution: $(Build.SourcesDirectory)/platforms/Windows/sdk/sdk.wixproj
msbuildArchitecture: $(arch)
platform: $(platform)
configuration: Release
Expand All @@ -1729,7 +1729,7 @@ stages:
-p:ProductVersion=${{ parameters.ProductVersion }}
- task: MSBuild@1
inputs:
solution: $(Build.SourcesDirectory)/platforms/Windows/runtime.wixproj
solution: $(Build.SourcesDirectory)/platforms/Windows/runtime/runtime.wixproj
msbuildArchitecture: $(arch)
platform: $(platform)
configuration: Release
Expand Down Expand Up @@ -1811,7 +1811,7 @@ stages:
name: certificate
- task: MSBuild@1
inputs:
solution: $(Build.SourcesDirectory)/platforms/Windows/installer.wixproj
solution: $(Build.SourcesDirectory)/platforms/Windows/bundle/installer.wixproj
msbuildArchitecture: $(arch)
platform: $(platform)
configuration: Release
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/swift-toolchain.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1688,7 +1688,7 @@ jobs:
-p:DEVTOOLS_ROOT=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain `
-p:TOOLCHAIN_ROOT=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain `
-p:ProductVersion=${{ needs.context.outputs.swift_version }} `
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/bld.wixproj
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/bld/bld.wixproj

- name: Package CLI Tools
run: |
Expand All @@ -1703,7 +1703,7 @@ jobs:
-p:DEVTOOLS_ROOT=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain `
-p:TOOLCHAIN_ROOT=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain `
-p:ProductVersion=${{ needs.context.outputs.swift_version }} `
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/cli.wixproj
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/cli/cli.wixproj

- name: Package Debugging Tools
run: |
Expand All @@ -1718,7 +1718,7 @@ jobs:
-p:DEVTOOLS_ROOT=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain `
-p:TOOLCHAIN_ROOT=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain `
-p:ProductVersion=${{ needs.context.outputs.swift_version }} `
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/dbg.wixproj
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/dbg/dbg.wixproj

- name: Package IDE Tools
run: |
Expand All @@ -1733,7 +1733,7 @@ jobs:
-p:DEVTOOLS_ROOT=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain `
-p:TOOLCHAIN_ROOT=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain `
-p:ProductVersion=${{ needs.context.outputs.swift_version }} `
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/ide.wixproj
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/ide/ide.wixproj

- uses: actions/upload-artifact@v3
with:
Expand Down Expand Up @@ -1808,7 +1808,7 @@ jobs:
-p:SDK_ROOT=${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk `
-p:ProductVersion=${{ needs.context.outputs.swift_version }} `
-p:InstallerPlatform=${{ matrix.platform }} `
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/sdk.wixproj
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/sdk/sdk.wixproj

- name: Package Runtime
run: |
Expand All @@ -1823,7 +1823,7 @@ jobs:
-p:PLATFORM_ROOT=${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform `
-p:SDK_ROOT=${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk `
-p:ProductVersion=${{ needs.context.outputs.swift_version }} `
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/runtime.wixproj
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/runtime/runtime.wixproj

- uses: actions/upload-artifact@v3
with:
Expand Down Expand Up @@ -1900,7 +1900,7 @@ jobs:
-p:PASSPHRASE=${{ secrets.PASSPHRASE }} `
-p:MSI_LOCATION=${{ github.workspace }}/BuildRoot `
-p:ProductVersion=${{ needs.context.outputs.swift_version }}-${{ needs.context.outputs.swift_tag }} `
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/installer.wixproj
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/bundle/installer.wixproj

- uses: actions/upload-artifact@v3
with:
Expand Down
26 changes: 11 additions & 15 deletions build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1381,48 +1381,44 @@ function Build-DocC() {
}

function Build-Installer() {
Build-WiXProject bld.wixproj -Arch $HostArch -Properties @{
Build-WiXProject bld\bld.wixproj -Arch $HostArch -Properties @{
DEVTOOLS_ROOT = "$($HostArch.ToolchainInstallRoot)\";
TOOLCHAIN_ROOT = "$($HostArch.ToolchainInstallRoot)\";
}

Build-WiXProject cli.wixproj -Arch $HostArch -Properties @{
Build-WiXProject cli\cli.wixproj -Arch $HostArch -Properties @{
DEVTOOLS_ROOT = "$($HostArch.ToolchainInstallRoot)\";
TOOLCHAIN_ROOT = "$($HostArch.ToolchainInstallRoot)\";
INCLUDE_SWIFT_FORMAT = "true";
SWIFT_FORMAT_BUILD = "$($HostArch.BinaryRoot)\swift-format\release";
}

Build-WiXProject dbg.wixproj -Arch $HostArch -Properties @{
Build-WiXProject dbg\dbg.wixproj -Arch $HostArch -Properties @{
DEVTOOLS_ROOT = "$($HostArch.ToolchainInstallRoot)\";
TOOLCHAIN_ROOT = "$($HostArch.ToolchainInstallRoot)\";
INCLUDE_SWIFT_INSPECT = "true";
SWIFT_INSPECT_BUILD = "$($HostArch.BinaryRoot)\swift-inspect\release";
}

Build-WiXProject ide.wixproj -Arch $HostArch -Properties @{
Build-WiXProject ide\ide.wixproj -Arch $HostArch -Properties @{
DEVTOOLS_ROOT = "$($HostArch.ToolchainInstallRoot)\";
TOOLCHAIN_ROOT = "$($HostArch.ToolchainInstallRoot)\";
}

foreach ($Arch in $SDKArchs) {
Build-WiXProject runtime.wixproj -Arch $Arch -Properties @{
Build-WiXProject runtime\runtime.wixproj -Arch $Arch -Properties @{
SDK_ROOT = "$($Arch.SDKInstallRoot)\";
}

Build-WiXProject sdk.wixproj -Arch $Arch -Properties @{
Build-WiXProject sdk\sdk.wixproj -Arch $Arch -Properties @{
InstallerPlatform = $HostArch.ShortName;
PLATFORM_ROOT = "$($Arch.PlatformInstallRoot)\";
SDK_ROOT = "$($Arch.SDKInstallRoot)\";
SWIFT_SOURCE_DIR = "$SourceCache\swift\";
}
}

Build-WiXProject swift-format.wixproj -Arch $HostArch -Properties @{
SWIFT_FORMAT_BUILD = "$($HostArch.BinaryRoot)\swift-format\release"
}

Build-WiXProject swift-inspect.wixproj -Arch $HostArch -Properties @{
SWIFT_INSPECT_BUILD = "$($HostArch.BinaryRoot)\swift-inspect\release"
}

Build-WiXProject installer.wixproj -Arch $HostArch -Bundle -Properties @{
Build-WiXProject bundle\installer.wixproj -Arch $HostArch -Bundle -Properties @{
OutputPath = "$($HostArch.BinaryRoot)\";
MSI_LOCATION = "$($HostArch.BinaryRoot)\msi\";
}
Expand Down