use binary resource files instead

.dockerignore

@@ -0,0 +1,10 @@
+.git
+.cache
+Docker/Dockerfile
+**/*.o
+**/moc_*.cpp
+**/moc_*.o
+**/rep_*.cpp
+**/rep_*.o
+.qmake.stash
+qt-openzwavedatabase/config/**

Docker/Dockerfile

@@ -7,7 +7,7 @@
 FROM debian:buster-slim as builder
 
 # File Author / Maintainer
-MAINTAINER Justin Hammond
+LABEL maintainer="justin@dynam.ac"
 
 WORKDIR /opt
 
@@ -17,18 +17,16 @@ ENV PATH=$PATH:/opt/depot_tools/
 RUN git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git && mkdir breakpad && cd breakpad && fetch breakpad && cd src && ./configure --disable-processor && make && make install
 RUN git clone https://github.com/qt/qtmqtt.git && cd qtmqtt && git checkout 5.12 && /usr/lib/qt5/bin/qmake QT_BUILD_PARTS="libs tools" && make && make install
 RUN git clone https://github.com/OpenZWave/open-zwave.git && cd open-zwave && make -j4 && make install
-RUN git clone https://github.com/OpenZWave/qt-openzwave.git && cd qt-openzwave && /usr/lib/qt5/bin/qmake "CONFIG += BreakPad" && make -j4 && make install
+COPY . /opt/qt-openzwave/
-
+RUN cd qt-openzwave && if [ -f Makefile ]; then /usr/lib/qt5/bin/qmake -r; make distclean; fi && /usr/lib/qt5/bin/qmake -r "CONFIG+=BreakPad" &&  make -j4 && make install
-
+ 
 FROM debian:buster-slim
-MAINTAINER Justin Hammond
+
+LABEL maintainer="justin@dynam.ac"
+
 WORKDIR /opt
 
-RUN echo 'APT::Default-Release "stable";' > /etc/apt/apt.conf.d/99defaultrelease && echo 'deb     http://ftp.debian.org/debian/    unstable main contrib non-free' > /etc/apt/sources.list.d/unstable.list && echo 'deb     http://ftp.debian.org/debian/    experimental main contrib non-free' >> /etc/apt/sources.list.d/unstable.list && apt update
+RUN echo 'APT::Default-Release "stable";' > /etc/apt/apt.conf.d/99defaultrelease && echo 'deb     http://ftp.debian.org/debian/    unstable main contrib non-free' > /etc/apt/sources.list.d/unstable.list && echo 'deb     http://ftp.debian.org/debian/    experimental main contrib non-free' >> /etc/apt/sources.list.d/unstable.list && apt update && apt-get -y install libunwind8 libcurl4 && apt-get -y -t unstable install libqt5core5a libqt5network5 && apt-get -y -t experimental install libqt5remoteobjects5 && apt-get clean && rm -rf /var/lib/apt/lists/* && mkdir -p /opt/ozw/config/crashes/
-RUN apt-get -y install libunwind8 libcurl4 
-RUN apt-get -y -t unstable install libqt5core5a libqt5network5
-RUN apt-get -y -t experimental install libqt5remoteobjects5
-
 
 COPY --from=builder /usr/local/bin/* /usr/local/bin/
 COPY --from=builder /usr/local/lib/libqt* /usr/local/lib/

qt-openzwavedatabase/qt-openzwavedatabase.pro

@@ -9,28 +9,33 @@ CONFIG += silent file_copies resources_big
 !versionAtLeast(QT_VERSION, 5.11.2):error("Use at least Qt version 5.11.2")
 
 ozwconfig.target=qt-openzwavedatabase.rcc
-ozwconfig.commands=cp -R ../../open-zwave/config config/ && cd config && $$[QT_INSTALL_BINS]/rcc -project -o ozwconfig.qrc && $$[QT_INSTALL_BINS]/rcc --name="ozwconfig" --root="/config/" ozwconfig.qrc --binary -o ../qt-openzwavedatabase.rcc
+ozwconfig.commands=@echo "Generating qt-openzwavedatabase.rcc" && cp -R ../../open-zwave/config config/ && cd config && $$[QT_INSTALL_BINS]/rcc -project -o ozwconfig.qrc && $$[QT_INSTALL_BINS]/rcc --name="ozwconfig" --root="/config/" ozwconfig.qrc --binary -o ../qt-openzwavedatabase.rcc
-ozwconfigdb.path=$$[QT_INSTALL_PREFIX]/share/OpenZWave/
+
-ozwconfigdb.files=qt-openzwavedatabase.rcc
+ozwrccdb.path=$$[QT_INSTALL_PREFIX]/share/OpenZWave/
+ozwrccdb.files+=qt-openzwavedatabase.rcc
+ozwrccdb.CONFIG+=no_check_exist
+
+extraclean.commands=rm -rf config qt-openzwavedatabase.rcc
+clean.depends=extraclean
 
 !win32 {
-    QMAKE_EXTRA_TARGETS += ozwconfig
-    PRE_TARGETDEPS += qt-openzwavedatabase.rcc
     SOURCES += source/qt-openzwavedatabase.cpp
-    INSTALLS += ozwconfigdb
-    macx {
-        QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
-    }
-
-
     HEADERS += \
         include/qt-openzwave/qt-openzwavedatabase.h
 
     INCLUDEPATH += include/
-    QMAKE_CXXFLAGS += -g1
+
     target.path = /usr/local/lib/
-    INSTALLS += target
+    QMAKE_EXTRA_TARGETS += clean extraclean ozwconfig
+    PRE_TARGETDEPS += qt-openzwavedatabase.rcc
+    INSTALLS+=target ozwrccdb
+    QMAKE_STRIP=@echo
+    QMAKE_CXXFLAGS += -g1
     QMAKE_CXXFLAGS += -g1
     QMAKE_LFLAGS += -rdynamic
+
+    macx {
+        QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+    }
 }
 

qt-ozwdaemon/qt-ozwdaemon.pro

@@ -145,7 +145,7 @@ unix {
     QMAKE_CXXFLAGS += -g
     QMAKE_CFLAGS += -g
     QMAKE_LFLAGS += -rdynamic
-	QMAKE_STRIP = echo
+    QMAKE_STRIP = echo
 }
 win32 {
     LIBS += -lDnsapi -L../qt-openzwave/$$BUILDTYPE/ -lqt-openzwave1