Skip to content

Commit bfe71e1

Browse files
tristanlabelletristanlabelle
authored
Fix paths to wixproj files
Fix paths to wixproj files
1 parent 4a8bbc3 commit bfe71e1

File tree

3 files changed

+25
-29
lines changed

3 files changed

+25
-29
lines changed

‎.azure/vs2022.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1582,7 +1582,7 @@ stages:
15821582
name: certificate
15831583
- task: MSBuild@1
15841584
inputs:
1585-
solution: $(Build.SourcesDirectory)/platforms/Windows/bld.wixproj
1585+
solution: $(Build.SourcesDirectory)/platforms/Windows/bld/bld.wixproj
15861586
msbuildArchitecture: $(arch)
15871587
platform: $(platform)
15881588
configuration: Release
@@ -1600,7 +1600,7 @@ stages:
16001600
-p:ProductVersion=${{ parameters.ProductVersion }}
16011601
- task: MSBuild@1
16021602
inputs:
1603-
solution: $(Build.SourcesDirectory)/platforms/Windows/cli.wixproj
1603+
solution: $(Build.SourcesDirectory)/platforms/Windows/cli/cli.wixproj
16041604
msbuildArchitecture: $(arch)
16051605
platform: $(platform)
16061606
configuration: Release
@@ -1618,7 +1618,7 @@ stages:
16181618
-p:ProductVersion=${{ parameters.ProductVersion }}
16191619
- task: MSBuild@1
16201620
inputs:
1621-
solution: $(Build.SourcesDirectory)/platforms/Windows/dbg.wixproj
1621+
solution: $(Build.SourcesDirectory)/platforms/Windows/dbg/dbg.wixproj
16221622
msbuildArchitecture: $(arch)
16231623
platform: $(platform)
16241624
configuration: Release
@@ -1636,7 +1636,7 @@ stages:
16361636
-p:ProductVersion=${{ parameters.ProductVersion }}
16371637
- task: MSBuild@1
16381638
inputs:
1639-
solution: $(Build.SourcesDirectory)/platforms/Windows/ide.wixproj
1639+
solution: $(Build.SourcesDirectory)/platforms/Windows/ide/ide.wixproj
16401640
msbuildArchitecture: $(arch)
16411641
platform: $(platform)
16421642
configuration: Release
@@ -1710,7 +1710,7 @@ stages:
17101710
name: certificate
17111711
- task: MSBuild@1
17121712
inputs:
1713-
solution: $(Build.SourcesDirectory)/platforms/Windows/sdk.wixproj
1713+
solution: $(Build.SourcesDirectory)/platforms/Windows/sdk/sdk.wixproj
17141714
msbuildArchitecture: $(arch)
17151715
platform: $(platform)
17161716
configuration: Release
@@ -1729,7 +1729,7 @@ stages:
17291729
-p:ProductVersion=${{ parameters.ProductVersion }}
17301730
- task: MSBuild@1
17311731
inputs:
1732-
solution: $(Build.SourcesDirectory)/platforms/Windows/runtime.wixproj
1732+
solution: $(Build.SourcesDirectory)/platforms/Windows/runtime/runtime.wixproj
17331733
msbuildArchitecture: $(arch)
17341734
platform: $(platform)
17351735
configuration: Release
@@ -1811,7 +1811,7 @@ stages:
18111811
name: certificate
18121812
- task: MSBuild@1
18131813
inputs:
1814-
solution: $(Build.SourcesDirectory)/platforms/Windows/installer.wixproj
1814+
solution: $(Build.SourcesDirectory)/platforms/Windows/bundle/installer.wixproj
18151815
msbuildArchitecture: $(arch)
18161816
platform: $(platform)
18171817
configuration: Release

