restructure packaging

2018-05-14 13:27:38 +02:00 · 2018-05-14 13:27:38 +02:00 · 65bcc6c4b2
commit 65bcc6c4b2
parent e79e89d946
18 changed files with 5 additions and 205 deletions
--- a/data.qrc
+++ b/data.qrc
@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>data/icons/busy-indicator.svg</file>
-    </qresource>
-</RCC>
--- a/data/icons/busy-indicator.svg
+++ b/data/icons/busy-indicator.svg
@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
-   height="100"
-   viewBox="0 0 100 100"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="busy-indicator.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="47.618004"
-     inkscape:cy="28.551323"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="2880"
-     inkscape:window-height="1752"
-     inkscape:window-x="0"
-     inkscape:window-y="48"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-952.36216)">
-    <g
-       id="g7211"
-       transform="matrix(0.03708988,0,0,0.03708988,50.490111,1016.2974)">
-      <rect
-         inkscape:tile-y0="-771.42855"
-         inkscape:tile-x0="-103.92857"
-         inkscape:tile-h="791.42859"
-         inkscape:tile-w="181.42857"
-         inkscape:tile-cy="-375.71426"
-         inkscape:tile-cx="-13.214287"
-         ry="108.89703"
-         y="292.05038"
-         x="-103.92857"
-         height="680.31183"
-         width="217.79407"
-         id="rect4154"
-         style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <use
-         id="use7187"
-         xlink:href="#rect4154"
-         inkscape:tiled-clone-of="#rect4154"
-         y="0"
-         x="0"
-         width="100%"
-         height="100%" />
-      <use
-         id="use7189"
-         transform="matrix(0.8660254,0.5,-0.5,0.8660254,-189.62751,-43.729022)"
-         xlink:href="#rect4154"
-         inkscape:tiled-clone-of="#rect4154"
-         y="0"
-         x="0"
-         style="opacity:0.92000002"
-         width="100%"
-         height="100%" />
-      <use
-         id="use7191"
-         transform="matrix(0.5,0.8660254,-0.8660254,0.5,-331.98523,-176.41322)"
-         xlink:href="#rect4154"
-         inkscape:tiled-clone-of="#rect4154"
-         y="0"
-         x="0"
-         style="opacity:0.83999999"
-         width="100%"
-         height="100%" />
-      <use
-         id="use7193"
-         transform="matrix(0,1,-1,0,-388.92854,-362.49997)"
-         xlink:href="#rect4154"
-         inkscape:tiled-clone-of="#rect4154"
-         y="0"
-         x="0"
-         style="opacity:0.76000001"
-         width="100%"
-         height="100%" />
-      <use
-         id="use7195"
-         transform="matrix(-0.5,0.8660254,-0.8660254,-0.5,-345.19952,-552.12748)"
-         xlink:href="#rect4154"
-         inkscape:tiled-clone-of="#rect4154"
-         y="0"
-         x="0"
-         style="opacity:0.68000022"
-         width="100%"
-         height="100%" />
-      <use
-         id="use7197"
-         transform="matrix(-0.8660254,0.5,-0.5,-0.8660254,-212.51532,-694.4852)"
-         xlink:href="#rect4154"
-         inkscape:tiled-clone-of="#rect4154"
-         y="0"
-         x="0"
-         style="opacity:0.6"
-         width="100%"
-         height="100%" />
-      <use
-         id="use7199"
-         transform="matrix(-1,0,0,-1,-26.428574,-751.42851)"
-         xlink:href="#rect4154"
-         inkscape:tiled-clone-of="#rect4154"
-         y="0"
-         x="0"
-         style="opacity:0.51999996"
-         width="100%"
-         height="100%" />
-      <use
-         id="use7201"
-         transform="matrix(-0.8660254,-0.5,0.5,-0.8660254,163.19893,-707.69949)"
-         xlink:href="#rect4154"
-         inkscape:tiled-clone-of="#rect4154"
-         y="0"
-         x="0"
-         style="opacity:0.43999999"
-         width="100%"
-         height="100%" />
-      <use
-         id="use7203"
-         transform="matrix(-0.5,-0.8660254,0.8660254,-0.5,305.55666,-575.01529)"
-         xlink:href="#rect4154"
-         inkscape:tiled-clone-of="#rect4154"
-         y="0"
-         x="0"
-         style="opacity:0.36000001"
-         width="100%"
-         height="100%" />
-      <use
-         id="use7205"
-         transform="matrix(0,-1,1,0,362.49997,-388.92854)"
-         xlink:href="#rect4154"
-         inkscape:tiled-clone-of="#rect4154"
-         y="0"
-         x="0"
-         style="opacity:0.28000004"
-         width="100%"
-         height="100%" />
-      <use
-         id="use7207"
-         transform="matrix(0.5,-0.8660254,0.8660254,0.5,318.77095,-199.30104)"
-         xlink:href="#rect4154"
-         inkscape:tiled-clone-of="#rect4154"
-         y="0"
-         x="0"
-         style="opacity:0.2"
-         width="100%"
-         height="100%" />
-      <use
-         id="use7209"
-         transform="matrix(0.8660254,-0.5,0.5,0.8660254,186.08675,-56.943309)"
-         xlink:href="#rect4154"
-         inkscape:tiled-clone-of="#rect4154"
-         y="0"
-         x="0"
-         style="opacity:0.12000002"
-         width="100%"
-         height="100%" />
-    </g>
-  </g>
-</svg>
--- a/mea.pro
+++ b/mea.pro
@ -15,7 +15,7 @@ wininstaller.depends = mea
 wininstaller.commands += rmdir /S /Q mea\release\out && mkdir mea\release\out &&
 wininstaller.commands += copy mea\release\mea.exe mea\release\out\ &&
 wininstaller.commands += windeployqt --qmldir mea\ui mea\release\out &&
