diff --git a/.github/workflows/BuildPR.yml b/.github/workflows/BuildPR.yml index f0ff44f9..cc886745 100644 --- a/.github/workflows/BuildPR.yml +++ b/.github/workflows/BuildPR.yml @@ -108,7 +108,7 @@ jobs: path: build/dist/DLTViewer*.tgz - buildLinux: + buildUbuntu20: name: Build ${{ matrix.ubuntu }} strategy: matrix: @@ -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 diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index 36cde841..965b7b89 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -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 diff --git a/scripts/linux/build.md b/scripts/linux/build.md index 27803d90..bd0634fd 100644 --- a/scripts/linux/build.md +++ b/scripts/linux/build.md @@ -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` @@ -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. @@ -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. \ No newline at end of file diff --git a/scripts/linux/build.sh b/scripts/linux/buildUbuntu20.sh similarity index 100% rename from scripts/linux/build.sh rename to scripts/linux/buildUbuntu20.sh diff --git a/scripts/linux/install.sh b/scripts/linux/installUbuntu20.sh similarity index 100% rename from scripts/linux/install.sh rename to scripts/linux/installUbuntu20.sh