Skip to content

Commit

Permalink
Update to pylon 7.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Stefan Klug committed May 24, 2023
1 parent d272c4f commit a88b992
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ install:
- 7z x swigwin.zip -oC:\ > NUL
- set PATH=C:\swigwin-4.1.1;%PATH%
# install pylon
- appveyor-retry curl -sSfL -o pylon_installer.exe %PYLON_DOWNLOAD_URL_BASE%Basler_pylon_7.2.1.25747.exe
- appveyor-retry curl -sSfL -o pylon_installer.exe %PYLON_DOWNLOAD_URL_BASE%Basler_pylon_7.3.0.27189.exe
- pylon_installer.exe /quiet /install="Runtime;GigE_Support;USB_Support;Camera_Link_Support;CoaXPress_Support;GenTL_Consumer_Support;CamEmu_Support;SDKs"
# PYLON_DEV_DIR is not available in the shell after installation, so we set it manually
- set PYLON_DEV_DIR=%PROGRAMFILES%\Basler\pylon 7\Development
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ jobs:
- name: Installer list
run: |
tee pylon-installer.txt <<"EOF"
${PYLON_DOWNLOAD_URL_BASE_7_2}pylon_7.2.1.25747_x86_64_setup.tar.gz
${PYLON_DOWNLOAD_URL_BASE_7_2}pylon_7.2.1.25747_aarch64_setup.tar.gz
${PYLON_DOWNLOAD_URL_BASE_7_2}pylon_7.3.0.27189_linux-x86_64_setup.tar.gz
${PYLON_DOWNLOAD_URL_BASE_7_2}pylon_7.3.0.27189_linux-aarch64_setup.tar.gz
${PYLON_DOWNLOAD_URL_BASE}pylon_6.2.0.21487_armhf_setup.tar.gz
${PYLON_DOWNLOAD_URL_BASE}pylon-6.1.2.19990.zip
EOF
Expand Down
4 changes: 2 additions & 2 deletions VersionInfo.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# The pylon version this source tree was designed for, by platform
ReferencePylonVersion = {
"Windows": "7.2.1",
"Windows": "7.3.0",
# ATTENTION: This version is the pylon core version reported by pylon-config,
# which is not equal to the version on the outer tar.gz
"Linux": "7.2.1",
"Linux": "7.3.0",
"Linux_armv7l": "6.2.0",
"Darwin": "6.1.2"
}
4 changes: 4 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
Version 2.1.0a1
- Date 2023-05-24
- Updated to pylon 7.3 on linux and windows

Version 2.0.0
- Date 2023-05-24
- Updated to pylon 7.2 on linux and windows
Expand Down
4 changes: 2 additions & 2 deletions scripts/build/build-arch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ if [ -z "$PYLON_DIR" ]; then
exit 1
fi

#test for pylon 6.1
files=( $PYLON_DIR/pylon_*_${PYLON_ARCH}_setup.tar.gz )
#test for pylon 6.1 and pylon 7
files=( $PYLON_DIR/pylon_*_*${PYLON_ARCH}_setup.tar.gz )
PYLON="${files[0]}"

#fallback to pre 6.1 naming
Expand Down

0 comments on commit a88b992

Please sign in to comment.