Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/qbs build helper #8125

Merged
merged 31 commits into from Dec 28, 2020
Merged

Feature/qbs build helper #8125

merged 31 commits into from Dec 28, 2020

Commits on Nov 19, 2020

  1. Implemented Qbs Build Helper

    @Psy-Kai
    Psy-Kai committed Nov 19, 2020
    Copy the full SHA
    aecd29a View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'refs/remotes/origin/develop' into featu… 

    …re/qbs-build-helper
    @Psy-Kai
    Psy-Kai committed Nov 19, 2020
    Copy the full SHA
    0bed999 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2020

  1. Added implementation of qbs toolchain

    @Psy-Kai
    Psy-Kai committed Nov 20, 2020
    Copy the full SHA
    595cdaa View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'refs/remotes/origin/develop' into featu… 

    …re/qbs-build-helper
    @Psy-Kai
    Psy-Kai committed Nov 20, 2020
    Copy the full SHA
    ae0b1c6 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2020

  1. Finished first implementation of Qbs build helper

    @Psy-Kai
    Psy-Kai committed Nov 21, 2020
    Copy the full SHA
    c2cfb5b View commit details
    Browse the repository at this point in the history

  2. Changed build_folder to install_folder since build_folder might not be 

    set when calling conan install
    @Psy-Kai
    Psy-Kai committed Nov 21, 2020
    Copy the full SHA
    1f99061 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2020

  1. Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/ 

    qbs-build-helper
    @Psy-Kai
    Psy-Kai committed Nov 28, 2020
    Copy the full SHA
    c3de7ac View commit details
    Browse the repository at this point in the history

  2. Added detection of buildVariant, architecture, optimization, sysroot, 

    PIC, cxxLanguageVersion
    @Psy-Kai
    Psy-Kai committed Nov 28, 2020
    Copy the full SHA
    3b5989b View commit details
    Browse the repository at this point in the history

  3. Added property use_toolchain_profile to compile with specified profile

    @Psy-Kai
    Psy-Kai committed Nov 28, 2020
    Copy the full SHA
    72c82aa View commit details
    Browse the repository at this point in the history

  4. Set cpp.linkerFlags for LDFLAGS with -Wl and cpp.driverLinkerFlags for 

    LDFLAGS without -Wl
    @Psy-Kai
    Psy-Kai committed Nov 28, 2020
    Copy the full SHA
    6c52917 View commit details
    Browse the repository at this point in the history

  5. Made use_toolchain_profile non static

    @Psy-Kai
    Psy-Kai committed Nov 28, 2020
    Copy the full SHA
    56b4c24 View commit details
    Browse the repository at this point in the history

  6. Removed prints

    @Psy-Kai
    Psy-Kai committed Nov 28, 2020
    Copy the full SHA
    47f036d View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2020

  1. Put settings dir into quotes to support settings dir with spaces

    @Psy-Kai
    Psy-Kai committed Nov 30, 2020
    Copy the full SHA
    7813894 View commit details
    Browse the repository at this point in the history

  2. Moved qbs to conan/tools

    @Psy-Kai
    Psy-Kai committed Nov 30, 2020
    Copy the full SHA
    1d988b5 View commit details
    Browse the repository at this point in the history

  3. Renamed exception to be independent

    @Psy-Kai
    Psy-Kai committed Nov 30, 2020
    Copy the full SHA
    d4c5c75 View commit details
    Browse the repository at this point in the history

  4. Use the right import paths

    @Psy-Kai
    Psy-Kai committed Nov 30, 2020
    Copy the full SHA
    38e7992 View commit details
    Browse the repository at this point in the history

  5. Put settings-dir parameter in quotes in test

    @Psy-Kai
    Psy-Kai committed Nov 30, 2020
    Copy the full SHA
    1ba7782 View commit details
    Browse the repository at this point in the history

  6. Modified tests to assert for QbsToolchainException instead of 

    QbsException
    @Psy-Kai
    Psy-Kai committed Nov 30, 2020
    Copy the full SHA
    d436aec View commit details
    Browse the repository at this point in the history

  7. Use shlex.split and made LinkerFlagsParser much easier 

    This makes the module python 3.5 compatible
    @Psy-Kai
    Psy-Kai committed Nov 30, 2020
    Copy the full SHA
    2cf5fd6 View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2020

  1. Just convert True/False to true/false with _bool

    @Psy-Kai
    Psy-Kai committed Dec 10, 2020
    Copy the full SHA
    b9d4c09 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2020

  1. Merge branch 'develop' into feature/qbs-build-helper

    @memsharded
    memsharded committed Dec 16, 2020
    Copy the full SHA
    9516939 View commit details
    Browse the repository at this point in the history

  2. working

    @memsharded
    memsharded committed Dec 16, 2020
    Copy the full SHA
    a705782 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2020

  1. working

    @memsharded
    memsharded committed Dec 17, 2020
    Copy the full SHA
    9f69914 View commit details
    Browse the repository at this point in the history

  2. Fix MSVC+ClangCL compatibility

    @Psy-Kai
    Psy-Kai committed Dec 17, 2020
    Copy the full SHA
    84081f1 View commit details
    Browse the repository at this point in the history

  3. Adjusted test to last change 

    Missed to change test according to change
    @Psy-Kai
    Psy-Kai committed Dec 17, 2020
    Copy the full SHA
    0ef5587 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feature/qbs-build-helper' into feature/qbs-build-helper… 

    …-review
    @memsharded
    memsharded committed Dec 17, 2020
    Copy the full SHA
    85ee854 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into feature/qbs-build-helper

    @memsharded
    memsharded committed Dec 17, 2020
    Copy the full SHA
    21ac2b9 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'feature/qbs-build-helper' into feature/qbs-build-helper… 

    …-review
    @memsharded
    memsharded committed Dec 17, 2020
    Copy the full SHA
    c9f1d30 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2020

  1. returned back to qbs namespace

    @memsharded
    memsharded committed Dec 21, 2020
    Copy the full SHA
    ac1901c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from memsharded/feature/qbs-build-helper-review 

    Feature/qbs build helper review
    @Psy-Kai
    Psy-Kai committed Dec 21, 2020
    Copy the full SHA
    31cf1b3 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2020

  1. fixing tests PY2

    @memsharded
    memsharded committed Dec 22, 2020
    Copy the full SHA
    828a836 View commit details
    Browse the repository at this point in the history