From 6ef984b5d248759894078bbeec5f1755de4cb780 Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Thu, 21 Apr 2022 11:04:21 +0200 Subject: [PATCH 1/8] minor changes (unneeded macdeploy, formatting) to jkqtplotter_deployqt.cmake --- cmake/jkqtplotter_deployqt.cmake | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cmake/jkqtplotter_deployqt.cmake b/cmake/jkqtplotter_deployqt.cmake index 11152fac31..270e6e0072 100644 --- a/cmake/jkqtplotter_deployqt.cmake +++ b/cmake/jkqtplotter_deployqt.cmake @@ -4,7 +4,6 @@ function(jkqtplotter_deployqt TARGET_NAME) get_target_property(_qmake_executable Qt${QT_VERSION_MAJOR}::qmake IMPORTED_LOCATION) get_filename_component(_qt_bin_dir "${_qmake_executable}" DIRECTORY) find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${_qt_bin_dir}") - find_program(MACDEPLOYQT_EXECUTABLE macdeployqt HINTS "${_qt_bin_dir}") set(WINDEPLOYQTOPTION "--release") if (CMAKE_BUILD_TYPE STREQUAL "Debug") @@ -22,8 +21,8 @@ function(jkqtplotter_deployqt TARGET_NAME) COMMAND "${CMAKE_COMMAND}" -E env PATH="${CMAKE_CXX_COMPILER_BINPATH}\;${_qt_bin_dir}" "${WINDEPLOYQT_EXECUTABLE}" --compiler-runtime - -xml - -printsupport + -xml + -printsupport ${WINDEPLOYQTOPTION} \"$\" COMMENT "Running windeployqt ... " From c058ae3488aa2d41b638259bc11755256d5826a9 Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Thu, 21 Apr 2022 11:08:29 +0200 Subject: [PATCH 2/8] removed Travis CI integration --- .travis.yml | 91 -------------------------------------------- README.md | 3 +- ci/install_travis.sh | 37 ------------------ ci/test_travis.sh | 11 ------ 4 files changed, 1 insertion(+), 141 deletions(-) delete mode 100644 .travis.yml delete mode 100644 ci/install_travis.sh delete mode 100755 ci/test_travis.sh diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index a1f4fbf1eb..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,91 +0,0 @@ -language: cpp -sudo: false -compiler: - - gcc - - clang -os: - - linux - - osx -dist: focal -osx_image: xcode8.3 - -matrix: - exclude: - # Disable all automatic entries in the test matrix - - compiler: clang - - compiler: gcc - - os: osx - - os: linux - include: - # Explicitly add tests that we want to run - - env: BUILD_DOXYGEN="yes" - compiler: gcc - os: linux - addons: - apt: - packages: - - doxygen - - doxygen-doc - - doxygen-latex - - doxygen-gui - - graphviz - - clang-9 - - libclang-9-dev - - libclang-cpp9 - install: - - pwd - - doxygen --version - ############################################################################ - # All the dependencies are installed in ${TRAVIS_BUILD_DIR}/deps/ - ############################################################################ - - DEPS_DIR="${TRAVIS_BUILD_DIR}/deps" - - mkdir -p ${DEPS_DIR} && cd ${DEPS_DIR} - ############################################################################ - # Install a recent Doxygen - ############################################################################ - - DOXYGEN_URL="https://github.com/jkriege2/doxygen_bin_mirror/raw/main/doxygen-1.9.3.linux.bin.tar.gz" - - mkdir doxygen - - travis_retry wget -O - ${DOXYGEN_URL} | tar --strip-components=1 -xz -C doxygen - - export PATH=${DEPS_DIR}/doxygen/bin:${PATH} - - doxygen --version - script: - - pwd - - cd ${TRAVIS_BUILD_DIR} - - cd doc - - doxygen --version - - doxygen Doxyfile - - echo "" > html/.nojekyll - - compiler: clang - os: osx - - compiler: clang - os: linux - addons: - apt: - packages: - - libglu1-mesa-dev - - compiler: gcc - os: linux - addons: - apt: - packages: - - libglu1-mesa-dev - -install: - - source ci/install_travis.sh - -script: - - ci/test_travis.sh - -notifications: - email: false - -deploy: - provider: pages - verbose: true - deployment_file: true - skip_cleanup: true - local_dir: doc/html - github_token: $GH_REPO_TOKEN - on: - branch: master - condition: $BUILD_DOXYGEN = yes diff --git a/README.md b/README.md index d23dc5876c..b7e229598c 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,7 @@ This software is licensed under the term of the [GNU Lesser General Public Licen [![Qt5](https://img.shields.io/badge/Qt-5-brightgreen)](https://doc.qt.io/qt-5/) [![Documentation](https://img.shields.io/badge/documentation-online-blue)](http://jkriege2.github.io/JKQtPlotter/index.html) -[[![Build status](https://ci.appveyor.com/api/projects/status/vq2o9pfi97isxm2a?svg=true)](https://ci.appveyor.com/project/jkriege2/jkqtplotter) -![CI: Documentation/Linux/MacOX Build](https://img.shields.io/travis/jkriege2/JKQtPlotter/master?label=CI%3A%20Documentation%2FLinux%2FMacOX%20Build)](https://travis-ci.org/jkriege2/JKQtPlotter) +[![Build status](https://ci.appveyor.com/api/projects/status/vq2o9pfi97isxm2a?svg=true)](https://ci.appveyor.com/project/jkriege2/jkqtplotter) [![Commit Activity](https://img.shields.io/github/commit-activity/m/jkriege2/JKQtPlotter)](https://github.com/jkriege2/JKQtPlotter/pulse) [![Last Commit](https://img.shields.io/github/last-commit/jkriege2/JKQtPlotter)](https://github.com/jkriege2/JKQtPlotter/pulse) diff --git a/ci/install_travis.sh b/ci/install_travis.sh deleted file mode 100644 index f368eeeb8c..0000000000 --- a/ci/install_travis.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env bash - -# Exit on error -set -e -# Echo each command -set -x - -export SOURCE_DIR=`pwd` -export our_install_dir="$HOME/our_usr" - -if [[ ! -d $HOME/conda_root/pkgs ]]; then - rm -rf $HOME/conda_root - if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then - wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh - else - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh - fi - bash miniconda.sh -b -p $HOME/conda_root -fi -export PATH="$HOME/conda_root/bin:$PATH" -conda config --set always_yes yes --set changeps1 no -conda config --add channels conda-forge --force -# Useful for debugging any issues with conda -conda info -a - -conda_pkgs="qt cmake opencv doxygen cimg" - -conda create -q -p $our_install_dir ${conda_pkgs} - -# Since this script is getting sourced, remove error on exit -set +e -set +x - -source activate $our_install_dir - -cd $SOURCE_DIR; - diff --git a/ci/test_travis.sh b/ci/test_travis.sh deleted file mode 100755 index d9c8250270..0000000000 --- a/ci/test_travis.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Exit on error -set -e -# Echo each command -set -x - -mkdir build -cd build -cmake -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX .. -cmake --build . --target install From 27f8ef2120d84fc26ba5d13dd2d74c17bb0902db Mon Sep 17 00:00:00 2001 From: "Jan W. Krieger" Date: Thu, 21 Apr 2022 11:22:34 +0200 Subject: [PATCH 3/8] Create codeql-analysis.yml --- .github/workflows/codeql-analysis.yml | 70 +++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 .github/workflows/codeql-analysis.yml diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml new file mode 100644 index 0000000000..5ad5da1ead --- /dev/null +++ b/.github/workflows/codeql-analysis.yml @@ -0,0 +1,70 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: + branches: [ master ] + pull_request: + # The branches below must be a subset of the branches above + branches: [ master ] + schedule: + - cron: '43 13 * * 0' + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: [ 'cpp' ] + # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] + # Learn more about CodeQL language support at https://git.io/codeql-language-support + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v2 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + # queries: ./path/to/local/query, your-org/your-repo/queries@main + + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v2 + + # ℹī¸ Command-line programs to run using the OS shell. + # 📚 https://git.io/JvXDl + + # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines + # and modify them (or add more) to build your code if your project + # uses a compiled language + + #- run: | + # make bootstrap + # make release + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 From 6866e76683d6dcf13487947ad2f8bb14e95157e0 Mon Sep 17 00:00:00 2001 From: "Jan W. Krieger" Date: Thu, 21 Apr 2022 11:39:59 +0200 Subject: [PATCH 4/8] Update codeql-analysis.yml custom build steps --- .github/workflows/codeql-analysis.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 5ad5da1ead..d830bf1fd9 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -50,21 +50,24 @@ jobs: # Prefix the list here with "+" to use these queries and those in the config file. # queries: ./path/to/local/query, your-org/your-repo/queries@main + - name: Install dependencies + sudo apt -y install -qq qtbase5-dev qt5-qmake qtbase5-dev-tools + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v2 - - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl + - name: Build JKQtPlotter + run: | + mkdir build + cd build + cmake --version + cmake -G "Unix Makefiles" "-DCMAKE_BUILD_TYPE=Release" .. + cmake --build . --config "Release" + cd .. # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines # and modify them (or add more) to build your code if your project # uses a compiled language - #- run: | - # make bootstrap - # make release - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v2 From 4e9f681183ccff0e0863f5070434bbd37cba311c Mon Sep 17 00:00:00 2001 From: "Jan W. Krieger" Date: Thu, 21 Apr 2022 11:46:12 +0200 Subject: [PATCH 5/8] Update codeql-analysis.yml --- .github/workflows/codeql-analysis.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index d830bf1fd9..29b457547f 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -51,7 +51,7 @@ jobs: # queries: ./path/to/local/query, your-org/your-repo/queries@main - name: Install dependencies - sudo apt -y install -qq qtbase5-dev qt5-qmake qtbase5-dev-tools + run: sudo apt -y install -qq qtbase5-dev qt5-qmake qtbase5-dev-tools # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) @@ -64,10 +64,5 @@ jobs: cmake --build . --config "Release" cd .. - # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language - - - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v2 From f6c77c7a22580a940d16364b7feb0c1215e628dc Mon Sep 17 00:00:00 2001 From: "Jan W. Krieger" Date: Thu, 21 Apr 2022 11:54:55 +0200 Subject: [PATCH 6/8] Update codeql-analysis.yml --- .github/workflows/codeql-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 29b457547f..b7cdb8713f 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -51,7 +51,7 @@ jobs: # queries: ./path/to/local/query, your-org/your-repo/queries@main - name: Install dependencies - run: sudo apt -y install -qq qtbase5-dev qt5-qmake qtbase5-dev-tools + run: sudo apt -y install build-essential cmake mesa-common-dev libglu1-mesa-dev libfontconfig1 qt5-qmake qtbase5-dev-tools qt5-default # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) From 0448b0f9599c5e7ed97af66b1c536db98f4634bf Mon Sep 17 00:00:00 2001 From: "Jan W. Krieger" Date: Thu, 21 Apr 2022 12:00:03 +0200 Subject: [PATCH 7/8] Update codeql-analysis.yml --- .github/workflows/codeql-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index b7cdb8713f..2274881584 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -51,7 +51,7 @@ jobs: # queries: ./path/to/local/query, your-org/your-repo/queries@main - name: Install dependencies - run: sudo apt -y install build-essential cmake mesa-common-dev libglu1-mesa-dev libfontconfig1 qt5-qmake qtbase5-dev-tools qt5-default + run: sudo apt -y install build-essential cmake mesa-common-dev libglu1-mesa-dev libfontconfig1 qt5-qmake qtbase5-dev-tools qt5-default libqt5opengl5-dev qtdeclarative5-dev libqt5svg5-dev libqt5x11extras5-dev # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) From cc6a87c6d24bb66728baecd1e132e734c9d37d26 Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Thu, 21 Apr 2022 12:13:23 +0200 Subject: [PATCH 8/8] fixed bug #48 some users could not #include --- lib/jkqtplotter/jkqtpbaseplotter.cpp | 2 +- lib/jkqtplotter/jkqtpbaseplotter.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/jkqtplotter/jkqtpbaseplotter.cpp b/lib/jkqtplotter/jkqtpbaseplotter.cpp index b99b4ac40a..24eb3473c1 100644 --- a/lib/jkqtplotter/jkqtpbaseplotter.cpp +++ b/lib/jkqtplotter/jkqtpbaseplotter.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include "jkqtplotter/jkqtpbaseplotter.h" #include "jkqtplotter/gui/jkqtpgraphsmodel.h" diff --git a/lib/jkqtplotter/jkqtpbaseplotter.h b/lib/jkqtplotter/jkqtpbaseplotter.h index 04d57e0dc6..4ef0f9f307 100644 --- a/lib/jkqtplotter/jkqtpbaseplotter.h +++ b/lib/jkqtplotter/jkqtpbaseplotter.h @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include