diff --git a/.travis.yml b/.travis.yml index 756d643..7f35ff2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,6 @@ python: - 3.6 services: - docker -branches: - only: - - deploy before_install: - pip install docker - pip install pyaml @@ -17,32 +14,19 @@ env: - secure: cCBqL4SXhRodrrZydl8KarefizmhJMyWRuywleeIaluiIt1OM1S2JpwAg2tWNN3pjrLhXQIOeSYR4Q6R4eaVp9YcmWB6gkiYRdnjWHsaufnviz0Dz2KJrSMDAcMAOFWIQwEmXxI2znAKitBnpjAZOVgOqFKeLfAFhDPlQbM4S++n0rKUL4sMCrrUv+DskPGlreH0LFzHzL3OnzkKBRg73bQ8sXAnwJZKU1VV+xNetBKB4CQwS2jPcfHUZC7OJJB0795uGCC8DiTA+VY+T8frpeH7NhD6gAyEwq5QG5oO7l+sVBFfWWJWX8Zi8qCBq4KAPxv48UHPqc/DlawDyszSC6PpTZv4slvn55gvh5lIrUJp4/29Zcr+0MFj9J+3/j/d9YldZ0lqjPisAM44h2TXQs7jnu4o1YMlZQQ7q2yxyDGG/SMe4P+wJLQgOdWUmSqdAyl3D1krrfVPV3LiEYgDugsYVZP40Ooh45S8t9pc3AIUP+R1nQT3UZ/2Nkx6WDTMzkXVcRYEA3t50oX+QzOpX6oyuThhS+N1sbPH9sQbrhLGjYAIHmF/Vt9JsYeP84ju7rZg3ml6WT0TBVioAPfDbEDQZoCKBz8P+wMqR13jcrAH837sEHttrP8keaZ1An5pvZOG9THeKiIagH/hwlVkcgg9AzPz2YGq96f2C6rnE70= matrix: - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=13 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=13 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=5 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=4 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=3 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=2 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=3 QT_DOWNLOAD_BRANCH=archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=2 QT_DOWNLOAD_BRANCH=archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=10 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=10 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=8 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=7 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=6 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=5 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=4 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=3 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=2 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=3 QT_DOWNLOAD_BRANCH=archive QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=2 QT_DOWNLOAD_BRANCH=archive QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=1-1 QT_DOWNLOAD_BRANCH=archive QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=archive QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=1 + stages: - test - merge @@ -57,20 +41,4 @@ script: - tests/generate_tests.py || travis_terminate 1; - docker run --rm -u $UID -v $PWD/tests:/var/build darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH build || travis_terminate 1; - docker run --rm -u $UID -v $PWD/tests:/var/build darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH /var/build/run-tests.sh /var/build/build || travis_terminate 1; - - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi' - - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi' - - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:base-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi' - - python ci/tag_image.py darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; - - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then python ci/push_images.py darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH; fi' -jobs: - include: - - stage: merge - if: type != pull_request - script: - - export GIT_COMMITTER_EMAIL="travis-ci-bot@jochenbauer.net" - - export GIT_COMMITTER_NAME="Travis CI bot" - - git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* || exit - - git fetch --all || exit - - git checkout master || exit - - git rebase deploy || exit - - git push https://${GITHUB_ACCESS_TOKEN}@github.com/darkmattercoder/qt-build.git + diff --git a/Dockerfile b/Dockerfile index 377716e..76517b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,6 +30,9 @@ RUN apt-get update && apt-get -y dist-upgrade && apt-get -y --no-install-recomme pkg-config \ libgl1-mesa-dev \ libicu-dev \ + firebird-dev \ + libmysqlclient-dev \ + libpq-dev \ # bc suggested for openssl tests bc \ libssl-dev \ diff --git a/buildconfig/configure-5.10.0.sh b/buildconfig/configure-5.10.0.sh index 12061d5..fba221a 100644 --- a/buildconfig/configure-5.10.0.sh +++ b/buildconfig/configure-5.10.0.sh @@ -1,2 +1,3 @@ #!/bin/sh +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb \ No newline at end of file diff --git a/buildconfig/configure-5.10.1.sh b/buildconfig/configure-5.10.1.sh index 12061d5..fba221a 100644 --- a/buildconfig/configure-5.10.1.sh +++ b/buildconfig/configure-5.10.1.sh @@ -1,2 +1,3 @@ #!/bin/sh +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb \ No newline at end of file diff --git a/buildconfig/configure-5.11.0.sh b/buildconfig/configure-5.11.0.sh index 12061d5..fba221a 100644 --- a/buildconfig/configure-5.11.0.sh +++ b/buildconfig/configure-5.11.0.sh @@ -1,2 +1,3 @@ #!/bin/sh +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb \ No newline at end of file diff --git a/buildconfig/configure-5.11.1.sh b/buildconfig/configure-5.11.1.sh index 12061d5..fba221a 100644 --- a/buildconfig/configure-5.11.1.sh +++ b/buildconfig/configure-5.11.1.sh @@ -1,2 +1,3 @@ #!/bin/sh +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb \ No newline at end of file diff --git a/buildconfig/configure-5.11.2.sh b/buildconfig/configure-5.11.2.sh index 12061d5..fba221a 100644 --- a/buildconfig/configure-5.11.2.sh +++ b/buildconfig/configure-5.11.2.sh @@ -1,2 +1,3 @@ #!/bin/sh +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb \ No newline at end of file diff --git a/buildconfig/configure-5.11.3.sh b/buildconfig/configure-5.11.3.sh index 12061d5..fba221a 100644 --- a/buildconfig/configure-5.11.3.sh +++ b/buildconfig/configure-5.11.3.sh @@ -1,2 +1,3 @@ #!/bin/sh +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb \ No newline at end of file diff --git a/buildconfig/configure-5.12.0.sh b/buildconfig/configure-5.12.0.sh index 12061d5..fba221a 100644 --- a/buildconfig/configure-5.12.0.sh +++ b/buildconfig/configure-5.12.0.sh @@ -1,2 +1,3 @@ #!/bin/sh +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb \ No newline at end of file diff --git a/buildconfig/configure-5.12.1.sh b/buildconfig/configure-5.12.1.sh index f330655..8708c02 100644 --- a/buildconfig/configure-5.12.1.sh +++ b/buildconfig/configure-5.12.1.sh @@ -1,2 +1,3 @@ #!/bin/sh +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests \ No newline at end of file diff --git a/buildconfig/configure-5.12.2.sh b/buildconfig/configure-5.12.2.sh index f330655..8708c02 100644 --- a/buildconfig/configure-5.12.2.sh +++ b/buildconfig/configure-5.12.2.sh @@ -1,2 +1,3 @@ #!/bin/sh +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests \ No newline at end of file diff --git a/buildconfig/configure-5.12.3.sh b/buildconfig/configure-5.12.3.sh index f330655..8708c02 100644 --- a/buildconfig/configure-5.12.3.sh +++ b/buildconfig/configure-5.12.3.sh @@ -1,2 +1,3 @@ #!/bin/sh +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests \ No newline at end of file diff --git a/buildconfig/configure-5.12.4.sh b/buildconfig/configure-5.12.4.sh index f330655..8708c02 100644 --- a/buildconfig/configure-5.12.4.sh +++ b/buildconfig/configure-5.12.4.sh @@ -1,2 +1,3 @@ #!/bin/sh +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests \ No newline at end of file diff --git a/buildconfig/configure-5.12.5.sh b/buildconfig/configure-5.12.5.sh index f330655..8708c02 100644 --- a/buildconfig/configure-5.12.5.sh +++ b/buildconfig/configure-5.12.5.sh @@ -1,2 +1,3 @@ #!/bin/sh +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests \ No newline at end of file diff --git a/buildconfig/configure-5.13.0.sh b/buildconfig/configure-5.13.0.sh index f330655..8708c02 100644 --- a/buildconfig/configure-5.13.0.sh +++ b/buildconfig/configure-5.13.0.sh @@ -1,2 +1,3 @@ #!/bin/sh +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests \ No newline at end of file diff --git a/buildconfig/configure-5.13.1.sh b/buildconfig/configure-5.13.1.sh index f330655..8708c02 100644 --- a/buildconfig/configure-5.13.1.sh +++ b/buildconfig/configure-5.13.1.sh @@ -1,2 +1,3 @@ #!/bin/sh +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests \ No newline at end of file diff --git a/buildconfig/configure-5.9.1.sh b/buildconfig/configure-5.9.1.sh index b285caf..cfe77d4 100644 --- a/buildconfig/configure-5.9.1.sh +++ b/buildconfig/configure-5.9.1.sh @@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT make test > /dev/null 2>&1 || make test make install > /dev/null 2>&1 || make install cd .. +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib mkdir -p /opt/extra-dependencies/lib cp -r /opt/openssl_build_stable /opt/extra-dependencies diff --git a/buildconfig/configure-5.9.2.sh b/buildconfig/configure-5.9.2.sh index b285caf..cfe77d4 100644 --- a/buildconfig/configure-5.9.2.sh +++ b/buildconfig/configure-5.9.2.sh @@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT make test > /dev/null 2>&1 || make test make install > /dev/null 2>&1 || make install cd .. +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib mkdir -p /opt/extra-dependencies/lib cp -r /opt/openssl_build_stable /opt/extra-dependencies diff --git a/buildconfig/configure-5.9.3.sh b/buildconfig/configure-5.9.3.sh index b285caf..cfe77d4 100644 --- a/buildconfig/configure-5.9.3.sh +++ b/buildconfig/configure-5.9.3.sh @@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT make test > /dev/null 2>&1 || make test make install > /dev/null 2>&1 || make install cd .. +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib mkdir -p /opt/extra-dependencies/lib cp -r /opt/openssl_build_stable /opt/extra-dependencies diff --git a/buildconfig/configure-5.9.4.sh b/buildconfig/configure-5.9.4.sh index b285caf..cfe77d4 100644 --- a/buildconfig/configure-5.9.4.sh +++ b/buildconfig/configure-5.9.4.sh @@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT make test > /dev/null 2>&1 || make test make install > /dev/null 2>&1 || make install cd .. +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib mkdir -p /opt/extra-dependencies/lib cp -r /opt/openssl_build_stable /opt/extra-dependencies diff --git a/buildconfig/configure-5.9.5.sh b/buildconfig/configure-5.9.5.sh index b285caf..cfe77d4 100644 --- a/buildconfig/configure-5.9.5.sh +++ b/buildconfig/configure-5.9.5.sh @@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT make test > /dev/null 2>&1 || make test make install > /dev/null 2>&1 || make install cd .. +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib mkdir -p /opt/extra-dependencies/lib cp -r /opt/openssl_build_stable /opt/extra-dependencies diff --git a/buildconfig/configure-5.9.6.sh b/buildconfig/configure-5.9.6.sh index b285caf..cfe77d4 100644 --- a/buildconfig/configure-5.9.6.sh +++ b/buildconfig/configure-5.9.6.sh @@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT make test > /dev/null 2>&1 || make test make install > /dev/null 2>&1 || make install cd .. +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib mkdir -p /opt/extra-dependencies/lib cp -r /opt/openssl_build_stable /opt/extra-dependencies diff --git a/buildconfig/configure-5.9.7.sh b/buildconfig/configure-5.9.7.sh index b285caf..cfe77d4 100644 --- a/buildconfig/configure-5.9.7.sh +++ b/buildconfig/configure-5.9.7.sh @@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT make test > /dev/null 2>&1 || make test make install > /dev/null 2>&1 || make install cd .. +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib mkdir -p /opt/extra-dependencies/lib cp -r /opt/openssl_build_stable /opt/extra-dependencies diff --git a/buildconfig/configure-5.9.8.sh b/buildconfig/configure-5.9.8.sh index b285caf..cfe77d4 100644 --- a/buildconfig/configure-5.9.8.sh +++ b/buildconfig/configure-5.9.8.sh @@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT make test > /dev/null 2>&1 || make test make install > /dev/null 2>&1 || make install cd .. +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib mkdir -p /opt/extra-dependencies/lib cp -r /opt/openssl_build_stable /opt/extra-dependencies diff --git a/tests/sqldrivers/main.cpp b/tests/sqldrivers/main.cpp new file mode 100644 index 0000000..9e17542 --- /dev/null +++ b/tests/sqldrivers/main.cpp @@ -0,0 +1,7 @@ +#include +#include +int main() +{ + qDebug() << QSqlDatabase::drivers(); + return 0; +} diff --git a/tests/sqldrivers/sqldrivers.pro b/tests/sqldrivers/sqldrivers.pro new file mode 100644 index 0000000..2c445c0 --- /dev/null +++ b/tests/sqldrivers/sqldrivers.pro @@ -0,0 +1,7 @@ +QT += core sql +QT -= gui +TARGET = sqldrivers +CONFIG += console +CONFIG -= app_bundle +TEMPLATE = app +SOURCES += main.cpp