Merge pull request #353 from patviafore-kudzera/development

Snap support part 3
dannagle · Jan 11, 2024 · d2577ed · d2577ed
2 parents 3c25036 + ea748aa
commit d2577ed
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 77 deletions.
diff --git a/snapcraft.yaml b/snapcraft.yaml
@@ -37,10 +37,10 @@ parts:
     source: https://github.com/dannagle/PacketSender.git
     source-branch: master
     cmake-parameters:
-      - /root/parts/packetsender/src/src
+      - $SNAPCRAFT_PART_SRC/src
     override-pull: |
       craftctl default
-      cp /root/parts/packetsender/src/src/snap/CMakeLists.txt /root/parts/packetsender/src/src/CMakeLists.txt
+      cp $SNAPCRAFT_PART_SRC/src/snap/CMakeLists.txt $SNAPCRAFT_PART_SRC/src/CMakeLists.txt
     build-packages:
       - build-essential
       - qt6-base-dev

diff --git a/src/PacketSenderSnap.pro b/src/PacketSenderSnap.pro
diff --git a/src/snap/CMakeLists.txt b/src/snap/CMakeLists.txt
@@ -95,7 +95,7 @@ qt_add_executable(packetsender
     ${SOURCES} ${HEADERS} ${FORMS} ${RESOURCES} ${CSS}
 )
 
-execute_process(COMMAND git -C  /root/parts/packetsender/src/src rev-parse --short HEAD OUTPUT_VARIABLE GIT_SHA COMMAND_ERROR_IS_FATAL ANY OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND git -C  $SNAPCRAFT_PART_SRC/src rev-parse --short HEAD OUTPUT_VARIABLE GIT_SHA COMMAND_ERROR_IS_FATAL ANY OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 target_compile_definitions(packetsender PRIVATE
     GUI_BUILD