diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6a56f296..50b06ef4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,10 +21,6 @@ stages: # Test Versions - At least 1 of each supported LabVIEW version and 1 of each bitness lvVersionsToBuild: - - version: '2023' - bitness: '32bit' - - version: '2023' - bitness: '64bit' - version: '2024' bitness: '32bit' - version: '2024' @@ -33,6 +29,10 @@ stages: bitness: '32bit' - version: '2025' bitness: '64bit' + - version: '2026' + bitness: '32bit' + - version: '2026' + bitness: '64bit' # Test Dependencies - multiple dependencies that are expected in the build steps below this dependencies: @@ -63,10 +63,10 @@ stages: target: 'My Computer' buildSpec: 'BuildSpecUnique64bitOnly' exclusions: - - version: '2023' - bitness: '32bit' - version: '2024' bitness: '32bit' + - version: '2025' + bitness: '32bit' - projectLocation: '$(CD.Workspace)\niveristand-custom-device-build-tools\test-build\Source\Individual Build Specs.lvproj' buildOperation: 'ExecuteBuildSpec' @@ -79,10 +79,10 @@ stages: target: 'Linux x64' buildSpec: 'BuildSpecUnique32bitOnly' exclusions: - - version: '2023' - bitness: '64bit' - version: '2024' bitness: '64bit' + - version: '2025' + bitness: '64bit' # Test BuildAllTargets special build operation in LabVIEW, override bitness with other operations before and after - projectLocation: 'test-build\Source\All Target Build Specs.lvproj' @@ -96,7 +96,7 @@ stages: target: 'This value does not matter' buildSpec: 'This value does not matter' - releaseVersion: '25.0.0' + releaseVersion: '26.0.0' buildOutputLocation: 'test-build\Built' archiveLocation: '\\nirvana\Measurements\VeriStandAddons\prototype\niveristand-custom-device-build-tools\complexCase' @@ -127,6 +127,6 @@ stages: target: 'My Computer' buildSpec: 'EmptySpec' - releaseVersion: '25.0.0' + releaseVersion: '26.0.0' buildOutputLocation: 'test-build\Built' archiveLocation: '\\nirvana\Measurements\VeriStandAddons\prototype\niveristand-custom-device-build-tools\emptyCase' diff --git a/azure-templates/powershell-scripts/define-build-variables.ps1 b/azure-templates/powershell-scripts/define-build-variables.ps1 index ed5218f4..b6760e27 100644 --- a/azure-templates/powershell-scripts/define-build-variables.ps1 +++ b/azure-templates/powershell-scripts/define-build-variables.ps1 @@ -53,30 +53,30 @@ Write-Host "##vso[task.setvariable variable=CD.LabVIEW.Version]$lvVersion" Write-Host "##vso[task.setvariable variable=lvVersion]$lvVersion" # Keep legacy version for variables used in packaging # When adding a new version of LabVIEW as an option in custom device pipelines, # a new If statement is needed below with relevant variables -if ("$lvVersion" -eq "2023") +if ("$lvVersion" -eq "2024") { - Write-Output "Setting variables for LabVIEW 2023..." + Write-Output "Setting variables for LabVIEW 2024..." Write-Host "##vso[task.setvariable variable=CD.LabVIEW.Config]10.0.0.0" - Write-Host "##vso[task.setvariable variable=CD.LabVIEW.ShortVersion]23" + Write-Host "##vso[task.setvariable variable=CD.LabVIEW.ShortVersion]24" Write-Host "##vso[task.setvariable variable=CD.LabVIEW.SupportPackageSuffix]labview-support" } -Elseif ("$lvVersion" -eq "2024") +Elseif ("$lvVersion" -eq "2025") { - Write-Output "Setting variables for LabVIEW 2024..." + Write-Output "Setting variables for LabVIEW 2025..." Write-Host "##vso[task.setvariable variable=CD.LabVIEW.Config]11.0.0.0" - Write-Host "##vso[task.setvariable variable=CD.LabVIEW.ShortVersion]24" + Write-Host "##vso[task.setvariable variable=CD.LabVIEW.ShortVersion]25" Write-Host "##vso[task.setvariable variable=CD.LabVIEW.SupportPackageSuffix]labview-support" } -Elseif ("$lvVersion" -eq "2025") +Elseif ("$lvVersion" -eq "2026") { - Write-Output "Setting variables for LabVIEW 2025..." + Write-Output "Setting variables for LabVIEW 2026..." Write-Host "##vso[task.setvariable variable=CD.LabVIEW.Config]12.0.0.0" - Write-Host "##vso[task.setvariable variable=CD.LabVIEW.ShortVersion]25" + Write-Host "##vso[task.setvariable variable=CD.LabVIEW.ShortVersion]26" Write-Host "##vso[task.setvariable variable=CD.LabVIEW.SupportPackageSuffix]labview-support" } Else { - Write-Error "Invalid LabVIEW version defined in pipeline. Use either 2023, 2024 or 2025" + Write-Error "Invalid LabVIEW version defined in pipeline. Use either 2024, 2025 or 2026" } # Set LabVIEW Bitness information diff --git a/azure-templates/stages.yml b/azure-templates/stages.yml index b0b0cd72..eb155e8a 100644 --- a/azure-templates/stages.yml +++ b/azure-templates/stages.yml @@ -22,18 +22,18 @@ parameters: # lvVersiontoDiff (optional): 64-bit LabVIEW version for VI diff - name: lvVersionToDiff type: string - default: '2023' + default: '2024' # lvVersionsToBuild (optional): list of {version, bitness} - name: lvVersionsToBuild type: object default: - - version: '2023' - bitness: '64bit' - version: '2024' bitness: '64bit' - version: '2025' bitness: '64bit' + - version: '2026' + bitness: '64bit' # codegenVis (optional): string array of codegen VI paths - name: codegenVis diff --git a/test-build/dependency-builder/dependency-builder.bat b/test-build/dependency-builder/dependency-builder.bat index 955f4b45..ae846c43 100644 --- a/test-build/dependency-builder/dependency-builder.bat +++ b/test-build/dependency-builder/dependency-builder.bat @@ -5,75 +5,6 @@ rmdir /s /q "dependency-test-2" rmdir /s /q "dependency-test-3" rmdir /s /q "output" -echo "Building in LabVIEW 2023 32-bit..." -LabVIEWCLI ^ - -PortNumber 3363 ^ - -LabVIEWPath "C:\Program Files (x86)\National Instruments\LabVIEW 2023\LabVIEW.exe" ^ - -AdditionalOperationDirectory "%cd%\..\..\lv\operations" ^ - -OperationName "ExecuteAllBuildSpecs" ^ - -ProjectPath "%cd%\DependencyBuilder.lvproj" -taskkill /im labview.exe /f - -echo "Creating directories for library 1..." -mkdir "%cd%\dependency-test-1\ni\export\main\12345678.1\2023\x86\Windows" -mkdir "%cd%\dependency-test-1\ni\export\main\12345678.1\2023\x86\Linux_x64" -mkdir "%cd%\dependency-test-1\ni\export\main\12345678.2\2023\x86\Windows" -mkdir "%cd%\dependency-test-1\ni\export\main\12345678.2\2023\x86\Linux_x64" -mkdir "%cd%\dependency-test-1\ni\export\main\12345678.3\2023\x86\Windows" -mkdir "%cd%\dependency-test-1\ni\export\main\12345678.3\2023\x86\Linux_x64" -copy "output\Windows\DependencyLibrary1.lvlibp" "%cd%\dependency-test-1\ni\export\main\12345678.2\2023\x86\Windows" -copy "output\Linux_x64\DependencyLibrary1.lvlibp" "%cd%\dependency-test-1\ni\export\main\12345678.2\2023\x86\Linux_x64" - -echo "Creating directories for library 2..." -mkdir "%cd%\dependency-test-2\ni\export\main\12345678.1\2023\x86\Windows" -mkdir "%cd%\dependency-test-2\ni\export\main\12345678.1\2023\x86\Linux_x64" -mkdir "%cd%\dependency-test-2\ni\export\main\12345678.2\2023\x86\Windows" -mkdir "%cd%\dependency-test-2\ni\export\main\12345678.2\2023\x86\Linux_x64" -mkdir "%cd%\dependency-test-2\ni\export\main\12345678.3\2023\x86\Windows" -mkdir "%cd%\dependency-test-2\ni\export\main\12345678.3\2023\x86\Linux_x64" -copy "output\Windows\DependencyLibrary2.lvlibp" "%cd%\dependency-test-2\ni\export\main\12345678.2\2023\x86\Windows" -copy "output\Linux_x64\DependencyLibrary2.lvlibp" "%cd%\dependency-test-2\ni\export\main\12345678.2\2023\x86\Linux_x64" - -echo "Creating directories for library 3..." -mkdir "%cd%\dependency-test-3\ni\export\main\12345678.1\2023\x86\Windows" -mkdir "%cd%\dependency-test-3\ni\export\main\12345678.1\2023\x86\Linux_x64" -mkdir "%cd%\dependency-test-3\ni\export\main\12345678.2\2023\x86\Windows" -mkdir "%cd%\dependency-test-3\ni\export\main\12345678.2\2023\x86\Linux_x64" -mkdir "%cd%\dependency-test-3\ni\export\main\12345678.3\2023\x86\Windows" -mkdir "%cd%\dependency-test-3\ni\export\main\12345678.3\2023\x86\Linux_x64" -copy "output\Windows\DependencyLibrary3.lvlibp" "%cd%\dependency-test-3\ni\export\main\12345678.2\2023\x86\Windows" -copy "output\Linux_x64\DependencyLibrary3.lvlibp" "%cd%\dependency-test-3\ni\export\main\12345678.2\2023\x86\Linux_x64" - -echo "Building in LabVIEW 2023 64-bit..." -LabVIEWCLI ^ - -PortNumber 3363 ^ - -LabVIEWPath "C:\Program Files\National Instruments\LabVIEW 2023\LabVIEW.exe" ^ - -AdditionalOperationDirectory "%cd%\..\..\lv\operations" ^ - -OperationName "ExecuteAllBuildSpecs" ^ - -ProjectPath "%cd%\DependencyBuilder.lvproj" -taskkill /im labview.exe /f - -echo "Creating directories..." -mkdir "%cd%\dependency-test-1\ni\export\main\12345678.1\2023\x64\Windows" -mkdir "%cd%\dependency-test-1\ni\export\main\12345678.1\2023\x64\Linux_x64" -mkdir "%cd%\dependency-test-1\ni\export\main\12345678.2\2023\x64\Windows" -mkdir "%cd%\dependency-test-1\ni\export\main\12345678.2\2023\x64\Linux_x64" -mkdir "%cd%\dependency-test-1\ni\export\main\12345678.3\2023\x64\Windows" -mkdir "%cd%\dependency-test-1\ni\export\main\12345678.3\2023\x64\Linux_x64" -copy "output\Windows\DependencyLibrary1.lvlibp" "%cd%\dependency-test-1\ni\export\main\12345678.2\2023\x64\Windows" -copy "output\Linux_x64\DependencyLibrary1.lvlibp" "%cd%\dependency-test-1\ni\export\main\12345678.2\2023\x64\Linux_x64" - -echo "Creating directories..." -mkdir "%cd%\dependency-test-2\ni\export\main\12345678.1\2023\x64\Windows" -mkdir "%cd%\dependency-test-2\ni\export\main\12345678.1\2023\x64\Linux_x64" -mkdir "%cd%\dependency-test-2\ni\export\main\12345678.2\2023\x64\Windows" -mkdir "%cd%\dependency-test-2\ni\export\main\12345678.2\2023\x64\Linux_x64" -mkdir "%cd%\dependency-test-2\ni\export\main\12345678.3\2023\x64\Windows" -mkdir "%cd%\dependency-test-2\ni\export\main\12345678.3\2023\x64\Linux_x64" -copy "output\Windows\DependencyLibrary2.lvlibp" "%cd%\dependency-test-2\ni\export\main\12345678.2\2023\x64\Windows" -copy "output\Linux_x64\DependencyLibrary2.lvlibp" "%cd%\dependency-test-2\ni\export\main\12345678.2\2023\x64\Linux_x64" - - echo "Building in LabVIEW 2024 32-bit..." LabVIEWCLI ^ -PortNumber 3363 ^ @@ -210,6 +141,75 @@ mkdir "%cd%\dependency-test-2\ni\export\main\12345678.3\2025\x64\Linux_x64" copy "output\Windows\DependencyLibrary2.lvlibp" "%cd%\dependency-test-2\ni\export\main\12345678.2\2025\x64\Windows" copy "output\Linux_x64\DependencyLibrary2.lvlibp" "%cd%\dependency-test-2\ni\export\main\12345678.2\2025\x64\Linux_x64" +echo "Building in LabVIEW 2026 32-bit..." +LabVIEWCLI ^ + -PortNumber 3363 ^ + -LabVIEWPath "C:\Program Files (x86)\National Instruments\LabVIEW 2026\LabVIEW.exe" ^ + -AdditionalOperationDirectory "%cd%\..\..\lv\operations" ^ + -OperationName "ExecuteAllBuildSpecs" ^ + -ProjectPath "%cd%\DependencyBuilder.lvproj" +taskkill /im labview.exe /f + +echo "Creating directories for library 1..." +mkdir "%cd%\dependency-test-1\ni\export\main\12345678.1\2026\x86\Windows" +mkdir "%cd%\dependency-test-1\ni\export\main\12345678.1\2026\x86\Linux_x64" +mkdir "%cd%\dependency-test-1\ni\export\main\12345678.2\2026\x86\Windows" +mkdir "%cd%\dependency-test-1\ni\export\main\12345678.2\2026\x86\Linux_x64" +mkdir "%cd%\dependency-test-1\ni\export\main\12345678.3\2026\x86\Windows" +mkdir "%cd%\dependency-test-1\ni\export\main\12345678.3\2026\x86\Linux_x64" +copy "output\Windows\DependencyLibrary1.lvlibp" "%cd%\dependency-test-1\ni\export\main\12345678.2\2026\x86\Windows" +copy "output\Linux_x64\DependencyLibrary1.lvlibp" "%cd%\dependency-test-1\ni\export\main\12345678.2\2026\x86\Linux_x64" + +echo "Creating directories for library 2..." +mkdir "%cd%\dependency-test-2\ni\export\main\12345678.1\2026\x86\Windows" +mkdir "%cd%\dependency-test-2\ni\export\main\12345678.1\2026\x86\Linux_x64" +mkdir "%cd%\dependency-test-2\ni\export\main\12345678.2\2026\x86\Windows" +mkdir "%cd%\dependency-test-2\ni\export\main\12345678.2\2026\x86\Linux_x64" +mkdir "%cd%\dependency-test-2\ni\export\main\12345678.3\2026\x86\Windows" +mkdir "%cd%\dependency-test-2\ni\export\main\12345678.3\2026\x86\Linux_x64" +copy "output\Windows\DependencyLibrary2.lvlibp" "%cd%\dependency-test-2\ni\export\main\12345678.2\2026\x86\Windows" +copy "output\Linux_x64\DependencyLibrary2.lvlibp" "%cd%\dependency-test-2\ni\export\main\12345678.2\2026\x86\Linux_x64" + +echo "Creating directories for library 3..." +mkdir "%cd%\dependency-test-3\ni\export\main\12345678.1\2026\x86\Windows" +mkdir "%cd%\dependency-test-3\ni\export\main\12345678.1\2026\x86\Linux_x64" +mkdir "%cd%\dependency-test-3\ni\export\main\12345678.2\2026\x86\Windows" +mkdir "%cd%\dependency-test-3\ni\export\main\12345678.2\2026\x86\Linux_x64" +mkdir "%cd%\dependency-test-3\ni\export\main\12345678.3\2026\x86\Windows" +mkdir "%cd%\dependency-test-3\ni\export\main\12345678.3\2026\x86\Linux_x64" +copy "output\Windows\DependencyLibrary3.lvlibp" "%cd%\dependency-test-3\ni\export\main\12345678.2\2026\x86\Windows" +copy "output\Linux_x64\DependencyLibrary3.lvlibp" "%cd%\dependency-test-3\ni\export\main\12345678.2\2026\x86\Linux_x64" + +echo "Building in LabVIEW 2026 64-bit..." +LabVIEWCLI ^ + -PortNumber 3363 ^ + -LabVIEWPath "C:\Program Files\National Instruments\LabVIEW 2026\LabVIEW.exe" ^ + -AdditionalOperationDirectory "%cd%\..\..\lv\operations" ^ + -OperationName "ExecuteAllBuildSpecs" ^ + -ProjectPath "%cd%\DependencyBuilder.lvproj" +taskkill /im labview.exe /f + +echo "Creating directories..." +mkdir "%cd%\dependency-test-1\ni\export\main\12345678.1\2026\x64\Windows" +mkdir "%cd%\dependency-test-1\ni\export\main\12345678.1\2026\x64\Linux_x64" +mkdir "%cd%\dependency-test-1\ni\export\main\12345678.2\2026\x64\Windows" +mkdir "%cd%\dependency-test-1\ni\export\main\12345678.2\2026\x64\Linux_x64" +mkdir "%cd%\dependency-test-1\ni\export\main\12345678.3\2026\x64\Windows" +mkdir "%cd%\dependency-test-1\ni\export\main\12345678.3\2026\x64\Linux_x64" +copy "output\Windows\DependencyLibrary1.lvlibp" "%cd%\dependency-test-1\ni\export\main\12345678.2\2026\x64\Windows" +copy "output\Linux_x64\DependencyLibrary1.lvlibp" "%cd%\dependency-test-1\ni\export\main\12345678.2\2026\x64\Linux_x64" + +echo "Creating directories..." +mkdir "%cd%\dependency-test-2\ni\export\main\12345678.1\2026\x64\Windows" +mkdir "%cd%\dependency-test-2\ni\export\main\12345678.1\2026\x64\Linux_x64" +mkdir "%cd%\dependency-test-2\ni\export\main\12345678.2\2026\x64\Windows" +mkdir "%cd%\dependency-test-2\ni\export\main\12345678.2\2026\x64\Linux_x64" +mkdir "%cd%\dependency-test-2\ni\export\main\12345678.3\2026\x64\Windows" +mkdir "%cd%\dependency-test-2\ni\export\main\12345678.3\2026\x64\Linux_x64" +copy "output\Windows\DependencyLibrary2.lvlibp" "%cd%\dependency-test-2\ni\export\main\12345678.2\2026\x64\Windows" +copy "output\Linux_x64\DependencyLibrary2.lvlibp" "%cd%\dependency-test-2\ni\export\main\12345678.2\2026\x64\Linux_x64" + + echo "add .finished documents..." type nul > "%cd%\dependency-test-1\ni\export\main\12345678.1\.finished" type nul > "%cd%\dependency-test-1\ni\export\main\12345678.2\.finished" @@ -218,4 +218,4 @@ type nul > "%cd%\dependency-test-2\ni\export\main\12345678.2\.finished" type nul > "%cd%\dependency-test-3\ni\export\main\12345678.1\.finished" type nul > "%cd%\dependency-test-3\ni\export\main\12345678.2\.finished" echo "complete!" -pause \ No newline at end of file +pause