diff --git a/scripts/_pack_and_publish_catalog.ps1 b/scripts/_pack_and_publish_catalog.ps1 deleted file mode 100644 index 63f3f13bd..000000000 --- a/scripts/_pack_and_publish_catalog.ps1 +++ /dev/null @@ -1,90 +0,0 @@ - -# Get the current script directory -$scriptDir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent -$parentDir = Resolve-Path -Path "$scriptDir\.." - -# Combine the absolute path with a relative path -$catalogRelPath = "src\ax.catalog" -$catalogAbsPath = Join-Path -Path $ParentDir -ChildPath $catalogRelPath - -# Check if the folder exists -if (Test-Path -Path $catalogAbsPath) - { - # Get all .tgz files in the folder - $Files = Get-ChildItem -Path $catalogAbsPath -Filter "*.tgz" - - # Check if any .tgz files were found - if ($Files) - { - # Loop through each file and delete it - foreach ($File in $Files) - { - try - { - Remove-Item -Path $File.FullName -Force - Write-Host "Deleted: $($File.FullName)" -ForegroundColor Green - } - catch - { - Write-Host "Failed to delete: $($File.FullName) - $_" -ForegroundColor Red - } - } - } - else - { - Write-Host "No .tgz files found in the folder $catalogAbsPath." -ForegroundColor Yellow - } - - # Change dir to catalog path - cd $catalogAbsPath - - # Pack the catalog - $packResult = apax pack --key $env:APAX_KEY - - if ($packResult[0] -and -not $packResult[1]) - { - Write-Host "Catalog packed succesfully" -ForegroundColor Green - } - else - { - Write-Host "Failed to pack catalog" -ForegroundColor Red - Write-Host "Error: $packResult[0]: $packResult[1]" -ForegroundColor Red - exit 1 - } - - - # Get all .tgz files in the folder, there should be just one, currently generated - $Files = Get-ChildItem -Path $catalogAbsPath -Filter "*.tgz" - if($Files.Count -ne 1) - { - Write-Host "Error: Several *.tgz files found in the directory $catalogAbsPath." -ForegroundColor Red - } - else - { - $catalogFileName = $Files[0].Name - - Write-Host "Catalog file name: $catalogFileName." -ForegroundColor Yellow - - - # Publish the catalog - $publishResult = apax publish --package $catalogFileName --registry https://npm.pkg.github.com - - - if ($publishResult[0] -and -not $publishResult[1]) - { - Write-Host "Catalog published succesfully" -ForegroundColor Green - } - else - { - Write-Host "Failed to publish catalog" -ForegroundColor Red - Write-Host "Error: $publishResult[0]: $publishResult[1]" -ForegroundColor Red - } - } - Remove-Item -Path $Files[0].FullName -Force - -} -else -{ - Write-Host "The specified folder does not exist: $catalogAbsPath" -ForegroundColor Red -} -cd $scriptDir \ No newline at end of file diff --git a/scripts/app-test.ps1 b/scripts/app-test.ps1 index 42b9825a9..707a8d802 100644 --- a/scripts/app-test.ps1 +++ b/scripts/app-test.ps1 @@ -410,19 +410,20 @@ function Start-DotNetTool { Write-Output "Command completed successfully." Write-Output $output - # Check the exit code - if ($process.ExitCode -eq 0) - { - Write-Output "Command completed successfully." - Write-Output $output - return $true - } - else - { - Write-Error "Command failed with exit code: $($process.ExitCode)" - Write-Error $errorOutput - return $false - } + ###### TODO ##### When running with github action runner, each error cause stop of the action so the error output needs to be forwarded to some logfile in the future + ## Check the exit code + #if ($process.ExitCode -eq 0) + #{ + # Write-Output "Command completed successfully." + # Write-Output $output + # return $true + #} + #else + #{ + # Write-Error "Command failed with exit code: $($process.ExitCode)" + # Write-Error $errorOutput + # return $false + #} } catch { @@ -482,10 +483,11 @@ function Start-DotNetProject { } else { - Write-Error "Project failed to start. Check for errors." + ###### TODO ##### When running with github action runner, each error cause stop of the action so the error output needs to be forwarded to some logfile in the + #Write-Error "Project failed to start. Check for errors." # Read output and error streams - $errorOutput = Get-Content $stdErrFile - Write-Output $errorOutput + #$errorOutput = Get-Content $stdErrFile + #Write-Output $errorOutput Stop-Process -Id $process.Id -Force #??? return $false } @@ -539,22 +541,27 @@ function BuildAndLoadPlc { } cd $appFolder # apax install - $result = run-command -command "apax install" + #$result = run-command -command "apax install" + apax install > $null 2>&1 + return if ($($result.Success) -match "True") { Write-Output "Command 'apax install' finished succesfully in $appFolder" } - else - { - $result.error| foreach-object { write-output $_ } - } + ###### TODO ##### When running with github action runner, each error cause stop of the action so the error output needs to be forwarded to some logfile in the future + #else + #{ + # $result.error| foreach-object { write-output $_ } + #} # apax plcsim $plcSimProjPath = [System.IO.Path]::GetFullPath((Join-Path -Path $appFolder -ChildPath "..\..\tools\src\PlcSimAdvancedStarter\PlcSimAdvancedStarterTool\PlcSimAdvancedStarterTool.csproj")) $result = Start-DotNetTool -ProjectName $plcSimProjPath -Arguments "-- startplcsim -x $appName -n $plcName -t $plcIpAddress" - $result.output | foreach-object { write-output $_ } + ###### TODO ##### When running with github action runner, each error cause stop of the action so the error output needs to be forwarded to some logfile in the future + #$result.output | foreach-object { write-output $_ } # apax hwu $result = Run-Command -Command "apax hwu" - $result.Output | ForEach-Object { Write-Output $_ } + ###### TODO ##### When running with github action runner, each error cause stop of the action so the error output needs to be forwarded to some logfile in the future + #$result.Output | ForEach-Object { Write-Output $_ } if ($($result.Success) -match "True") { $textToWrite = ",OK" @@ -567,7 +574,8 @@ function BuildAndLoadPlc { Write-Result -TextToWrite $textToWrite -LogFilePath $logFilePath -AppendToSameLine # apax swfd $result = Run-Command -Command "apax swfd" - $result.Output | ForEach-Object { Write-Output $_ } + ###### TODO ##### When running with github action runner, each error cause stop of the action so the error output needs to be forwarded to some logfile in the future + #$result.Output | ForEach-Object { Write-Output $_ } if ($($result.Success) -match "True") { $textToWrite = ",OK" @@ -824,7 +832,7 @@ if ($appYamls) ###### Build and load PLC BuildAndLoadPlc -appYamlFile $($appYaml.FilePath) -appName $($appYaml.AppName) -logFilePath $logFilePath -summaryResult ([ref]$SumaryResult) ###### Build and start HMI - BuildAndStartHmi -appYamlFile $($appYaml.FilePath) -appName $($appYaml.AppName) -logFilePath $logFilePath -summaryResult ([ref]$SumaryResult) + #BuildAndStartHmi -appYamlFile $($appYaml.FilePath) -appName $($appYaml.AppName) -logFilePath $logFilePath -summaryResult ([ref]$SumaryResult) } } diff --git a/src/abstractions/app/apax.yml b/src/abstractions/app/apax.yml index d3100951e..08b1738ae 100644 --- a/src/abstractions/app/apax.yml +++ b/src/abstractions/app/apax.yml @@ -20,7 +20,11 @@ dependencies: "@inxton/axopen.core": '0.0.0-dev.0' "@inxton/ax.axopen.app": '0.0.0-dev.0' "@inxton/axopen.simatic1500": '0.0.0-dev.0' -installStrategy: strict + # this is just temporary to be able create hardware configuration using latest hwc version + # upto the moment of releasing new catalog + # installStrategy: strict + "@inxton/ax.latest.packages": '0.0.0-dev.0' +installStrategy: overridable apaxVersion: 3.4.2 scripts: # For proper execution of these scripts, the following variables need to be defined as environment variables or local variables. @@ -104,15 +108,3 @@ scripts: START=$(date +%s) ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s" - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb diff --git a/src/abstractions/ctrl/apax.yml b/src/abstractions/ctrl/apax.yml index a9a58e92b..bdd6eaf6a 100644 --- a/src/abstractions/ctrl/apax.yml +++ b/src/abstractions/ctrl/apax.yml @@ -15,19 +15,6 @@ apaxVersion: 3.4.2 scripts: postbuild: - dotnet ixc - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb - publicKeys: "@inxton": 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17 ... diff --git a/src/ax.axopen.app/ax.axopen.app.code-workspace b/src/ax.axopen.app/ax.axopen.app.code-workspace deleted file mode 100644 index 4b1f40479..000000000 --- a/src/ax.axopen.app/ax.axopen.app.code-workspace +++ /dev/null @@ -1,8 +0,0 @@ -{ - "folders": [ - { - "path": "ctrl" - } - ], - "settings": {} -} \ No newline at end of file diff --git a/src/ax.axopen.app/ctrl/apax.yml b/src/ax.axopen.app/ctrl/apax.yml index 4a06ff84a..9126c6c95 100644 --- a/src/ax.axopen.app/ctrl/apax.yml +++ b/src/ax.axopen.app/ctrl/apax.yml @@ -3,13 +3,10 @@ version: '0.0.0-dev.0' type: generic files: - apax.yml -registries: - "@inxton": "https://npm.pkg.github.com/" -catalogs: - # "@ax/simatic-ax": 2411.0.0 - "@inxton/ax.catalog": 0.0.3 devDependencies: "@inxton/ax-sdk": '0.0.0-dev.0' +catalogs: + "@ax/simatic-ax": 2411.0.0 dependencies: "@ax/simatic-1500-clocks": 8.0.8 "@ax/system-bitaccess": 8.0.7 @@ -17,16 +14,3 @@ dependencies: "@ax/system-serde": 8.0.7 installStrategy: strict apaxVersion: 3.4.2 -scripts: - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb diff --git a/src/ax.axopen.hwlibrary/ax.axopen.hwlibrary.code-workspace b/src/ax.axopen.hwlibrary/ax.axopen.hwlibrary.code-workspace deleted file mode 100644 index 4b1f40479..000000000 --- a/src/ax.axopen.hwlibrary/ax.axopen.hwlibrary.code-workspace +++ /dev/null @@ -1,8 +0,0 @@ -{ - "folders": [ - { - "path": "ctrl" - } - ], - "settings": {} -} \ No newline at end of file diff --git a/src/ax.axopen.hwlibrary/ctrl/apax.yml b/src/ax.axopen.hwlibrary/ctrl/apax.yml index 465fdf032..f4ef81d21 100644 --- a/src/ax.axopen.hwlibrary/ctrl/apax.yml +++ b/src/ax.axopen.hwlibrary/ctrl/apax.yml @@ -3,13 +3,10 @@ version: '0.0.0-dev.0' type: generic files: - apax.yml -registries: - "@inxton": "https://npm.pkg.github.com/" -catalogs: - # "@ax/simatic-ax": 2411.0.0 - "@inxton/ax.catalog": 0.0.3 devDependencies: "@inxton/ax-sdk": '0.0.0-dev.0' +catalogs: + "@ax/simatic-ax": 2411.0.0 dependencies: "@inxton/ax.axopen.min": '0.0.0-dev.0' "@ax/simatic-1500-distributedio": 8.0.6 @@ -20,16 +17,3 @@ dependencies: "@ax/system-bitaccess": 8.0.7 installStrategy: strict apaxVersion: 3.4.2 -scripts: - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb diff --git a/src/ax.axopen.min/ax.axopen.min.code-workspace b/src/ax.axopen.min/ax.axopen.min.code-workspace deleted file mode 100644 index 4b1f40479..000000000 --- a/src/ax.axopen.min/ax.axopen.min.code-workspace +++ /dev/null @@ -1,8 +0,0 @@ -{ - "folders": [ - { - "path": "ctrl" - } - ], - "settings": {} -} \ No newline at end of file diff --git a/src/ax.axopen.min/ctrl/apax.yml b/src/ax.axopen.min/ctrl/apax.yml index d39780c55..5aebaa4ad 100644 --- a/src/ax.axopen.min/ctrl/apax.yml +++ b/src/ax.axopen.min/ctrl/apax.yml @@ -3,27 +3,11 @@ version: '0.0.0-dev.0' type: generic files: - apax.yml -registries: - "@inxton": "https://npm.pkg.github.com/" -catalogs: - # "@ax/simatic-ax": 2411.0.0 - "@inxton/ax.catalog": 0.0.3 devDependencies: "@inxton/ax-sdk": '0.0.0-dev.0' +catalogs: + "@ax/simatic-ax": 2411.0.0 dependencies: "@ax/system-strings": 8.0.7 installStrategy: strict apaxVersion: 3.4.2 -scripts: - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb diff --git a/src/ax.catalog/apax.yml b/src/ax.catalog/apax.yml deleted file mode 100644 index 5214ed050..000000000 --- a/src/ax.catalog/apax.yml +++ /dev/null @@ -1,72 +0,0 @@ -name: "@inxton/ax.catalog" -version: '0.0.3' -type: catalog -keywords: - - "catalog" -catalogDependencies: - "@ax/apax-build": 2.0.20 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 2.0.20 - "@ax/ax2tia": 10.0.8 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 10.0.8 - "@ax/axunit-mocking": 6.0.6 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 6.0.6 - "@ax/axunitst": 6.0.6 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 6.0.6 - "@ax/axunitst-library": 6.0.6 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 6.0.6 - "@ax/axunitst-ls-contrib": 6.0.6 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 6.0.6 - "@ax/build-native": 16.0.3 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 16.0.3 - "@ax/certificate-management": 1.1.3 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 1.1.3 - "@ax/dcp-utility": 1.1.3 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 1.1.3 - "@ax/diagnostic-buffer": 1.3.2 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 1.3.2 - "@ax/hardware-diagnostics": 0.3.0 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 0.3.0 - "@ax/hw-s7-1500": 2.0.51 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 2.0.51 - "@ax/hwc": 2.0.51 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 2.0.51 - "@ax/hwld": 2.0.20 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 2.0.20 - "@ax/mod": 1.4.6 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 1.4.6 - "@ax/mon": 1.4.6 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 1.4.6 - "@ax/opcua-server-config": 2.0.0 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 2.0.0 - "@ax/performance-info": 1.1.2 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 1.1.2 - "@ax/plc-info": 3.0.0 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 3.0.0 - "@ax/sdb": 1.4.6 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 1.4.6 - "@ax/simatic-1500": 7.0.4 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 7.0.4 - "@ax/simatic-1500-alarming": 2.0.1 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 2.0.1 - "@ax/simatic-1500-clocks": 8.0.8 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 8.0.8 - "@ax/simatic-1500-communication": 8.0.0 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 8.0.0 - "@ax/simatic-1500-crypto": 1.0.16 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 1.0.16 - "@ax/simatic-1500-diagnostics": 2.0.6 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 2.0.6 - "@ax/simatic-1500-diagnostics-hardware": 8.0.0 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 8.0.0 - "@ax/simatic-1500-distributedio": 8.0.6 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 8.0.6 - "@ax/simatic-1500-fileaccess": 7.0.9 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 7.0.9 - "@ax/simatic-1500-hardware-utilities": 2.0.5 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 2.0.5 - "@ax/simatic-1500-motioncontrol-native-v5": 7.0.7 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 7.0.7 - "@ax/simatic-1500-motioncontrol-native-v6": 7.0.7 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 7.0.7 - "@ax/simatic-1500-motioncontrol-native-v7": 7.0.7 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 7.0.7 - "@ax/simatic-1500-motioncontrol-native-v8": 7.0.7 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 7.0.7 - "@ax/simatic-1500-motioncontrol-native-v9": 7.0.7 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 7.0.7 - "@ax/simatic-1500-motioncontrol-v7": 7.0.7 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 7.0.7 - "@ax/simatic-1500-motioncontrol-v7-mocking": 7.0.7 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 7.0.7 - "@ax/simatic-1500-motioncontrol-v8": 7.0.7 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 7.0.7 - "@ax/simatic-1500-motioncontrol-v8-mocking": 7.0.7 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 7.0.7 - "@ax/simatic-1500-motioncontrol-v9": 7.0.7 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 7.0.7 - "@ax/simatic-1500-motioncontrol-v9-mocking": 7.0.7 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 7.0.7 - "@ax/simatic-1500-processimage": 8.0.1 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 8.0.1 - "@ax/simatic-1500-tasks": 7.0.6 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 7.0.6 - "@ax/simatic-package-tool": 2.0.11 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 2.0.11 - "@ax/simatic-pragma-stc-plugin": 5.0.8 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 5.0.8 - "@ax/sld": 3.0.9 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 3.0.9 - "@ax/st-ls": 8.0.17 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 8.0.17 - "@ax/st-resources.stc-plugin": 2.0.10 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 2.0.10 - "@ax/stc": 8.0.17 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 8.0.17 - "@ax/system": 8.0.7 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 8.0.7 - "@ax/system-bitaccess": 8.0.7 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 8.0.7 - "@ax/system-conversion": 8.0.7 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 8.0.7 - "@ax/system-counters": 8.0.7 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 8.0.7 - "@ax/system-datetime": 8.0.7 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 8.0.7 - "@ax/system-edgedetection": 8.0.7 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 8.0.7 - "@ax/system-fastmath": 8.0.7 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 8.0.7 - "@ax/system-math": 8.0.7 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 8.0.7 - "@ax/system-selection": 8.0.7 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 8.0.7 - "@ax/system-serde": 8.0.7 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 8.0.7 - "@ax/system-strings": 8.0.7 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 8.0.7 - "@ax/system-timer": 8.0.7 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 8.0.7 - "@ax/target-llvm": 8.0.17 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 8.0.17 - "@ax/target-mc7plus": 8.0.17 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 8.0.17 - "@ax/trace": 2.8.1 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 2.8.1 - #"@ax/sdk": 2411.0.0 # @ax/simatic-ax@2411.0.0 contained at the time of creation this catalog (30.1.2025) version 2411.0.0 - diff --git a/src/ax.latest.packages/ctrl/apax.yml b/src/ax.latest.packages/ctrl/apax.yml index 4f27fb906..bd4749ee7 100644 --- a/src/ax.latest.packages/ctrl/apax.yml +++ b/src/ax.latest.packages/ctrl/apax.yml @@ -5,33 +5,17 @@ files: - apax.yml devDependencies: "@inxton/ax-sdk": '0.0.0-dev.0' -registries: - "@inxton": "https://npm.pkg.github.com/" -catalogs: - # "@ax/simatic-ax": 2411.0.0 - "@inxton/ax.catalog": 0.0.3 +# catalogs: +# "@ax/simatic-ax": 2411.0.0 dependencies: - "@ax/simatic-1500-clocks": 8.0.8 - "@ax/system-bitaccess": 8.0.7 - "@ax/system-math": 8.0.7 - "@ax/system-serde": 8.0.7 - "@ax/hwc": 2.0.51 - "@ax/hw-s7-1500": 2.0.51 - "@ax/hwld": 2.0.20 - "@ax/stc": 8.0.17 - "@ax/sld": 3.0.9 -installStrategy: strict + "@ax/simatic-1500-clocks": ^9.0.1 + "@ax/system-bitaccess": ^9.0.12 + "@ax/system-math": ^9.0.12 + "@ax/system-serde": ^9.0.12 + "@ax/hwc": ^2.0.65 + "@ax/hw-s7-1500": ^2.0.65 + "@ax/hwld": ^2.0.20 + "@ax/stc": ^9.0.72 + "@ax/sld": ^3.1.2 +installStrategy: overridable apaxVersion: 3.4.2 -scripts: - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb diff --git a/src/components.abb.robotics/app/apax.yml b/src/components.abb.robotics/app/apax.yml index 625930234..1b52dc84e 100644 --- a/src/components.abb.robotics/app/apax.yml +++ b/src/components.abb.robotics/app/apax.yml @@ -19,7 +19,11 @@ dependencies: "@inxton/axopen.components.abb.robotics": '0.0.0-dev.0' "@inxton/ax.axopen.app": '0.0.0-dev.0' "@inxton/axopen.simatic1500": '0.0.0-dev.0' -installStrategy: strict + # this is just temporary to test new features + # upto the moment of releasing new catalog + # installStrategy: strict + "@inxton/ax.latest.packages": '0.0.0-dev.0' +installStrategy: overridable apaxVersion: 3.4.2 scripts: # For proper execution of these scripts, the following variables need to be defined as environment variables or local variables. @@ -103,16 +107,3 @@ scripts: START=$(date +%s) ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s" - - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb diff --git a/src/components.abb.robotics/ctrl/apax.yml b/src/components.abb.robotics/ctrl/apax.yml index 6a5b05880..2adad5d88 100644 --- a/src/components.abb.robotics/ctrl/apax.yml +++ b/src/components.abb.robotics/ctrl/apax.yml @@ -15,18 +15,6 @@ apaxVersion: 3.4.2 scripts: postbuild: - dotnet ixc - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb publicKeys: "@inxton": 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17 ... diff --git a/src/components.abstractions/app/apax.yml b/src/components.abstractions/app/apax.yml index 082f8762d..2d951809e 100644 --- a/src/components.abstractions/app/apax.yml +++ b/src/components.abstractions/app/apax.yml @@ -20,7 +20,11 @@ dependencies: "@inxton/axopen.components.abstractions": '0.0.0-dev.0' "@inxton/ax.axopen.app": '0.0.0-dev.0' "@inxton/axopen.simatic1500": '0.0.0-dev.0' -installStrategy: strict + # this is just temporary to be able create hardware configuration using latest hwc version + # upto the moment of releasing new catalog + # installStrategy: strict + "@inxton/ax.latest.packages": '0.0.0-dev.0' +installStrategy: overridable apaxVersion: 3.4.2 scripts: # For proper execution of these scripts, the following variables need to be defined as environment variables or local variables. @@ -104,16 +108,3 @@ scripts: START=$(date +%s) ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s" - - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb diff --git a/src/components.abstractions/ctrl/apax.yml b/src/components.abstractions/ctrl/apax.yml index 456cd2937..b9db9d39a 100644 --- a/src/components.abstractions/ctrl/apax.yml +++ b/src/components.abstractions/ctrl/apax.yml @@ -15,18 +15,6 @@ apaxVersion: 3.4.2 scripts: postbuild: - dotnet ixc - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb publicKeys: "@inxton": 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17 ... diff --git a/src/components.balluff.identification/app/apax.yml b/src/components.balluff.identification/app/apax.yml index 0b50ab4d0..2a54b3300 100644 --- a/src/components.balluff.identification/app/apax.yml +++ b/src/components.balluff.identification/app/apax.yml @@ -19,7 +19,11 @@ dependencies: "@inxton/axopen.components.balluff.identification": '0.0.0-dev.0' "@inxton/ax.axopen.app": '0.0.0-dev.0' "@inxton/axopen.simatic1500": '0.0.0-dev.0' -installStrategy: strict + # this is just temporary to test new features + # upto the moment of releasing new catalog + # installStrategy: strict + "@inxton/ax.latest.packages": '0.0.0-dev.0' +installStrategy: overridable apaxVersion: 3.4.2 scripts: # For proper execution of these scripts, the following variables need to be defined as environment variables or local variables. @@ -103,16 +107,3 @@ scripts: START=$(date +%s) ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s" - - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb diff --git a/src/components.balluff.identification/ctrl/apax.yml b/src/components.balluff.identification/ctrl/apax.yml index ad9df04dc..47ea48b54 100644 --- a/src/components.balluff.identification/ctrl/apax.yml +++ b/src/components.balluff.identification/ctrl/apax.yml @@ -15,18 +15,6 @@ apaxVersion: 3.4.2 scripts: postbuild: - dotnet ixc - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb publicKeys: "@inxton": 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17 ... diff --git a/src/components.cognex.vision/app/apax.yml b/src/components.cognex.vision/app/apax.yml index e06f7a66a..2c1a2d26b 100644 --- a/src/components.cognex.vision/app/apax.yml +++ b/src/components.cognex.vision/app/apax.yml @@ -19,7 +19,11 @@ dependencies: "@inxton/axopen.components.cognex.vision": '0.0.0-dev.0' "@inxton/ax.axopen.app": '0.0.0-dev.0' "@inxton/axopen.simatic1500": '0.0.0-dev.0' -installStrategy: strict + # this is just temporary to test new features + # upto the moment of releasing new catalog + # installStrategy: strict + "@inxton/ax.latest.packages": '0.0.0-dev.0' +installStrategy: overridable apaxVersion: 3.4.2 scripts: # For proper execution of these scripts, the following variables need to be defined as environment variables or local variables. @@ -103,16 +107,3 @@ scripts: START=$(date +%s) ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s" - - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb diff --git a/src/components.cognex.vision/ctrl/apax.yml b/src/components.cognex.vision/ctrl/apax.yml index c6c219177..44e45b222 100644 --- a/src/components.cognex.vision/ctrl/apax.yml +++ b/src/components.cognex.vision/ctrl/apax.yml @@ -15,18 +15,6 @@ apaxVersion: 3.4.2 scripts: postbuild: - dotnet ixc - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb publicKeys: "@inxton": 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17 ... diff --git a/src/components.desoutter.tightening/app/apax.yml b/src/components.desoutter.tightening/app/apax.yml index 598d230c6..a4a51f49d 100644 --- a/src/components.desoutter.tightening/app/apax.yml +++ b/src/components.desoutter.tightening/app/apax.yml @@ -19,7 +19,11 @@ dependencies: "@inxton/axopen.components.desoutter.tightening": '0.0.0-dev.0' "@inxton/ax.axopen.app": '0.0.0-dev.0' "@inxton/axopen.simatic1500": '0.0.0-dev.0' -installStrategy: strict + # this is just temporary to test new features + # upto the moment of releasing new catalog + # installStrategy: strict + "@inxton/ax.latest.packages": '0.0.0-dev.0' +installStrategy: overridable apaxVersion: 3.4.2 scripts: # For proper execution of these scripts, the following variables need to be defined as environment variables or local variables. @@ -103,16 +107,3 @@ scripts: START=$(date +%s) ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s" - - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb diff --git a/src/components.desoutter.tightening/ctrl/apax.yml b/src/components.desoutter.tightening/ctrl/apax.yml index de5e96a36..e47d88e7e 100644 --- a/src/components.desoutter.tightening/ctrl/apax.yml +++ b/src/components.desoutter.tightening/ctrl/apax.yml @@ -17,16 +17,4 @@ apaxVersion: 3.4.2 scripts: postbuild: - dotnet ixc - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb ... diff --git a/src/components.drives/app/apax.yml b/src/components.drives/app/apax.yml index 6b4480239..184bd6bf6 100644 --- a/src/components.drives/app/apax.yml +++ b/src/components.drives/app/apax.yml @@ -20,7 +20,11 @@ dependencies: "@inxton/axopen.components.drives": '0.0.0-dev.0' "@inxton/ax.axopen.app": '0.0.0-dev.0' "@inxton/axopen.simatic1500": '0.0.0-dev.0' -installStrategy: strict + # this is just temporary to test new features + # upto the moment of releasing new catalog + # installStrategy: strict + "@inxton/ax.latest.packages": '0.0.0-dev.0' +installStrategy: overridable apaxVersion: 3.4.2 scripts: # For proper execution of these scripts, the following variables need to be defined as environment variables or local variables. @@ -104,16 +108,3 @@ scripts: START=$(date +%s) ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s" - - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb diff --git a/src/components.drives/ctrl/apax.yml b/src/components.drives/ctrl/apax.yml index 50c40219a..41f1a5cfa 100644 --- a/src/components.drives/ctrl/apax.yml +++ b/src/components.drives/ctrl/apax.yml @@ -15,16 +15,4 @@ apaxVersion: 3.4.2 scripts: postbuild: - dotnet ixc - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb ... diff --git a/src/components.elements/app/apax.yml b/src/components.elements/app/apax.yml index 74f362aab..f9fa36a6f 100644 --- a/src/components.elements/app/apax.yml +++ b/src/components.elements/app/apax.yml @@ -20,7 +20,11 @@ dependencies: "@inxton/axopen.components.elements": '0.0.0-dev.0' "@inxton/ax.axopen.app": '0.0.0-dev.0' "@inxton/axopen.simatic1500": '0.0.0-dev.0' -installStrategy: strict + # this is just temporary to test new features + # upto the moment of releasing new catalog + # installStrategy: strict + "@inxton/ax.latest.packages": '0.0.0-dev.0' +installStrategy: overridable apaxVersion: 3.4.2 scripts: # For proper execution of these scripts, the following variables need to be defined as environment variables or local variables. @@ -104,16 +108,3 @@ scripts: START=$(date +%s) ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s" - - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb diff --git a/src/components.elements/ctrl/apax.yml b/src/components.elements/ctrl/apax.yml index 6f429baa9..1df299411 100644 --- a/src/components.elements/ctrl/apax.yml +++ b/src/components.elements/ctrl/apax.yml @@ -14,17 +14,4 @@ publicKeys: "@inxton": 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17 installStrategy: strict apaxVersion: 3.4.2 -scripts: - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb ... diff --git a/src/components.festo.drives/app/apax.yml b/src/components.festo.drives/app/apax.yml index b7b49162e..5f73fefde 100644 --- a/src/components.festo.drives/app/apax.yml +++ b/src/components.festo.drives/app/apax.yml @@ -19,7 +19,11 @@ dependencies: "@inxton/axopen.components.festo.drives": '0.0.0-dev.0' "@inxton/ax.axopen.app": '0.0.0-dev.0' "@inxton/axopen.simatic1500": '0.0.0-dev.0' -installStrategy: strict + # this is just temporary to test new features + # upto the moment of releasing new catalog + # installStrategy: strict + "@inxton/ax.latest.packages": '0.0.0-dev.0' +installStrategy: overridable apaxVersion: 3.4.2 scripts: # For proper execution of these scripts, the following variables need to be defined as environment variables or local variables. @@ -103,16 +107,3 @@ scripts: START=$(date +%s) ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s" - - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb diff --git a/src/components.festo.drives/ctrl/apax.yml b/src/components.festo.drives/ctrl/apax.yml index 2ec9e61ac..d6983f489 100644 --- a/src/components.festo.drives/ctrl/apax.yml +++ b/src/components.festo.drives/ctrl/apax.yml @@ -15,18 +15,6 @@ apaxVersion: 3.4.2 scripts: postbuild: - dotnet ixc - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb publicKeys: "@inxton": 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17 ... diff --git a/src/components.kuka.robotics/app/apax.yml b/src/components.kuka.robotics/app/apax.yml index b896f57a2..04de6e10b 100644 --- a/src/components.kuka.robotics/app/apax.yml +++ b/src/components.kuka.robotics/app/apax.yml @@ -19,7 +19,11 @@ dependencies: "@inxton/axopen.components.kuka.robotics": '0.0.0-dev.0' "@inxton/ax.axopen.app": '0.0.0-dev.0' "@inxton/axopen.simatic1500": '0.0.0-dev.0' -installStrategy: strict + # this is just temporary to test new features + # upto the moment of releasing new catalog + # installStrategy: strict + "@inxton/ax.latest.packages": '0.0.0-dev.0' +installStrategy: overridable apaxVersion: 3.4.2 scripts: # For proper execution of these scripts, the following variables need to be defined as environment variables or local variables. @@ -103,16 +107,3 @@ scripts: START=$(date +%s) ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s" - - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb diff --git a/src/components.kuka.robotics/ctrl/apax.yml b/src/components.kuka.robotics/ctrl/apax.yml index 411ef3a2b..d3dddd58e 100644 --- a/src/components.kuka.robotics/ctrl/apax.yml +++ b/src/components.kuka.robotics/ctrl/apax.yml @@ -15,18 +15,6 @@ apaxVersion: 3.4.2 scripts: postbuild: - dotnet ixc - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb publicKeys: "@inxton": 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17 ... diff --git a/src/components.mitsubishi.robotics/app/apax.yml b/src/components.mitsubishi.robotics/app/apax.yml index 6858595f1..0c57bed65 100644 --- a/src/components.mitsubishi.robotics/app/apax.yml +++ b/src/components.mitsubishi.robotics/app/apax.yml @@ -19,7 +19,11 @@ dependencies: "@inxton/axopen.components.mitsubishi.robotics": '0.0.0-dev.0' "@inxton/ax.axopen.app": '0.0.0-dev.0' "@inxton/axopen.simatic1500": '0.0.0-dev.0' -installStrategy: strict + # this is just temporary to test new features + # upto the moment of releasing new catalog + # installStrategy: strict + "@inxton/ax.latest.packages": '0.0.0-dev.0' +installStrategy: overridable apaxVersion: 3.4.2 scripts: # For proper execution of these scripts, the following variables need to be defined as environment variables or local variables. @@ -103,16 +107,3 @@ scripts: START=$(date +%s) ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s" - - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb diff --git a/src/components.mitsubishi.robotics/ctrl/apax.yml b/src/components.mitsubishi.robotics/ctrl/apax.yml index 3a407fc97..9ed1d28be 100644 --- a/src/components.mitsubishi.robotics/ctrl/apax.yml +++ b/src/components.mitsubishi.robotics/ctrl/apax.yml @@ -15,18 +15,6 @@ apaxVersion: 3.4.2 scripts: postbuild: - dotnet ixc - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb publicKeys: "@inxton": 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17 ... diff --git a/src/components.pneumatics/app/apax.yml b/src/components.pneumatics/app/apax.yml index 615f591c4..0866eb03c 100644 --- a/src/components.pneumatics/app/apax.yml +++ b/src/components.pneumatics/app/apax.yml @@ -20,7 +20,11 @@ dependencies: "@inxton/axopen.components.pneumatics": '0.0.0-dev.0' "@inxton/ax.axopen.app": '0.0.0-dev.0' "@inxton/axopen.simatic1500": '0.0.0-dev.0' -installStrategy: strict + # this is just temporary to test new features + # upto the moment of releasing new catalog + # installStrategy: strict + "@inxton/ax.latest.packages": '0.0.0-dev.0' +installStrategy: overridable apaxVersion: 3.4.2 scripts: # For proper execution of these scripts, the following variables need to be defined as environment variables or local variables. @@ -104,16 +108,3 @@ scripts: START=$(date +%s) ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s" - - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb diff --git a/src/components.pneumatics/ctrl/apax.yml b/src/components.pneumatics/ctrl/apax.yml index 2e6f3afac..02a310198 100644 --- a/src/components.pneumatics/ctrl/apax.yml +++ b/src/components.pneumatics/ctrl/apax.yml @@ -22,18 +22,6 @@ scripts: - START=$(date +%s) - apax sld load --accept-security-disclaimer -t $AXTARGET -i $AXTARGETPLATFORMINPUT -r - echo "Downloaded in :" $(expr $(date +%s) - $START) "s" - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb publicKeys: "@inxton": 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17 ... diff --git a/src/components.rexroth.drives/app/apax.yml b/src/components.rexroth.drives/app/apax.yml index aa8fe9159..204e1b471 100644 --- a/src/components.rexroth.drives/app/apax.yml +++ b/src/components.rexroth.drives/app/apax.yml @@ -19,7 +19,11 @@ dependencies: "@inxton/axopen.components.rexroth.drives": '0.0.0-dev.0' "@inxton/ax.axopen.app": '0.0.0-dev.0' "@inxton/axopen.simatic1500": '0.0.0-dev.0' -installStrategy: strict + # this is just temporary to test new features + # upto the moment of releasing new catalog + # installStrategy: strict + "@inxton/ax.latest.packages": '0.0.0-dev.0' +installStrategy: overridable apaxVersion: 3.4.2 scripts: # For proper execution of these scripts, the following variables need to be defined as environment variables or local variables. @@ -103,16 +107,3 @@ scripts: START=$(date +%s) ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s" - - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb diff --git a/src/components.rexroth.drives/ctrl/apax.yml b/src/components.rexroth.drives/ctrl/apax.yml index 71dbcced3..64e1a978e 100644 --- a/src/components.rexroth.drives/ctrl/apax.yml +++ b/src/components.rexroth.drives/ctrl/apax.yml @@ -12,17 +12,4 @@ dependencies: "@inxton/axopen.components.drives": '0.0.0-dev.0' installStrategy: strict apaxVersion: 3.4.2 -scripts: - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb ... diff --git a/src/components.rexroth.press/app/apax.yml b/src/components.rexroth.press/app/apax.yml index 84eb598b5..b79119660 100644 --- a/src/components.rexroth.press/app/apax.yml +++ b/src/components.rexroth.press/app/apax.yml @@ -19,7 +19,11 @@ dependencies: "@inxton/axopen.components.rexroth.press": '0.0.0-dev.0' "@inxton/ax.axopen.app": '0.0.0-dev.0' "@inxton/axopen.simatic1500": '0.0.0-dev.0' -installStrategy: strict + # this is just temporary to test new features + # upto the moment of releasing new catalog + # installStrategy: strict + "@inxton/ax.latest.packages": '0.0.0-dev.0' +installStrategy: overridable apaxVersion: 3.4.2 scripts: # For proper execution of these scripts, the following variables need to be defined as environment variables or local variables. @@ -103,16 +107,3 @@ scripts: START=$(date +%s) ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s" - - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb diff --git a/src/components.rexroth.press/ctrl/apax.yml b/src/components.rexroth.press/ctrl/apax.yml index 94b46c3a7..8b65d1680 100644 --- a/src/components.rexroth.press/ctrl/apax.yml +++ b/src/components.rexroth.press/ctrl/apax.yml @@ -15,18 +15,6 @@ apaxVersion: 3.4.2 scripts: postbuild: - dotnet ixc - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb publicKeys: "@inxton": 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17 ... diff --git a/src/components.robotics/app/apax.yml b/src/components.robotics/app/apax.yml index 1b4b4dde2..561a73742 100644 --- a/src/components.robotics/app/apax.yml +++ b/src/components.robotics/app/apax.yml @@ -20,7 +20,11 @@ dependencies: "@inxton/axopen.components.robotics": '0.0.0-dev.0' "@inxton/ax.axopen.app": '0.0.0-dev.0' "@inxton/axopen.simatic1500": '0.0.0-dev.0' -installStrategy: strict + # this is just temporary to test new features + # upto the moment of releasing new catalog + # installStrategy: strict + "@inxton/ax.latest.packages": '0.0.0-dev.0' +installStrategy: overridable apaxVersion: 3.4.2 scripts: # For proper execution of these scripts, the following variables need to be defined as environment variables or local variables. @@ -104,16 +108,3 @@ scripts: START=$(date +%s) ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s" - - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb diff --git a/src/components.robotics/ctrl/apax.yml b/src/components.robotics/ctrl/apax.yml index e39680cfc..7728efd99 100644 --- a/src/components.robotics/ctrl/apax.yml +++ b/src/components.robotics/ctrl/apax.yml @@ -15,18 +15,6 @@ apaxVersion: 3.4.2 scripts: postbuild: - dotnet ixc - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb publicKeys: "@inxton": 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17 ... diff --git a/src/components.siem.identification/app/apax.yml b/src/components.siem.identification/app/apax.yml index 3e2738233..d1d21df34 100644 --- a/src/components.siem.identification/app/apax.yml +++ b/src/components.siem.identification/app/apax.yml @@ -19,7 +19,11 @@ dependencies: "@inxton/axopen.components.siem.identification": '0.0.0-dev.0' "@inxton/ax.axopen.app": '0.0.0-dev.0' "@inxton/axopen.simatic1500": '0.0.0-dev.0' -installStrategy: strict + # this is just temporary to test new features + # upto the moment of releasing new catalog + # installStrategy: strict + "@inxton/ax.latest.packages": '0.0.0-dev.0' +installStrategy: overridable apaxVersion: 3.4.2 scripts: # For proper execution of these scripts, the following variables need to be defined as environment variables or local variables. @@ -103,16 +107,3 @@ scripts: START=$(date +%s) ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s" - - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb diff --git a/src/components.siem.identification/ctrl/apax.yml b/src/components.siem.identification/ctrl/apax.yml index 1952205ad..ffefbae53 100644 --- a/src/components.siem.identification/ctrl/apax.yml +++ b/src/components.siem.identification/ctrl/apax.yml @@ -15,18 +15,6 @@ apaxVersion: 3.4.2 scripts: postbuild: - dotnet ixc - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb publicKeys: "@inxton": 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17 ... diff --git a/src/components.ur.robotics/app/apax.yml b/src/components.ur.robotics/app/apax.yml index e908b12e1..8f468f5f4 100644 --- a/src/components.ur.robotics/app/apax.yml +++ b/src/components.ur.robotics/app/apax.yml @@ -19,7 +19,11 @@ dependencies: "@inxton/axopen.components.ur.robotics": '0.0.0-dev.0' "@inxton/ax.axopen.app": '0.0.0-dev.0' "@inxton/axopen.simatic1500": '0.0.0-dev.0' -installStrategy: strict + # this is just temporary to test new features + # upto the moment of releasing new catalog + # installStrategy: strict + "@inxton/ax.latest.packages": '0.0.0-dev.0' +installStrategy: overridable apaxVersion: 3.4.2 scripts: # For proper execution of these scripts, the following variables need to be defined as environment variables or local variables. @@ -103,16 +107,3 @@ scripts: START=$(date +%s) ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s" - - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb diff --git a/src/components.ur.robotics/ctrl/apax.yml b/src/components.ur.robotics/ctrl/apax.yml index 85256099a..8ac9a1b1b 100644 --- a/src/components.ur.robotics/ctrl/apax.yml +++ b/src/components.ur.robotics/ctrl/apax.yml @@ -15,18 +15,6 @@ apaxVersion: 3.4.2 scripts: postbuild: - dotnet ixc - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb publicKeys: "@inxton": 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17 ... diff --git a/src/core/app/apax.yml b/src/core/app/apax.yml index 08ce1b817..86b0f1afa 100644 --- a/src/core/app/apax.yml +++ b/src/core/app/apax.yml @@ -19,7 +19,11 @@ dependencies: "@inxton/axopen.core": '0.0.0-dev.0' "@inxton/ax.axopen.app": '0.0.0-dev.0' "@inxton/axopen.simatic1500": '0.0.0-dev.0' -installStrategy: strict + # this is just temporary to test new features + # upto the moment of releasing new catalog + # installStrategy: strict + "@inxton/ax.latest.packages": '0.0.0-dev.0' +installStrategy: overridable apaxVersion: 3.4.2 scripts: # For proper execution of these scripts, the following variables need to be defined as environment variables or local variables. @@ -104,19 +108,6 @@ scripts: ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s" - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb - mm1: | apax mon -t 10.10.10.120 -f messages1.mon -C .\\certs\\plc_line\\plc_line.cer -c mm2: | @@ -125,3 +116,5 @@ scripts: apax mon -t 10.10.10.120 -f messages3.mon -C .\\certs\\plc_line\\plc_line.cer -c mm: | apax mon -t 10.10.10.120 -f messages.mon -C .\\certs\\plc_line\\plc_line.cer -c + + \ No newline at end of file diff --git a/src/core/ctrl/apax.yml b/src/core/ctrl/apax.yml index b9ab7106a..42950c1e1 100644 --- a/src/core/ctrl/apax.yml +++ b/src/core/ctrl/apax.yml @@ -17,18 +17,6 @@ apaxVersion: 3.4.2 scripts: postbuild: - dotnet ixc - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb publicKeys: "@inxton": 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17 ... diff --git a/src/data/app/apax.yml b/src/data/app/apax.yml index 481d63e9b..2fcccd021 100644 --- a/src/data/app/apax.yml +++ b/src/data/app/apax.yml @@ -19,7 +19,11 @@ dependencies: "@inxton/axopen.data": '0.0.0-dev.0' "@inxton/ax.axopen.app": '0.0.0-dev.0' "@inxton/axopen.simatic1500": '0.0.0-dev.0' -installStrategy: strict + # this is just temporary to test new features + # upto the moment of releasing new catalog + # installStrategy: strict + "@inxton/ax.latest.packages": '0.0.0-dev.0' +installStrategy: overridable apaxVersion: 3.4.2 scripts: # For proper execution of these scripts, the following variables need to be defined as environment variables or local variables. @@ -103,16 +107,3 @@ scripts: START=$(date +%s) ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s" - - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb diff --git a/src/data/app/ix-blazor/JSONREPOS/Groups/AdminGroup b/src/data/app/ix-blazor/JSONREPOS/Groups/AdminGroup index 3d189b300..c0ba12c88 100644 --- a/src/data/app/ix-blazor/JSONREPOS/Groups/AdminGroup +++ b/src/data/app/ix-blazor/JSONREPOS/Groups/AdminGroup @@ -4,23 +4,9 @@ "DataEntityId": "AdminGroup", "Name": "AdminGroup", "Roles": [ - "Administrator", - "process_settings_access", - "process_traceability_access", - "can_run_ground_mode", - "can_run_automat_mode", - "can_run_service_mode", - "can_skip_steps_in_sequence", - "can_data_item_create", - "can_data_item_edit", - "can_data_item_copy", - "can_data_item_delete", - "can_data_send_to_plc", - "can_data_load_from_plc", - "can_data_export", - "can_data_import" + "Administrator" ], - "RolesHash": "AQAAAAIAAYagAAAAENVJUdJiTxJA+V6u7fivxj+rp3Lepj37jN2ZTTHHI4+WzpZZv9/sJiqfMNJ4kFm8QQ==", + "RolesHash": "AQAAAAIAAYagAAAAEOnVgoEc0N/grlrKHOmSswEnXUk0/PHHYrCCns0sBFfQdP27cLrZ3LZPIFyLd6X/oA==", "Created": "2023-08-09T12:33:03.2736142+02:00", - "Modified": "2025-01-29T21:33:15.5454481+01:00" + "Modified": "2023-08-09T12:33:03.4914502+02:00" } \ No newline at end of file diff --git a/src/data/ctrl/apax.yml b/src/data/ctrl/apax.yml index 82fc3df65..daec0f35a 100644 --- a/src/data/ctrl/apax.yml +++ b/src/data/ctrl/apax.yml @@ -15,18 +15,6 @@ apaxVersion: 3.4.2 scripts: postbuild: - dotnet ixc - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb publicKeys: "@inxton": 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17 ... diff --git a/src/inspectors/app/apax.yml b/src/inspectors/app/apax.yml index 95090fbce..35b98777e 100644 --- a/src/inspectors/app/apax.yml +++ b/src/inspectors/app/apax.yml @@ -20,7 +20,11 @@ dependencies: "@inxton/axopen.inspectors": '0.0.0-dev.0' "@inxton/ax.axopen.app": '0.0.0-dev.0' "@inxton/axopen.simatic1500": '0.0.0-dev.0' -installStrategy: strict + # this is just temporary to test new features + # upto the moment of releasing new catalog + # installStrategy: strict + "@inxton/ax.latest.packages": '0.0.0-dev.0' +installStrategy: overridable apaxVersion: 3.4.2 scripts: # For proper execution of these scripts, the following variables need to be defined as environment variables or local variables. @@ -104,16 +108,3 @@ scripts: START=$(date +%s) ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s" - - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb diff --git a/src/inspectors/ctrl/apax.yml b/src/inspectors/ctrl/apax.yml index 21a0f8909..970059cc0 100644 --- a/src/inspectors/ctrl/apax.yml +++ b/src/inspectors/ctrl/apax.yml @@ -15,18 +15,6 @@ apaxVersion: 3.4.2 scripts: postbuild: - dotnet ixc - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb publicKeys: "@inxton": 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17 ... diff --git a/src/integrations/app/apax.yml b/src/integrations/app/apax.yml index f72622a98..d63a8ad8f 100644 --- a/src/integrations/app/apax.yml +++ b/src/integrations/app/apax.yml @@ -23,7 +23,11 @@ dependencies: "@inxton/axopen.simatic1500": '0.0.0-dev.0' "@inxton/axopen.components.cognex.vision": '0.0.0-dev.0' "@inxton/ax.axopen.app": '0.0.0-dev.0' -installStrategy: strict + # this is just temporary to test new features + # upto the moment of releasing new catalog + # installStrategy: strict + "@inxton/ax.latest.packages": '0.0.0-dev.0' +installStrategy: overridable apaxVersion: 3.4.2 scripts: # For proper execution of these scripts, the following variables need to be defined as environment variables or local variables. @@ -107,16 +111,3 @@ scripts: START=$(date +%s) ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s" - - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb diff --git a/src/io/app/apax.yml b/src/io/app/apax.yml index 51d1866a8..90bab5fe4 100644 --- a/src/io/app/apax.yml +++ b/src/io/app/apax.yml @@ -19,7 +19,11 @@ dependencies: "@inxton/axopen.io": '0.0.0-dev.0' "@inxton/ax.axopen.app": '0.0.0-dev.0' "@inxton/axopen.simatic1500": '0.0.0-dev.0' -installStrategy: strict + # this is just temporary to test new features + # upto the moment of releasing new catalog + # installStrategy: strict + "@inxton/ax.latest.packages": '0.0.0-dev.0' +installStrategy: overridable apaxVersion: 3.4.2 scripts: # For proper execution of these scripts, the following variables need to be defined as environment variables or local variables. @@ -103,16 +107,3 @@ scripts: START=$(date +%s) ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s" - - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb diff --git a/src/io/ctrl/apax.yml b/src/io/ctrl/apax.yml index de5851061..e21d9cd40 100644 --- a/src/io/ctrl/apax.yml +++ b/src/io/ctrl/apax.yml @@ -16,18 +16,6 @@ apaxVersion: 3.4.2 scripts: postbuild: - dotnet ixc - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb publicKeys: "@inxton": 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17 ... diff --git a/src/probers/app/apax.yml b/src/probers/app/apax.yml index e23554762..36faaea63 100644 --- a/src/probers/app/apax.yml +++ b/src/probers/app/apax.yml @@ -20,7 +20,11 @@ dependencies: "@inxton/axopen.probers": '0.0.0-dev.0' "@inxton/ax.axopen.app": '0.0.0-dev.0' "@inxton/axopen.simatic1500": '0.0.0-dev.0' -installStrategy: strict + # this is just temporary to test new features + # upto the moment of releasing new catalog + # installStrategy: strict + "@inxton/ax.latest.packages": '0.0.0-dev.0' +installStrategy: overridable apaxVersion: 3.4.2 scripts: # For proper execution of these scripts, the following variables need to be defined as environment variables or local variables. @@ -104,16 +108,3 @@ scripts: START=$(date +%s) ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s" - - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb diff --git a/src/probers/ctrl/apax.yml b/src/probers/ctrl/apax.yml index b0f60d8ba..be913ae6e 100644 --- a/src/probers/ctrl/apax.yml +++ b/src/probers/ctrl/apax.yml @@ -41,18 +41,6 @@ scripts: - apax download postbuild: - apax ixc - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb publicKeys: "@inxton": 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17 ... diff --git a/src/sdk-ax/ctrl/apax.yml b/src/sdk-ax/ctrl/apax.yml index 205428164..d2c809f82 100644 --- a/src/sdk-ax/ctrl/apax.yml +++ b/src/sdk-ax/ctrl/apax.yml @@ -3,46 +3,9 @@ version: '0.0.0-dev.0' type: generic files: - apax.yml -registries: - "@inxton": "https://npm.pkg.github.com/" catalogs: - # "@ax/simatic-ax": 2411.0.0 - "@inxton/ax.catalog": 0.0.3 + "@ax/simatic-ax": 2411.0.0 dependencies: - '@ax/apax-build': 2.0.20 - '@ax/axunitst': 6.0.6 - '@ax/axunitst-ls-contrib': 6.0.6 - '@ax/certificate-management': 1.1.3 - '@ax/diagnostic-buffer': 1.3.2 - '@ax/hw-s7-1500': 2.0.51 - '@ax/hwc': 2.0.51 - '@ax/hwld': 2.0.20 - '@ax/mod': 1.4.6 - '@ax/mon': 1.4.6 - '@ax/performance-info': 1.1.2 - '@ax/plc-info': 3.0.0 - '@ax/sdb': 1.4.6 - '@ax/simatic-package-tool': 2.0.11 - '@ax/simatic-pragma-stc-plugin': 5.0.8 - '@ax/sld': 3.0.9 - '@ax/st-ls': 8.0.17 - '@ax/st-resources.stc-plugin': 2.0.10 - '@ax/stc': 8.0.17 - '@ax/target-llvm': 8.0.17 - '@ax/target-mc7plus': 8.0.17 - '@ax/trace': 2.8.1 + "@ax/sdk": 2411.0.0 installStrategy: strict apaxVersion: 3.4.2 -scripts: - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb diff --git a/src/sdk-ax/sdk-ax.code-workspace b/src/sdk-ax/sdk-ax.code-workspace deleted file mode 100644 index 4b1f40479..000000000 --- a/src/sdk-ax/sdk-ax.code-workspace +++ /dev/null @@ -1,8 +0,0 @@ -{ - "folders": [ - { - "path": "ctrl" - } - ], - "settings": {} -} \ No newline at end of file diff --git a/src/simatic1500/app/apax.yml b/src/simatic1500/app/apax.yml index de23598fa..3c657cd77 100644 --- a/src/simatic1500/app/apax.yml +++ b/src/simatic1500/app/apax.yml @@ -20,7 +20,11 @@ dependencies: "@inxton/ax.axopen.app": '0.0.0-dev.0' "@inxton/axopen.simatic1500": '0.0.0-dev.0' "@inxton/axopen.core": '0.0.0-dev.0' -installStrategy: strict + # this is just temporary to test new features + # upto the moment of releasing new catalog + # installStrategy: strict + "@inxton/ax.latest.packages": '0.0.0-dev.0' +installStrategy: overridable apaxVersion: 3.4.2 scripts: # For proper execution of these scripts, the following variables need to be defined as environment variables or local variables. @@ -104,16 +108,3 @@ scripts: START=$(date +%s) ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s" - - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb diff --git a/src/simatic1500/ctrl/apax.yml b/src/simatic1500/ctrl/apax.yml index d936fea72..63cf03651 100644 --- a/src/simatic1500/ctrl/apax.yml +++ b/src/simatic1500/ctrl/apax.yml @@ -16,15 +16,4 @@ apaxVersion: 3.4.2 scripts: postbuild: - dotnet ixc - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb +... diff --git a/src/template.axolibrary/app/apax.yml b/src/template.axolibrary/app/apax.yml index 3de4cb2e6..e9bc34ac8 100644 --- a/src/template.axolibrary/app/apax.yml +++ b/src/template.axolibrary/app/apax.yml @@ -19,7 +19,11 @@ dependencies: "@inxton/apaxlibname": '0.0.0-dev.0' "@inxton/ax.axopen.app": '0.0.0-dev.0' "@inxton/axopen.simatic1500": '0.0.0-dev.0' -installStrategy: strict + # this is just temporary to test new features + # upto the moment of releasing new catalog + # installStrategy: strict + "@inxton/ax.latest.packages": '0.0.0-dev.0' +installStrategy: overridable apaxVersion: 3.4.2 scripts: # For proper execution of these scripts, the following variables need to be defined as environment variables or local variables. @@ -103,16 +107,3 @@ scripts: START=$(date +%s) ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s" - - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb diff --git a/src/template.axolibrary/ctrl/apax.yml b/src/template.axolibrary/ctrl/apax.yml index 459f64262..76f86422c 100644 --- a/src/template.axolibrary/ctrl/apax.yml +++ b/src/template.axolibrary/ctrl/apax.yml @@ -15,18 +15,6 @@ apaxVersion: 3.4.2 scripts: postbuild: - dotnet ixc - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb publicKeys: "@inxton": 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17 ... diff --git a/src/timers/app/apax.yml b/src/timers/app/apax.yml index 52d1ff48c..4b54eef55 100644 --- a/src/timers/app/apax.yml +++ b/src/timers/app/apax.yml @@ -20,7 +20,11 @@ dependencies: "@inxton/axopen.core": '0.0.0-dev.0' "@inxton/ax.axopen.app": '0.0.0-dev.0' "@inxton/axopen.simatic1500": '0.0.0-dev.0' -installStrategy: strict + # this is just temporary to test new features + # upto the moment of releasing new catalog + # installStrategy: strict + "@inxton/ax.latest.packages": '0.0.0-dev.0' +installStrategy: overridable apaxVersion: 3.4.2 scripts: # For proper execution of these scripts, the following variables need to be defined as environment variables or local variables. @@ -104,16 +108,3 @@ scripts: START=$(date +%s) ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s" - - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb diff --git a/src/timers/ctrl/apax.yml b/src/timers/ctrl/apax.yml index aad1fb97f..3edf59827 100644 --- a/src/timers/ctrl/apax.yml +++ b/src/timers/ctrl/apax.yml @@ -12,19 +12,6 @@ dependencies: "@inxton/axopen.abstractions": '0.0.0-dev.0' installStrategy: strict apaxVersion: 3.4.2 -scripts: - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb publicKeys: "@inxton": 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17 ... diff --git a/src/traversals/apax/apax.yml b/src/traversals/apax/apax.yml index b73bcce94..72408edae 100644 --- a/src/traversals/apax/apax.yml +++ b/src/traversals/apax/apax.yml @@ -11,7 +11,6 @@ dependencies: '@inxton/ax.axopen.app': 0.0.0-dev.0 '@inxton/ax.axopen.hwlibrary': 0.0.0-dev.0 '@inxton/ax.axopen.min': 0.0.0-dev.0 - '@inxton/ax.catalog': 0.0.3 '@inxton/ax.latest.packages': 0.0.0-dev.0 app_axopen.components.abb.robotics: 0.0.0-dev.0 '@inxton/axopen.components.abb.robotics': 0.0.0-dev.0 diff --git a/src/utils/app/apax.yml b/src/utils/app/apax.yml index d6a8c8bae..56b0ca044 100644 --- a/src/utils/app/apax.yml +++ b/src/utils/app/apax.yml @@ -21,7 +21,11 @@ dependencies: "@inxton/axopen.core": '0.0.0-dev.0' "@inxton/ax.axopen.app": '0.0.0-dev.0' "@inxton/axopen.simatic1500": '0.0.0-dev.0' -installStrategy: strict + # this is just temporary to test new features + # upto the moment of releasing new catalog + # installStrategy: strict + "@inxton/ax.latest.packages": '0.0.0-dev.0' +installStrategy: overridable apaxVersion: 3.4.2 scripts: # For proper execution of these scripts, the following variables need to be defined as environment variables or local variables. @@ -105,16 +109,3 @@ scripts: START=$(date +%s) ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s" - - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb diff --git a/src/utils/ctrl/apax.yml b/src/utils/ctrl/apax.yml index c80cefb5f..097657fee 100644 --- a/src/utils/ctrl/apax.yml +++ b/src/utils/ctrl/apax.yml @@ -15,18 +15,6 @@ apaxVersion: 3.4.2 scripts: postbuild: - dotnet ixc - ib: | - apax install - apax build - icb: | - apax install --catalog - apax ib - cib: | - apax clean - apax ib - cicb: | - apax clean - apax icb publicKeys: "@inxton": 30c06ef7830b4dfd8f16e003508da1ac2d187714d0e1f38279a9332cbe4e4e17 ...