diff --git a/.ci/templates/windows-sdk.yml b/.ci/templates/windows-sdk.yml index 244834d5a..13e88d311 100644 --- a/.ci/templates/windows-sdk.yml +++ b/.ci/templates/windows-sdk.yml @@ -36,6 +36,10 @@ parameters: - name: ICU_VERSION type: string + - name: VERSION + type: string + default: 'master' + jobs: - job: ${{ parameters.host }} # NOTE(compnerd) disable non-x64 builds as they are currently broken :( @@ -247,6 +251,10 @@ jobs: -G Ninja -S $(Build.SourcesDirectory)/swift + - ${{ if eq(parameters.VERSION,'5.3') }}: + - script: | + mklink "$(Build.BinariesDirectory)/swift-stdlib/bin/swiftc" "$(toolchain.directory)/usr/bin/swiftc.exe" + - task: CMake@1 displayName: Build Swift Standard Library inputs: diff --git a/.ci/vs2019-swift-5.3.yml b/.ci/vs2019-swift-5.3.yml index a0b1a770f..3ee932921 100644 --- a/.ci/vs2019-swift-5.3.yml +++ b/.ci/vs2019-swift-5.3.yml @@ -180,6 +180,8 @@ stages: ICU_VERSION: 67 SWIFT_OPTIONS: -DSWIFT_WINDOWS_armv7_ICU_UC_INCLUDE=$(icu.directory)/usr/include/unicode -DSWIFT_WINDOWS_armv7_ICU_UC=$(icu.directory)/usr/lib/icuuc$(icu.version).lib -DSWIFT_WINDOWS_armv7_ICU_I18N_INCLUDE=$(icu.directory)/usr/include -DSWIFT_WINDOWS_armv7_ICU_I18N=$(icu.directory)/usr/lib/icuin$(icu.version).lib -DPYTHON_EXECUTABLE=$(python.pythonLocation)/python.exe + VERSION: 5.3 + - template: templates/windows-sdk.yml parameters: VisualStudio: 2019/Enterprise @@ -197,6 +199,8 @@ stages: ICU_VERSION: 67 SWIFT_OPTIONS: -DSWIFT_WINDOWS_aarch64_ICU_UC_INCLUDE=$(icu.directory)/usr/include/unicode -DSWIFT_WINDOWS_aarch64_ICU_UC=$(icu.directory)/usr/lib/icuuc$(icu.version).lib -DSWIFT_WINDOWS_aarch64_ICU_I18N_INCLUDE=$(icu.directory)/usr/include -DSWIFT_WINDOWS_aarch64_ICU_I18N=$(icu.directory)/usr/lib/icuin$(icu.version).lib -DPYTHON_EXECUTABLE=$(python.pythonLocation)/python.exe + VERSION: 5.3 + - template: templates/windows-sdk.yml parameters: VisualStudio: 2019/Enterprise @@ -214,6 +218,8 @@ stages: ICU_VERSION: 67 SWIFT_OPTIONS: -DSWIFT_WINDOWS_x86_64_ICU_UC_INCLUDE=$(icu.directory)/usr/include/unicode -DSWIFT_WINDOWS_x86_64_ICU_UC=$(icu.directory)/usr/lib/icuuc$(icu.version).lib -DSWIFT_WINDOWS_x86_64_ICU_I18N_INCLUDE=$(icu.directory)/usr/include -DSWIFT_WINDOWS_x86_64_ICU_I18N=$(icu.directory)/usr/lib/icuin$(icu.version).lib -DPYTHON_EXECUTABLE=$(python.pythonLocation)/python.exe + VERSION: 5.3 + - template: templates/windows-sdk.yml parameters: VisualStudio: 2019/Enterprise @@ -231,6 +237,8 @@ stages: ICU_VERSION: 67 SWIFT_OPTIONS: -DSWIFT_WINDOWS_i686_ICU_UC_INCLUDE=$(icu.directory)/usr/include/unicode -DSWIFT_WINDOWS_i686_ICU_UC=$(icu.directory)/usr/lib/icuuc$(icu.version).lib -DSWIFT_WINDOWS_i686_ICU_I18N_INCLUDE=$(icu.directory)/usr/include -DSWIFT_WINDOWS_i686_ICU_I18N=$(icu.directory)/usr/lib/icuin$(icu.version).lib -DPYTHON_EXECUTABLE=$(python.pythonLocation)/python.exe + VERSION: 5.3 + - stage: package_toolchain dependsOn: toolchain displayName: package Toolchain