Skip to content

Commit

Permalink
Merge pull request #593 from hannesa2/RenameLinuxBuild
Browse files Browse the repository at this point in the history
Rename Linux build
  • Loading branch information
hannesa2 authored Nov 24, 2024
2 parents 2e8615f + 78bc1b0 commit cc1edd8
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/BuildPR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:
path: build/dist/DLTViewer*.tgz


buildLinux:
buildUbuntu20:
name: Build ${{ matrix.ubuntu }}
strategy:
matrix:
Expand All @@ -121,9 +121,9 @@ jobs:
fetch-depth: 0
submodules: true
- name: install build environment
run: scripts/linux/install.sh
run: scripts/linux/installUbuntu20.sh
- name: Build project
run: scripts/linux/build.sh
run: scripts/linux/buildUbuntu20.sh
- name: Run tests
run: ctest --test-dir build/qdlt
- name: Make artifact executable
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/Release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,9 @@ jobs:
fetch-depth: 0
submodules: true
- name: install build environment
run: scripts/linux/install.sh
run: scripts/linux/installUbuntu20.sh
- name: Build project
run: scripts/linux/build.sh
run: scripts/linux/buildUbuntu20.sh
- name: Make artifact executable
run: chmod -R +x build/dist
- name: Archive artifact
Expand Down
6 changes: 3 additions & 3 deletions scripts/linux/build.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ For DLT Viewer development on **MS Windows** please see [Windows development env
Configuration:
- Modern desktop Linux, Ubuntu LTS is recommended.
- Administrator rights `sudo`
- Build environment [install.sh](./install.sh)
- Build environment [install.sh](./installUbuntu20.sh)
- `sudo dlt-viewer/scripts/linux/install.sh`
- QT 5.15.2
- Default QT version published with each Ubuntu version is different. Good one is installed by `install.sh`
Expand Down Expand Up @@ -36,7 +36,7 @@ sudo apt install code
- If you still need to install DLT Viewer system wide, please use `DLT_USE_STANDARD_INSTALLATION_LOCATION` or provide other installation configuration CMake variables.
- Build Release configuration and do `cmake --install .` for system wide install, or `cmake --install . --prefix DLTViewer` for local install.
- Set CMake variable `DLT_USE_STANDARD_INSTALLATION_LOCATION=ON`, see [CMakeLists.txt](../CMakeLists.txt)
- OR set `DLT_USE_STANDARD_INSTALLATION_LOCATION=OFF` and use `DLT_XXX_INSTALLATION_PATH` variables, see [build.sh](./build.sh)
- OR set `DLT_USE_STANDARD_INSTALLATION_LOCATION=OFF` and use `DLT_XXX_INSTALLATION_PATH` variables, see [build.sh](./buildUbuntu20.sh)

# Build release package
- DLT Viewer for Linux is distributed as AppImage.
Expand All @@ -48,5 +48,5 @@ sudo apt install code
- DT_RUNPATH documentation https://linux.die.net/man/1/ld

- `linuxdeploy` utility is wrapped into CPack External generator.
- [build.sh](./build.sh) script generates DLT Viewer AppImage and also produces TGZ file.
- [build.sh](./buildUbuntu20.sh) script generates DLT Viewer AppImage and also produces TGZ file.
- Please use oldest supported Ubuntu LTS, currently Ubuntu 18.04, to create AppImage package compatible with most of desktop Linux installations.
File renamed without changes.
File renamed without changes.

0 comments on commit cc1edd8

Please sign in to comment.