Browse Source

Remove output form local-src build

Joachim M. Giæver 3 years ago
parent
commit
83b86c56d7
1 changed files with 7 additions and 7 deletions
  1. 7 7
      snap/snapcraft.yaml

+ 7 - 7
snap/snapcraft.yaml

@@ -71,7 +71,7 @@ parts:
       - libxcb1
       - libxdmcp6
   qt-openzwave:
-    after: [qtmqtt]
+    after: [open-zwave, qtmqtt]
     plugin: make # aka qmake?
     source: https://github.com/OpenZWave/qt-openzwave.git
     build-packages:
@@ -102,9 +102,9 @@ parts:
         qmake -r
         make distclean
       fi
-      OZW_LIB_PATH="$(dirname $(find $HOME/parts/open-zwave/install -name libopenzwave.so -print0 -quit))"
-      OZW_INCLUDE_PATH="$(dirname $(find $HOME/parts/open-zwave/install -name Manager.h -print0 -quit))"
-      OZW_DATABASE_PATH="$(dirname $(find $HOME/parts/open-zwave/install -name manufacturer_specific.xml))"
+      OZW_LIB_PATH="$(dirname $(find ${SNAPCRAFT_PROJECT_DIR}/../parts/open-zwave/install -name libopenzwave.so -print0 -quit))"
+      OZW_INCLUDE_PATH="$(dirname $(find ${SNAPCRAFT_PROJECT_DIR}/../parts/open-zwave/install -name Manager.h -print0 -quit))"
+      OZW_DATABASE_PATH="$(dirname $(find ${SNAPCRAFT_PROJECT_DIR}/../parts/open-zwave/install -name manufacturer_specific.xml))"
       qmake -r "CONFIG+=release" \
           OZW_LIB_PATH="${OZW_LIB_PATH}" \
           OZW_INCLUDE_PATH="${OZW_INCLUDE_PATH}" \
@@ -116,8 +116,8 @@ parts:
     plugin: dump
     source: ./src
     source-type: local
-    override-build: |
-      snapcraftctl build
-      echo $SNAPCRAFT_PROJECT_DIR
+    # override-build: |
+    #   snapcraftctl build
+    #   echo $SNAPCRAFT_PROJECT_DIR
     organize:
       hooks: snap/hooks