‎.github/workflows/swift-toolchain.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1688,7 +1688,7 @@ jobs:
16881688
-p:DEVTOOLS_ROOT=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain `
16891689
-p:TOOLCHAIN_ROOT=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain `
16901690
-p:ProductVersion=${{ needs.context.outputs.swift_version }} `
1691-
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/bld.wixproj
1691+
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/bld/bld.wixproj
16921692
16931693
- name: Package CLI Tools
16941694
run: |
@@ -1703,7 +1703,7 @@ jobs:
17031703
-p:DEVTOOLS_ROOT=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain `
17041704
-p:TOOLCHAIN_ROOT=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain `
17051705
-p:ProductVersion=${{ needs.context.outputs.swift_version }} `
1706-
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/cli.wixproj
1706+
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/cli/cli.wixproj
17071707
17081708
- name: Package Debugging Tools
17091709
run: |
@@ -1718,7 +1718,7 @@ jobs:
17181718
-p:DEVTOOLS_ROOT=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain `
17191719
-p:TOOLCHAIN_ROOT=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain `
17201720
-p:ProductVersion=${{ needs.context.outputs.swift_version }} `
1721-
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/dbg.wixproj
1721+
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/dbg/dbg.wixproj
17221722
17231723
- name: Package IDE Tools
17241724
run: |
@@ -1733,7 +1733,7 @@ jobs:
17331733
-p:DEVTOOLS_ROOT=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain `
17341734
-p:TOOLCHAIN_ROOT=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain `
17351735
-p:ProductVersion=${{ needs.context.outputs.swift_version }} `
1736-
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/ide.wixproj
1736+
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/ide/ide.wixproj
17371737
17381738
- uses: actions/upload-artifact@v3
17391739
with:
@@ -1808,7 +1808,7 @@ jobs:
18081808
-p:SDK_ROOT=${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk `
18091809
-p:ProductVersion=${{ needs.context.outputs.swift_version }} `
18101810
-p:InstallerPlatform=${{ matrix.platform }} `
1811-
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/sdk.wixproj
1811+
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/sdk/sdk.wixproj
18121812
18131813
- name: Package Runtime
18141814
run: |
@@ -1823,7 +1823,7 @@ jobs:
18231823
-p:PLATFORM_ROOT=${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform `
18241824
-p:SDK_ROOT=${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk `
18251825
-p:ProductVersion=${{ needs.context.outputs.swift_version }} `
1826-
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/runtime.wixproj
1826+
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/runtime/runtime.wixproj
18271827
18281828
- uses: actions/upload-artifact@v3
18291829
with:
@@ -1900,7 +1900,7 @@ jobs:
19001900
-p:PASSPHRASE=${{ secrets.PASSPHRASE }} `
19011901
-p:MSI_LOCATION=${{ github.workspace }}/BuildRoot `
19021902
-p:ProductVersion=${{ needs.context.outputs.swift_version }}-${{ needs.context.outputs.swift_tag }} `
1903-
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/installer.wixproj
1903+
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/bundle/installer.wixproj
19041904
19051905
- uses: actions/upload-artifact@v3
19061906
with:

‎build.ps1

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1381,48 +1381,44 @@ function Build-DocC() {
13811381
}
13821382

13831383
function Build-Installer() {
1384-
Build-WiXProject bld.wixproj -Arch $HostArch -Properties @{
1384+
Build-WiXProject bld\bld.wixproj -Arch $HostArch -Properties @{
13851385
DEVTOOLS_ROOT = "$($HostArch.ToolchainInstallRoot)\";
13861386
TOOLCHAIN_ROOT = "$($HostArch.ToolchainInstallRoot)\";
13871387
}
13881388

1389-
Build-WiXProject cli.wixproj -Arch $HostArch -Properties @{
1389+
Build-WiXProject cli\cli.wixproj -Arch $HostArch -Properties @{
13901390
DEVTOOLS_ROOT = "$($HostArch.ToolchainInstallRoot)\";
13911391
TOOLCHAIN_ROOT = "$($HostArch.ToolchainInstallRoot)\";
1392+
INCLUDE_SWIFT_FORMAT = "true";
1393+
SWIFT_FORMAT_BUILD = "$($HostArch.BinaryRoot)\swift-format\release";
13921394
}
13931395

1394-
Build-WiXProject dbg.wixproj -Arch $HostArch -Properties @{
1396+
Build-WiXProject dbg\dbg.wixproj -Arch $HostArch -Properties @{
13951397
DEVTOOLS_ROOT = "$($HostArch.ToolchainInstallRoot)\";
13961398
TOOLCHAIN_ROOT = "$($HostArch.ToolchainInstallRoot)\";
1399+
INCLUDE_SWIFT_INSPECT = "true";
1400+
SWIFT_INSPECT_BUILD = "$($HostArch.BinaryRoot)\swift-inspect\release";
13971401
}
13981402

1399-
Build-WiXProject ide.wixproj -Arch $HostArch -Properties @{
1403+
Build-WiXProject ide\ide.wixproj -Arch $HostArch -Properties @{
14001404
DEVTOOLS_ROOT = "$($HostArch.ToolchainInstallRoot)\";
14011405
TOOLCHAIN_ROOT = "$($HostArch.ToolchainInstallRoot)\";
14021406
}
14031407

14041408
foreach ($Arch in $SDKArchs) {
1405-
Build-WiXProject runtime.wixproj -Arch $Arch -Properties @{
1409+
Build-WiXProject runtime\runtime.wixproj -Arch $Arch -Properties @{
14061410
SDK_ROOT = "$($Arch.SDKInstallRoot)\";
14071411
}
14081412

1409-
Build-WiXProject sdk.wixproj -Arch $Arch -Properties @{
1413+
Build-WiXProject sdk\sdk.wixproj -Arch $Arch -Properties @{
14101414
InstallerPlatform = $HostArch.ShortName;
14111415
PLATFORM_ROOT = "$($Arch.PlatformInstallRoot)\";
14121416
SDK_ROOT = "$($Arch.SDKInstallRoot)\";
14131417
SWIFT_SOURCE_DIR = "$SourceCache\swift\";
14141418
}
14151419
}
14161420

1417-
Build-WiXProject swift-format.wixproj -Arch $HostArch -Properties @{
1418-
SWIFT_FORMAT_BUILD = "$($HostArch.BinaryRoot)\swift-format\release"
1419-
}
1420-
1421-
Build-WiXProject swift-inspect.wixproj -Arch $HostArch -Properties @{
1422-
SWIFT_INSPECT_BUILD = "$($HostArch.BinaryRoot)\swift-inspect\release"
1423-
}
1424-
1425-
Build-WiXProject installer.wixproj -Arch $HostArch -Bundle -Properties @{
1421+
Build-WiXProject bundle\installer.wixproj -Arch $HostArch -Bundle -Properties @{
14261422
OutputPath = "$($HostArch.BinaryRoot)\";
14271423
MSI_LOCATION = "$($HostArch.BinaryRoot)\msi\";
14281424
}

0 commit comments

Comments
 (0)