-wininstaller.commands += makensis win-installer.nsi
+wininstaller.commands += makensis packaging\windows\win-installer.nsi
 QMAKE_EXTRA_TARGETS += wininstaller

 target.depends += wininstaller
--- a/mea/guh-logo.ico
+++ b/mea/guh-logo.ico
--- a/mea/jsonrpc/jsonrpcclient.cpp
+++ b/mea/jsonrpc/jsonrpcclient.cpp
@ -254,7 +254,7 @@ void JsonRpcClient::dataReceived(const QByteArray &data)
 //       qWarning() << "Could not parse json data from mea" << data << error.errorString();
        return;
    }
-    qDebug() << "received response" << m_receiveBuffer.left(splitIndex);
+//    qDebug() << "received response" << m_receiveBuffer.left(splitIndex);
    m_receiveBuffer = m_receiveBuffer.right(m_receiveBuffer.length() - splitIndex - 1);
    if (!m_receiveBuffer.isEmpty()) {
        staticMetaObject.invokeMethod(this, "dataReceived", Qt::QueuedConnection, Q_ARG(QByteArray, QByteArray()));
--- a/mea/mea.pro
+++ b/mea/mea.pro
@ -116,7 +116,7 @@ DISTFILES += \
    android/gradlew.bat \
    LICENSE

-ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
+ANDROID_PACKAGE_SOURCE_DIR = $$PWD/../packaging/android


 DISTFILES += \
--- a/mea/rulemanager.cpp
+++ b/mea/rulemanager.cpp
@ -140,7 +140,7 @@ void RuleManager::getRuleDetailsReply(const QVariantMap &params)
        qDebug() << "Got rule details for a rule we don't know";
        return;
    }
-    qDebug() << "got rule details for rule" << ruleMap;
+//    qDebug() << "got rule details for rule" << ruleMap;
    parseEventDescriptors(ruleMap.value("eventDescriptors").toList(), rule);
    parseRuleActions(ruleMap.value("actions").toList(), rule);
    parseRuleExitActions(ruleMap.value("exitActions").toList(), rule);
--- a/packaging/android/AndroidManifest.xml
+++ b/packaging/android/AndroidManifest.xml
--- a/packaging/android/build.gradle
+++ b/packaging/android/build.gradle
--- a/packaging/android/gradle.properties
+++ b/packaging/android/gradle.properties
--- a/packaging/android/gradle/wrapper/gradle-wrapper.jar
+++ b/packaging/android/gradle/wrapper/gradle-wrapper.jar
--- a/packaging/android/gradle/wrapper/gradle-wrapper.properties
+++ b/packaging/android/gradle/wrapper/gradle-wrapper.properties
--- a/packaging/android/gradlew
+++ b/packaging/android/gradlew
--- a/packaging/android/gradlew.bat
+++ b/packaging/android/gradlew.bat
--- a/packaging/android/local.properties
+++ b/packaging/android/local.properties
--- a/packaging/android/res/drawable-mdpi/icon.png
+++ b/packaging/android/res/drawable-mdpi/icon.png
--- a/packaging/android/res/values/libs.xml
+++ b/packaging/android/res/values/libs.xml
--- a/packaging/windows/win-installer.nsi
+++ b/packaging/windows/win-installer.nsi
@ -30,7 +30,7 @@ InstallDir "$PROGRAMFILES\${COMPANYNAME}\${APPNAME}"
 LicenseData "LICENSE"
 # This will be in the installer/uninstaller's title bar
 Name "${COMPANYNAME} - ${APPNAME}"
-Icon "guh-logo.ico"
+Icon "mea\guh-logo.ico"
 outFile "mea-installer.exe"

 !include LogicLib.nsh