Moving Quazip and QExtSerialPort to external libraries for mac and unix

3rdparty/3rdparty.pro

@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 
-SUBDIRS = qextserialport quazip
+SUBDIRS = quazip qextserialport
 
 CONFIG += ordered
 

3rdparty/qextserialport/.gitignore

@@ -1,47 +0,0 @@
-syntax: glob
-*.pro.user*
-*.app
-*.moc
-*.prl
-Makefile*
-doc/html/
-*.framework/
-*.xcodeproj/
-debug/
-release/
-qtc-gdbmacros/
-*.rej
-*.orig
-*.obj
-*.swp
-*.dll
-*.exp
-*.ilk
-*.pdb
-*.lib
-Thumbs.db
-moc_*.cpp
-qrc_*.cpp
-*.o
-*.so.*
-*.so
-*.pdb
-ui_*.h
-*~
-.qmake.cache
-extserialport.prf
-lib/*
-*.orig
-*.exe
-*.vcproj
-*.vcproj.*.user
-*_resource.rc
-*.sln
-*.idb
-*.ncb
-*.suo
-examples/enumerator/enumerator
-examples/event/event
-examples/qespta/qespta
-examples/uartassistant/uartassistant
-object_script.*

3rdparty/qextserialport/qextserialport.pro

@@ -4,7 +4,7 @@
 # CONFIG += qesp_static
 
 # Uncomment following line if you want to build framework for mac
-# macx:CONFIG += qesp_mac_framework
+#macx:CONFIG += qesp_mac_framework
 
 # Uncomment following line if you want to enable udev for linux
 # linux*:CONFIG += qesp_linux_udev
@@ -70,7 +70,6 @@ greaterThan(QT_MAJOR_VERSION, 4) {
     QESP_LIB_BASENAME = qextserialport
 }
 TARGET = $$qextLibraryName($$QESP_LIB_BASENAME)
-
 VERSION = 1.2.0
 
 # generate feature file by qmake based on this *.in file.
@@ -78,7 +77,7 @@ QMAKE_SUBSTITUTES += extserialport.prf.in
 OTHER_FILES += extserialport.prf.in
 
 # for make docs
-#include(doc/doc.pri)
+include(doc/doc.pri)
 
 # for make install
 win32:!qesp_static {

3rdparty/quazip/quazip.pro

@@ -1,3 +1,4 @@
+PREFIX=/usr/local/
 TEMPLATE=subdirs
 SUBDIRS=quazip
 #SUBDIRS += qztest

3rdparty/quazip/quazip/quazip.pro

@@ -31,6 +31,7 @@ zip.h
 
 SOURCES += *.c *.cpp
 
+PREFIX = /usr/local
 unix:!symbian {
     headers.path=$$PREFIX/include/quazip
     headers.files=$$HEADERS
@@ -40,6 +41,8 @@ unix:!symbian {
 	OBJECTS_DIR=.obj
 	MOC_DIR=.moc
 
+    LIBS += -lz
+	
 }
 
 win32 {

SleepyHeadQT.pro

@@ -4,5 +4,11 @@ SUBDIRS = 3rdparty src
 
 CONFIG += ordered
 
-src.depends = 3rdparty
+TRANSLATIONS += \
+    Translations/Nederlands.nl_NL.ts \
+    Translations/Francais.fr.ts \
+    Translations/Svenska.se.ts \
+    Translations/Deutsch.de_DE.ts \
+    Translations/Espaniol.es.ts
 
+src.depends = 3rdparty

src/main.cpp

@@ -205,7 +205,11 @@ int main(int argc, char *argv[])
     lang_layout.addWidget(&lang_combo,1);
     lang_layout.addWidget(&lang_okbtn);
 
+#ifdef Q_WS_MAC
+    QString transdir=QCoreApplication::applicationDirPath()+"/Contents/Resources/Translations/";
+#else
     QString transdir=QCoreApplication::applicationDirPath()+"/Translations/";
+#endif
     QDir dir(transdir);
     qDebug() << "Scanning \"" << transdir << "\" for translations";
     dir.setFilter(QDir::Files);

src/oximetry.cpp

@@ -9,7 +9,7 @@
 #include <QCalendarWidget>
 #include <QTextCharFormat>
 
-#include "qextserialport/src/qextserialenumerator.h"
+#include "src/qextserialenumerator.h"
 
 #include "oximetry.h"
 #include "ui_oximetry.h"

src/oximetry.h

@@ -14,7 +14,7 @@
 #include <QMessageBox>
 #include <QMutex>
 
-#include "qextserialport/src/qextserialport.h"
+#include "src/qextserialport.h"
 
 #include "SleepLib/profiles.h"
 #include "SleepLib/day.h"

src/src.pro

@@ -8,7 +8,7 @@ QT += core gui opengl network xml
 
 greaterThan(QT_MAJOR_VERSION,4) {
     QT += widgets webkitwidgets
-} else {
+} else { # qt4
     QT += webkit
 }
 
@@ -41,8 +41,8 @@ unix:!macx:LIBS        += -lX11 -lz -lGLU
 
 macx {
   SOURCES          +=
-  LIBS             += -framework IOKit -framework CoreFoundation -lz
+  LIBS             += -lz
-  ICON              = icons/iconfile.icns
+  ICON              = ../icons/iconfile.icns
 }
 
 win32 {
@@ -182,13 +182,6 @@ OTHER_FILES += \
     docs/update_notes.html \
     qextserialport/qextserialport.pri
 
-TRANSLATIONS += \
-    ../Translations/Nederlands.nl_NL.ts \
-    ../Translations/Francais.fr.ts \
-    ../Translations/Svenska.se.ts \
-    ../Translations/Deutsch.de_DE.ts \
-    ../Translations/Espaniol.es.ts
-
 win32 {
     CONFIG(debug, debug|release) {
         DDIR = $$OUT_PWD/debug/Translations
@@ -210,30 +203,36 @@ win32 {
 }
 
 mac {
-    TransFiles.files = ../Translations
+    TransFiles.files = $$files(../Translations/*.qm)
-    TransFiles.path = Contents/MacOS
+    TransFiles.path = Contents/Resources/Translations
     QMAKE_BUNDLE_DATA += TransFiles
+
+# Precopy some frameworks
+#    LibFiles.files = $$OUT_PWD/../3rdparty/qextserialport/qextserialport.framework
+#    LibFiles.path = Contents/Frameworks
+#    QMAKE_BUNDLE_DATA += LibFiles
+
+#CONFIG(release, debug|release) {
+#    TmpFiles.files = $$files($$OUT_PWD/../3rdparty/quazip/quazip/libquazip.1.dylib) \
+#    $$files($$OUT_PWD/../3rdparty/qextserialport/libqextserialport.1.dylib)
+#} else: CONFIG(debug, debug|release) {
+#    TmpFiles.files = $$files($$OUT_PWD/../3rdparty/quazip/quazip/libquazip.1.dylib) \
+#    $$files($$OUT_PWD/../3rdparty/qextserialport/libqextserialport_debug.1.dylib)
+#}
+#    TmpFiles.path = Contents/Frameworks
+#    QMAKE_BUNDLE_DATA += TmpFiles
 }
 
-
-INCLUDEPATH += src \
-../3rdparty \
-../3rdparty/quazip
-
 win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/quazip/quazip/release/ -lquazip
 else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/quazip/quazip/debug/ -lquazip
-else:unix: LIBS += -L$$OUT_PWD/../3rdparty/quazip/quazip/ -lquazip
+else:unix: LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/ -lquazip
 
-DEPENDPATH += $$PWD/../3rdparty/quazip/quazip
+INCLUDEPATH += $$PWD/../3rdparty/quazip
+DEPENDPATH += $$PWD/../3rdparty/quazip
+
+win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/release/ -lqextserialport
+else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/debug/ -lqextserialport
+else:unix: LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/ -lqextserialport
 
-greaterThan(QT_MAJOR_VERSION,4) {
-    win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/release/ -lQt5ExtSerialPortd
-    else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/debug/ -lQt5ExtSerialPortd
-    else:unix: LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/ -lQt5ExtSerialPortd
-} else {
-    win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/release/ -lqextserialportd
-    else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/debug/ -lqextserialportd
-    else:unix: LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/ -lqextserialportd
-}
 INCLUDEPATH += $$PWD/../3rdparty/qextserialport
 DEPENDPATH += $$PWD/../3rdparty/qextserialport