Skip to content

Commit

Permalink
Remove legacy/unused/unsuppported code & files
Browse files Browse the repository at this point in the history
-Update .travis.yml
-Restart app automatically on settings change
-Fix unit tests compilation
-Update Info.plist.sample
-Update rdm.icns
-Update logo
  • Loading branch information
uglide committed Aug 9, 2019
1 parent b2113fa commit bdd0dd7
Show file tree
Hide file tree
Showing 35 changed files with 92 additions and 922 deletions.
27 changes: 19 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,36 @@
language: cpp
dist: trusty
dist: bionic
sudo: required

os:
- linux
- osx


addons:
apt:
sources:
- ppa:chris-lea/redis-server
packages:
- redis-tools
- redis-server

services:
- redis-server

install:
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then
brew update > /dev/null
&& brew install qt5 > /dev/null
&& brew install openssl > /dev/null
&& export PATH=/usr/local/opt/qt5/bin/:$PATH
;
fi
- pushd src && ./configure && popd
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then
source /opt/qt59/bin/qt59-env.sh
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then
sudo apt-get install qt5-default qtdeclarative5-dev libqt5charts5-dev libssl1.0-dev -y
;
fi
- qmake -v

script:
- git submodule update --init --recursive
- pushd tests
Expand All @@ -29,12 +41,11 @@ script:
pushd src && qmake && make -s -j 2 && popd
;
fi

after_success:
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then
pushd tests &&
sudo pip install --upgrade cpp-coveralls &&
coveralls -b `pwd`/unit_tests/ -r `readlink -m ./../` -e 3rdparty/ -e tests/ -E .+/moc_.* -E .+/qrc_.* -E .+/qxt.* -E .+/ui_.*
;
fi
services:
- redis-server
fi
60 changes: 3 additions & 57 deletions 3rdparty/3rdparty.pri
Original file line number Diff line number Diff line change
Expand Up @@ -25,64 +25,20 @@ if(win32*):exists( $$PWD/qredisclient/qredisclient.lib ) {
#PyOtherSide
include($$PWD/pyotherside.pri)

# Google breakpad
BREAKPADDIR = $$PWD/gbreakpad/src
DEPENDPATH += $$BREAKPADDIR

INCLUDEPATH += $$BREAKPADDIR/
INCLUDEPATH += $$BREAKPADDIR/src

#breakpad app need debug info inside binaries
win32-msvc* {
QMAKE_CXXFLAGS += /MP
QMAKE_LFLAGS_RELEASE += /MAP
QMAKE_CFLAGS_RELEASE += /Zi
QMAKE_LFLAGS_RELEASE += /debug /opt:ref
} else {
QMAKE_CXXFLAGS+=-g
QMAKE_CFLAGS_RELEASE+=-g
}

win32* {
win32-g++ {
# Workaround for mingw
QMAKE_LFLAGS_RELEASE=
}

HEADERS += $$BREAKPADDIR/common/windows/string_utils-inl.h
HEADERS += $$BREAKPADDIR/common/windows/guid_string.h
HEADERS += $$BREAKPADDIR/client/windows/handler/exception_handler.h
HEADERS += $$BREAKPADDIR/client/windows/common/ipc_protocol.h
HEADERS += $$BREAKPADDIR/google_breakpad/common/minidump_format.h
HEADERS += $$BREAKPADDIR/google_breakpad/common/breakpad_types.h
HEADERS += $$BREAKPADDIR/client/windows/crash_generation/crash_generation_client.h
HEADERS += $$BREAKPADDIR/common/scoped_ptr.h
SOURCES += $$BREAKPADDIR/client/windows/handler/exception_handler.cc
SOURCES += $$BREAKPADDIR/common/windows/string_utils.cc
SOURCES += $$BREAKPADDIR/common/windows/guid_string.cc
SOURCES += $$BREAKPADDIR/client/windows/crash_generation/crash_generation_client.cc

win32* {
ZLIBDIR = $$PWD/zlib-msvc14-x64.1.2.11.7795/build/native
INCLUDEPATH += $$ZLIBDIR/include
LIBS += $$ZLIBDIR/lib_release/zlibstatic.lib
}

unix:macx { # OSX
PRE_TARGETDEPS += $$PWD/../build/gbreakpad/Products/Release/Breakpad.framework
LIBS += $$PWD/../build/gbreakpad/Products/Release/Breakpad.framework/Versions/A/Breakpad
LIBS += /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation
LIBS += /System/Library/Frameworks/CoreServices.framework/Versions/A/CoreServices
LIBS += -lz

#deployment
APP_DATA_FILES.files = $$PWD/../build/gbreakpad/Products/Release/Breakpad.framework
APP_DATA_FILES.path = Contents/Frameworks
QMAKE_BUNDLE_DATA += APP_DATA_FILES
}

unix:!macx { # ubuntu & debian
QMAKE_CXXFLAGS += -std=gnu++0x #workaround for google breakpad

unix:!macx { # ubuntu & debian
defined(CLEAN_RPATH, var) { # clean default flags
message("DEB package build")
QMAKE_LFLAGS_RPATH=
Expand All @@ -93,15 +49,5 @@ unix:!macx { # ubuntu & debian
#QMAKE_LFLAGS = -Wl,-rpath=/home/user/Qt5.9.3/5.9.3/gcc_64/lib
}

LIBS += $$BREAKPADDIR/client/linux/libbreakpad_client.a -lz

# Unix signal watcher
defined(LINUX_SIGNALS, var) {
DEFINES += LINUX_SIGNALS

HEADERS += $$PWD/qt-unix-signals/sigwatch.h
HEADERS += $$PWD/qt-unix-signals/sigwatch_p.h
SOURCES += $$PWD/qt-unix-signals/sigwatch.cpp
INCLUDEPATH += $$PWD/qt-unix-signals/
}
LIBS += -lz
}
1 change: 0 additions & 1 deletion 3rdparty/crashreporter
Submodule crashreporter deleted from 0202f9
1 change: 0 additions & 1 deletion 3rdparty/gbreakpad
Submodule gbreakpad deleted from 4a6d7c
4 changes: 0 additions & 4 deletions 3rdparty/pyotherside.pri
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@ INCLUDEPATH += $$PWD/pyotherside/src

PYOTHERSIDE_DIR = $$PWD/pyotherside/src/

# QML Image Provider
SOURCES += $$PYOTHERSIDE_DIR/qpython_imageprovider.cpp
HEADERS += $$PYOTHERSIDE_DIR/qpython_imageprovider.h

# Importer from Qt Resources
RESOURCES += $$PYOTHERSIDE_DIR/qrc_importer.qrc

Expand Down
1 change: 0 additions & 1 deletion 3rdparty/qt-unix-signals
Submodule qt-unix-signals deleted from d6a1d1
198 changes: 0 additions & 198 deletions build/common_functions

This file was deleted.

5 changes: 0 additions & 5 deletions build/debian/changelog

This file was deleted.

1 change: 0 additions & 1 deletion build/debian/compat

This file was deleted.

15 changes: 0 additions & 15 deletions build/debian/control

This file was deleted.

Loading

0 comments on commit bdd0dd7

Please sign in to comment.