From 3a16e6d72221f8c2352b65870e7283a67a7d3dc5 Mon Sep 17 00:00:00 2001 From: Dinu SV Date: Mon, 6 Feb 2017 20:59:38 +0200 Subject: [PATCH 1/8] Added ffmpeg lib to deploy path. --- 3rdparty/opencvconfig.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/3rdparty/opencvconfig.pro b/3rdparty/opencvconfig.pro index f72779587..c7553b577 100644 --- a/3rdparty/opencvconfig.pro +++ b/3rdparty/opencvconfig.pro @@ -56,6 +56,7 @@ win32{ defineTest(deployOpenCV){ copyCvDll($${OPENCV_DIR_DLLS}/opencv_world$${OPENCV_VERSION}.dll) + copyCvDll($${OPENCV_DIR_DLLS}/opencv_ffmpeg$${OPENCV_VERSION_FIND}_64.dll) } } From 5b10dea63a57fb8ded838f574c56d2888891572f Mon Sep 17 00:00:00 2001 From: Dinu SV Date: Mon, 6 Feb 2017 21:00:06 +0200 Subject: [PATCH 2/8] Fixed succession in which projects are created/closed. --- application/qml/main.qml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/application/qml/main.qml b/application/qml/main.qml index a119229aa..31f1ee1e5 100644 --- a/application/qml/main.qml +++ b/application/qml/main.qml @@ -172,7 +172,9 @@ ApplicationWindow { fileOpenDialog.open() } onOpenProject: { - dirOpenDialog.open() + closeProject(function(){ + dirOpenDialog.open() + }) } onSaveFile : { fileSaveDialog.open() @@ -242,9 +244,7 @@ ApplicationWindow { visible : isLinux ? true : false /// fixes a display bug in some linux distributions onAccepted: { - header.closeProject(function(){ - project.openProject(dirOpenDialog.fileUrl) - }) + project.openProject(dirOpenDialog.fileUrl) } Component.onCompleted: { visible = false From fde740b08e7ac850e9d2f76858c926579c2fb621 Mon Sep 17 00:00:00 2001 From: Dinu SV Date: Mon, 6 Feb 2017 21:01:00 +0200 Subject: [PATCH 3/8] Fixed completion issues when adding new imports. --- editor/lcveditor/src/qdocumentcodeinterface.cpp | 1 + editor/qmljsparser/src/qdocumentqmlhandler.cpp | 8 ++++++-- editor/qmljsparser/src/qqmlcompletioncontext.cpp | 2 ++ editor/qmljsparser/src/qqmlcompletioncontext.h | 11 ++++++----- .../src/qqmlcompletioncontextfinder.cpp | 10 +++++++++- plugins/lcvphoto/src/qdenoisetvl1.cpp | 15 +-------------- plugins/lcvphoto/src/qdenoisetvl1.h | 13 ------------- 7 files changed, 25 insertions(+), 35 deletions(-) diff --git a/editor/lcveditor/src/qdocumentcodeinterface.cpp b/editor/lcveditor/src/qdocumentcodeinterface.cpp index 66d0642ea..b93dae0c7 100644 --- a/editor/lcveditor/src/qdocumentcodeinterface.cpp +++ b/editor/lcveditor/src/qdocumentcodeinterface.cpp @@ -105,6 +105,7 @@ void QDocumentCodeInterface::setDocument(QProjectDocument *document){ void QDocumentCodeInterface::generateCompletion(int cursorPosition){ if ( m_target && m_codeHandler ){ + m_lastChar = QChar(); QTextCursor cursor(m_target->textDocument()); cursor.setPosition(cursorPosition); QTextCursor newCursor; diff --git a/editor/qmljsparser/src/qdocumentqmlhandler.cpp b/editor/qmljsparser/src/qdocumentqmlhandler.cpp index 557f41300..c4b27cf77 100644 --- a/editor/qmljsparser/src/qdocumentqmlhandler.cpp +++ b/editor/qmljsparser/src/qdocumentqmlhandler.cpp @@ -670,8 +670,12 @@ void QDocumentQmlHandler::assistCompletion( model->setSuggestions(suggestions, filter); } } else if ( ctx->context() & QQmlCompletionContext::InImport ){ - suggestionsForImport(*ctx, suggestions); - model->setSuggestions(suggestions, filter); + if ( ctx->context() & QQmlCompletionContext::InImportVersion ){ + model->setSuggestions(suggestions, filter); + } else { + suggestionsForImport(*ctx, suggestions); + model->setSuggestions(suggestions, filter); + } } else if ( ctx->context() & QQmlCompletionContext::InAfterOnLhsOfBinding ){ suggestionsForLeftSignalBind(*ctx, cursor.position(), suggestions); model->setSuggestions(suggestions, filter); diff --git a/editor/qmljsparser/src/qqmlcompletioncontext.cpp b/editor/qmljsparser/src/qqmlcompletioncontext.cpp index 6a9eecdce..a60a2fab7 100644 --- a/editor/qmljsparser/src/qqmlcompletioncontext.cpp +++ b/editor/qmljsparser/src/qqmlcompletioncontext.cpp @@ -37,6 +37,8 @@ QString QQmlCompletionContext::contextString() const{ QString base; if ( m_context & QQmlCompletionContext::InImport) base += "InImport"; + if ( m_context & QQmlCompletionContext::InImportVersion) + base += base.isEmpty() ? "InImportVersion" : " | InImportVersion"; if ( m_context & QQmlCompletionContext::InQml) base += base.isEmpty() ? "InQml" : " | InQml"; if ( m_context & QQmlCompletionContext::InLhsOfBinding) diff --git a/editor/qmljsparser/src/qqmlcompletioncontext.h b/editor/qmljsparser/src/qqmlcompletioncontext.h index 64c3eacdd..3bc8ca090 100644 --- a/editor/qmljsparser/src/qqmlcompletioncontext.h +++ b/editor/qmljsparser/src/qqmlcompletioncontext.h @@ -30,11 +30,12 @@ class Q_QMLJSPARSER_EXPORT QQmlCompletionContext : public QCodeCompletionContext public: enum Context{ InImport = 1, - InQml = 2, - InLhsOfBinding = 4, - InRhsofBinding = 8, - InAfterOnLhsOfBinding = 16, - InStringLiteral = 32, + InImportVersion = 2, + InQml = 4, + InLhsOfBinding = 8, + InRhsofBinding = 16, + InAfterOnLhsOfBinding = 32, + InStringLiteral = 64, }; public: diff --git a/editor/qmljsparser/src/qqmlcompletioncontextfinder.cpp b/editor/qmljsparser/src/qqmlcompletioncontextfinder.cpp index 5609dc2d8..e8124436a 100644 --- a/editor/qmljsparser/src/qqmlcompletioncontextfinder.cpp +++ b/editor/qmljsparser/src/qqmlcompletioncontextfinder.cpp @@ -162,10 +162,18 @@ QQmlCompletionContext *QQmlCompletionContextFinder::getContext(const QTextCursor ExpressionUnderCursor euc; euc(cursor, &path); } + QStringList objectTypePath = finder.qmlObjectTypeName(); + + if ( finder.isInImport() && !finder.libVersionImport().isEmpty() ){ + if ( path.isEmpty() ){ + context |= QQmlCompletionContext::InImportVersion; + objectTypePath = finder.libVersionImport().split("."); + } + } return new QQmlCompletionContext( context, - finder.qmlObjectTypeName(), + objectTypePath, finder.bindingPropertyName(), path ); diff --git a/plugins/lcvphoto/src/qdenoisetvl1.cpp b/plugins/lcvphoto/src/qdenoisetvl1.cpp index 3c6a1decb..b65776ba3 100644 --- a/plugins/lcvphoto/src/qdenoisetvl1.cpp +++ b/plugins/lcvphoto/src/qdenoisetvl1.cpp @@ -14,19 +14,6 @@ ** ****************************************************************************/ -/**************************************************************************** -** -** This file is part of Live CV Application. -** -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -****************************************************************************/ #include "qdenoisetvl1.h" #include "opencv2/photo.hpp" @@ -76,7 +63,7 @@ void QDenoiseTvl1::setBufferSize(int bufferSize){ void QDenoiseTvl1::trimBuffer(int size){ if (m_matBuffer.size() > static_cast(size)){ - int elementsToDelete = m_matBuffer.size() - size; + size_t elementsToDelete = m_matBuffer.size() - size; m_matBuffer.erase(m_matBuffer.begin(), m_matBuffer.begin() + elementsToDelete); } } diff --git a/plugins/lcvphoto/src/qdenoisetvl1.h b/plugins/lcvphoto/src/qdenoisetvl1.h index c0cdf5a24..9eda26cc3 100644 --- a/plugins/lcvphoto/src/qdenoisetvl1.h +++ b/plugins/lcvphoto/src/qdenoisetvl1.h @@ -14,19 +14,6 @@ ** ****************************************************************************/ -/**************************************************************************** -** -** This file is part of Live CV Application. -** -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -****************************************************************************/ #ifndef QDENOISETVL1_HPP #define QDENOISETVL1_HPP From 8e1fff608704fdae1099ad4842333875919cdc43 Mon Sep 17 00:00:00 2001 From: Dinu SV Date: Mon, 6 Feb 2017 21:01:43 +0200 Subject: [PATCH 4/8] Fixed duplicates when importing the same library from multiple engine load paths. --- editor/qmljsparser/src/qprojectqmlscope.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/editor/qmljsparser/src/qprojectqmlscope.cpp b/editor/qmljsparser/src/qprojectqmlscope.cpp index 4e498a6a4..235ad538b 100644 --- a/editor/qmljsparser/src/qprojectqmlscope.cpp +++ b/editor/qmljsparser/src/qprojectqmlscope.cpp @@ -77,6 +77,8 @@ void QProjectQmlScope::findQmlLibraryInImports( versionMinor, newPaths ); + if ( !newPaths.isEmpty() ) + break; } if ( !newPaths.isEmpty() ) From b550642c2bc0f47310a55f0fa5534549dc0ff88c Mon Sep 17 00:00:00 2001 From: Dinu SV Date: Mon, 13 Feb 2017 23:30:37 +0200 Subject: [PATCH 5/8] Fixed import version completion. --- application/qml/LogWindow.qml | 2 ++ application/qml/main.qml | 8 ++++---- application/src/base/qlivecvlog.cpp | 12 ++++++------ application/src/base/qlivecvlog.h | 2 +- editor/lcveditor/src/qdocumentcodeinterface.cpp | 1 + editor/qmljsparser/src/qdocumentqmlhandler.cpp | 8 ++++++-- editor/qmljsparser/src/qprojectqmlscope.cpp | 2 ++ editor/qmljsparser/src/qqmlcompletioncontext.cpp | 2 ++ editor/qmljsparser/src/qqmlcompletioncontext.h | 11 ++++++----- .../qmljsparser/src/qqmlcompletioncontextfinder.cpp | 10 +++++++++- 10 files changed, 39 insertions(+), 19 deletions(-) diff --git a/application/qml/LogWindow.qml b/application/qml/LogWindow.qml index 101dabe5b..30b3512a3 100644 --- a/application/qml/LogWindow.qml +++ b/application/qml/LogWindow.qml @@ -67,11 +67,13 @@ Window { if ( logScroll.flickableItem.contentHeight > logScroll.height ) logScroll.flickableItem.contentY = logScroll.flickableItem.contentHeight - logScroll.height } + selectByMouse: true textFormat: Text.RichText readOnly: true font.family: "Source Code Pro, Ubuntu Mono, Courier New, Courier" font.pixelSize: 12 color : "#eee" + selectionColor: "#333" } } diff --git a/application/qml/main.qml b/application/qml/main.qml index a119229aa..31f1ee1e5 100644 --- a/application/qml/main.qml +++ b/application/qml/main.qml @@ -172,7 +172,9 @@ ApplicationWindow { fileOpenDialog.open() } onOpenProject: { - dirOpenDialog.open() + closeProject(function(){ + dirOpenDialog.open() + }) } onSaveFile : { fileSaveDialog.open() @@ -242,9 +244,7 @@ ApplicationWindow { visible : isLinux ? true : false /// fixes a display bug in some linux distributions onAccepted: { - header.closeProject(function(){ - project.openProject(dirOpenDialog.fileUrl) - }) + project.openProject(dirOpenDialog.fileUrl) } Component.onCompleted: { visible = false diff --git a/application/src/base/qlivecvlog.cpp b/application/src/base/qlivecvlog.cpp index 4fbdd6ce0..a9add7d20 100644 --- a/application/src/base/qlivecvlog.cpp +++ b/application/src/base/qlivecvlog.cpp @@ -28,33 +28,33 @@ QLiveCVLog::~QLiveCVLog(){ delete m_logFile; } -void QLiveCVLog::logMessage(QtMsgType type, const QMessageLogContext&, const QString& msg){ +void QLiveCVLog::logMessage(QtMsgType type, const QMessageLogContext&, QString msg){ m_logMutex.lock(); switch (type){ case QtInfoMsg: if ( isFileLogEnabled() ) m_textStream << "Info : " << msg << "\n"; - m_data.append(msg + "
"); + m_data.append(msg.replace("\n","
") + "
"); break; case QtDebugMsg: if ( isFileLogEnabled() ) m_textStream << "Debug : " << msg << "\n"; - m_data.append(msg + "
"); + m_data.append(msg.replace("\n","
") + "
"); break; case QtWarningMsg: if ( isFileLogEnabled() ) m_textStream << "Warning : " << msg << "\n"; - m_data.append("" + msg + "
"); + m_data.append("" + msg.replace("\n","
") + "
"); break; case QtCriticalMsg: if ( isFileLogEnabled() ) m_textStream << "Critical : " << msg; - m_data.append("" + msg + "
"); + m_data.append("" + msg.replace("\n","
") + "
"); break; case QtFatalMsg: if ( isFileLogEnabled() ) m_textStream << "Fatal : " << msg; - m_data.append("" + msg + "
"); + m_data.append("" + msg.replace("\n","
") + "
"); break; } m_logMutex.unlock(); diff --git a/application/src/base/qlivecvlog.h b/application/src/base/qlivecvlog.h index cc56de852..9d07ab659 100644 --- a/application/src/base/qlivecvlog.h +++ b/application/src/base/qlivecvlog.h @@ -47,7 +47,7 @@ class QLiveCVLog : public QObject{ void dataChanged(); public slots: - void logMessage(QtMsgType type, const QMessageLogContext& ctx, const QString& msg); + void logMessage(QtMsgType type, const QMessageLogContext& ctx, QString msg); private: QString m_data; diff --git a/editor/lcveditor/src/qdocumentcodeinterface.cpp b/editor/lcveditor/src/qdocumentcodeinterface.cpp index 66d0642ea..b93dae0c7 100644 --- a/editor/lcveditor/src/qdocumentcodeinterface.cpp +++ b/editor/lcveditor/src/qdocumentcodeinterface.cpp @@ -105,6 +105,7 @@ void QDocumentCodeInterface::setDocument(QProjectDocument *document){ void QDocumentCodeInterface::generateCompletion(int cursorPosition){ if ( m_target && m_codeHandler ){ + m_lastChar = QChar(); QTextCursor cursor(m_target->textDocument()); cursor.setPosition(cursorPosition); QTextCursor newCursor; diff --git a/editor/qmljsparser/src/qdocumentqmlhandler.cpp b/editor/qmljsparser/src/qdocumentqmlhandler.cpp index 557f41300..3ba3dd8e5 100644 --- a/editor/qmljsparser/src/qdocumentqmlhandler.cpp +++ b/editor/qmljsparser/src/qdocumentqmlhandler.cpp @@ -670,8 +670,12 @@ void QDocumentQmlHandler::assistCompletion( model->setSuggestions(suggestions, filter); } } else if ( ctx->context() & QQmlCompletionContext::InImport ){ - suggestionsForImport(*ctx, suggestions); - model->setSuggestions(suggestions, filter); + if ( ctx->context() & QQmlCompletionContext::InImportVersion){ + model->setSuggestions(suggestions, filter); + } else { + suggestionsForImport(*ctx, suggestions); + model->setSuggestions(suggestions, filter); + } } else if ( ctx->context() & QQmlCompletionContext::InAfterOnLhsOfBinding ){ suggestionsForLeftSignalBind(*ctx, cursor.position(), suggestions); model->setSuggestions(suggestions, filter); diff --git a/editor/qmljsparser/src/qprojectqmlscope.cpp b/editor/qmljsparser/src/qprojectqmlscope.cpp index 4e498a6a4..fd3750459 100644 --- a/editor/qmljsparser/src/qprojectqmlscope.cpp +++ b/editor/qmljsparser/src/qprojectqmlscope.cpp @@ -77,6 +77,8 @@ void QProjectQmlScope::findQmlLibraryInImports( versionMinor, newPaths ); + if ( !newPaths.isEmpty() ) // avoid duplicates in multiple import paths + break; } if ( !newPaths.isEmpty() ) diff --git a/editor/qmljsparser/src/qqmlcompletioncontext.cpp b/editor/qmljsparser/src/qqmlcompletioncontext.cpp index 6a9eecdce..a60a2fab7 100644 --- a/editor/qmljsparser/src/qqmlcompletioncontext.cpp +++ b/editor/qmljsparser/src/qqmlcompletioncontext.cpp @@ -37,6 +37,8 @@ QString QQmlCompletionContext::contextString() const{ QString base; if ( m_context & QQmlCompletionContext::InImport) base += "InImport"; + if ( m_context & QQmlCompletionContext::InImportVersion) + base += base.isEmpty() ? "InImportVersion" : " | InImportVersion"; if ( m_context & QQmlCompletionContext::InQml) base += base.isEmpty() ? "InQml" : " | InQml"; if ( m_context & QQmlCompletionContext::InLhsOfBinding) diff --git a/editor/qmljsparser/src/qqmlcompletioncontext.h b/editor/qmljsparser/src/qqmlcompletioncontext.h index 64c3eacdd..3bc8ca090 100644 --- a/editor/qmljsparser/src/qqmlcompletioncontext.h +++ b/editor/qmljsparser/src/qqmlcompletioncontext.h @@ -30,11 +30,12 @@ class Q_QMLJSPARSER_EXPORT QQmlCompletionContext : public QCodeCompletionContext public: enum Context{ InImport = 1, - InQml = 2, - InLhsOfBinding = 4, - InRhsofBinding = 8, - InAfterOnLhsOfBinding = 16, - InStringLiteral = 32, + InImportVersion = 2, + InQml = 4, + InLhsOfBinding = 8, + InRhsofBinding = 16, + InAfterOnLhsOfBinding = 32, + InStringLiteral = 64, }; public: diff --git a/editor/qmljsparser/src/qqmlcompletioncontextfinder.cpp b/editor/qmljsparser/src/qqmlcompletioncontextfinder.cpp index 5609dc2d8..e8124436a 100644 --- a/editor/qmljsparser/src/qqmlcompletioncontextfinder.cpp +++ b/editor/qmljsparser/src/qqmlcompletioncontextfinder.cpp @@ -162,10 +162,18 @@ QQmlCompletionContext *QQmlCompletionContextFinder::getContext(const QTextCursor ExpressionUnderCursor euc; euc(cursor, &path); } + QStringList objectTypePath = finder.qmlObjectTypeName(); + + if ( finder.isInImport() && !finder.libVersionImport().isEmpty() ){ + if ( path.isEmpty() ){ + context |= QQmlCompletionContext::InImportVersion; + objectTypePath = finder.libVersionImport().split("."); + } + } return new QQmlCompletionContext( context, - finder.qmlObjectTypeName(), + objectTypePath, finder.bindingPropertyName(), path ); From d8578f31d2a9aaa74e66afa9656448c7fef355a9 Mon Sep 17 00:00:00 2001 From: Dinu SV Date: Tue, 14 Feb 2017 23:25:17 +0200 Subject: [PATCH 6/8] Added appveyor build. --- appveyor.yml | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 000000000..b46da3a5c --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,55 @@ +os: unstable + +platform: + - x64 + +environment: + matrix: + - PYTHON: "C:\\Python35" + PYTHON_VERSION: "3.5.0" + PYTHON_ARCH: "32" + +install: + - choco install opencv -version 3.1.0.20160701 + +before_build: + - SET ARCH=x64 + - SET APP_PATH=%CD% + - IF EXIST C:\tools\OpenCV* CD C:\tools* + - SET OPENCV_ROOT_PATH=%CD%\opencv + - CD %APP_PATH% + - SET OPENCV_DIR=%OPENCV_ROOT_PATH%\build\%ARCH%\vc12 + - SET QTDIR=C:\Qt\5.7\msvc2013_64 + +build_script: + - cd build + - echo %OPENCV_DIR% + - echo %QTDIR% + - ps: $file = "$pwd\deploy.zip" + - ps: (new-object System.Net.WebClient).Downloadfile("https://github.com/livecv/livecv-deploy-kit/archive/master.zip", $file) + - ps: 7z x -y $file -o"." + - SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH% + - mv livecv-deploy-kit-master/* . + - python --version + - python livecv_build.py -b 64 + - python livecv_deploy.py -b 64 + - dir + +artifacts: + - path: 'build\livecv-*.zip' + name: Release + +deploy: + release: $(APPVEYOR_REPO_TAG_NAME) + description: 'View Changelog.md for further details.' + provider: GitHub + auth_token: + secure: 'ewCMPMl6d/IVBZ0r/ZApqeh0NgF/0UMMtKTqvQcmTNFb3uK57XFyqbZBHLDICAVC' + artifact: /.*\.zip/ + draft: true + prerelease: false + on: + branch: master # release from master branch only + appveyor_repo_tag: true + + From 345c9a72337c30ad0724df898b4471e90eb2d593 Mon Sep 17 00:00:00 2001 From: Dinu SV Date: Tue, 14 Feb 2017 23:43:49 +0200 Subject: [PATCH 7/8] Added travis file. --- .travis.yml | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..81852c416 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,84 @@ +language: cpp + +os: + - linux + +sudo: required +dist: trusty + +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - gcc-5 + - g++-5 + - build-essential + - cmake + - cmake-data + - git + - libgtk2.0-dev + - pkg-config + - libavcodec-dev + - libavformat-dev + - libswscale-dev + - python-dev + - python-numpy + - libtbb2 + - libtbb-dev + - libjpeg-dev + - libpng-dev + - libjasper-dev + - libdc1394-22-dev + - unzip + +#env: GCC_VERSION=5 CPP=11 COMPILER=g++-5 CXX=g++-5 CC=gcc-5 + +install: + - sudo apt-get install -y libtiff5 libtiff5-dev +# - sudo unlink /usr/bin/gcc && sudo ln -s /usr/bin/gcc-5 /usr/bin/gcc +# - sudo unlink /usr/bin/g++ && sudo ln -s /usr/bin/g++-5 /usr/bin/g++ + - git clone https://github.com/Itseez/opencv.git + - cd opencv + - mkdir build + - cd build + - cmake .. + - make -j8 + - sudo make -j8 install + - export OPENCV_DIR=/usr/local/lib + - cd ../../build + - wget https://github.com/livecv/livecv-deploy-kit/archive/master.zip + - unzip master.zip + - mv livecv-deploy-kit-master/* . + - wget http://download.qt.io/official_releases/qt/5.7/5.7.0/qt-opensource-linux-x64-5.7.0.run + - sudo chmod 777 qt-opensource-linux-x64-5.7.0.run + - ./qt-opensource-linux-x64-5.7.0.run --script resources/install-qt.qs --verbose --silent -platform minimal + - export QTDIR=/opt/qt/5.7/gcc_64 + + +script: + - ls + - python3 livecv_build.py + - ls + - python3 livecv_deploy.py -d gcc + - python3 livecv_deploy.py -d gcc_standalone + +before_deploy: + - ls + - ls *.tar.gz + - export LIVECV_STANDALONE=$(ls *.tar.gz | tail -n +1 | head -1) + - export LIVECV=$(ls *.tar.gz | tail -n +2 | head -1) + - echo ${LIVECV_STANDALONE} + - echo ${LIVECV} + +deploy: + provider: releases + api_key: + - secure: "uoyLbdtkGr8IDnyECv747iVkAsxMdqQR1v9wfwbEj4lsSHZ2E+Y3ShZMmV2AZUK86ajksBOvfMUYVo8P2JTQUsQtduu9SAIFF2MxxIVQbwmdF27cvnSUDFQjkU6h2UDNbgdi2I6rtH2g1Adhx/C45my0NQdvbhB9fEV3H+Z8g0YmoBDu3MZFGZknpf/PpNzaoGtHATo+0VooqCrAZhR9M1igGQF2ibU8z8E9xm04ehSjlMoXWv15GWmwOmkjQSe/mkeOUJ9Bl2LuIk3PcIv7uJNle5GgteQM+++iru59kZSXTLqih2peZVT7BLQ3c4gUZCtLASFPXwoQH2n4VMz4OeGv4b9LMw9bvwQ+eM8//enDDyIy2fP6KQu2BdLIScNX6B4eitxVMEcOXRHOc4xmlXqNloCOtGONaZ7w3OnwPj/O38ThM8c4riq1sh1TFBabRge8VGkBiKU3cDYPdGM2uMxST0swcrgBqu0UZ45xCftbF1tqJjs6K6ZS1v298KVlHcxyfdSJTDKCEOyTJXH6at2yYhQZ9RKrimZE5aiK0h3dsflKrmMXKDWWmQmAB7WxRQhNjEDuULvhq0f5z+oLDbL1hGSYM09196fyUDLeRY7wdYoIVaH3ebk5j6b+ar9RaQ16MoERBxR1ULUcs5gJHxCWPwyb4jRZBeMJJwzNF3Q=" + file_glob: true + file: + - "${LIVECV_STANDALONE}" + - "${LIVECV}" + skip_cleanup: true + on: + tags: true From ba5913d6da26d2414e5d7d9e71ac32d0257b37ce Mon Sep 17 00:00:00 2001 From: Dinu SV Date: Tue, 14 Feb 2017 23:48:07 +0200 Subject: [PATCH 8/8] Added travis and appveyor badges. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index d74d0cd6a..f14da1f06 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ ![Live CV](/doc/src/images/logo-dark.png) [![Join the chat at https://gitter.im/dinusv/livecv](https://badges.gitter.im/dinusv/livecv.svg)](https://gitter.im/dinusv/livecv?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +[![Build Status](https://travis-ci.org/livecv/livecv.svg?branch=master)](https://travis-ci.org/livecv/livecv) +[![Build status](https://ci.appveyor.com/api/projects/status/c1kk7crl0wiox16b?svg=true)](https://ci.appveyor.com/project/dinusv/livecv) * **Version**: 1.3.0 * **License**: LGPL