Snap support part 2

Use override-pull to copy the snap CMakeLists.txt over the original This allows us to remove the SRCROOT shenanigans that we did in the last commit Finally, use /root/parts as our target, rather than /root/project because /root/project may not exist yet at build time
dannagle · Jan 9, 2024 · 4c9a49e · 4c9a49e
1 parent ad87673
commit 4c9a49e
Show file tree

Hide file tree

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

diff --git a/src/snap/CMakeLists.txt b/src/snap/CMakeLists.txt
@@ -2,9 +2,6 @@ cmake_minimum_required(VERSION 3.16)
 project(packetsender VERSION 1.0 LANGUAGES C CXX)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
-set(SRCROOT /root/project/src)
-
-include_directories(${SRCROOT})
 
 # Set up AUTOMOC and some sensible defaults for runtime execution
 # When using Qt 6.3, you can replace the code block below with
@@ -17,88 +14,88 @@ find_package(QT NAMES Qt6 REQUIRED COMPONENTS Core)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Gui Network Widgets)
 
 set(SOURCES
-    ${SRCROOT}/about.cpp
-    ${SRCROOT}/brucethepoodle.cpp
-    ${SRCROOT}/cloudui.cpp
-    ${SRCROOT}/irisandmarigold.cpp
-    ${SRCROOT}/languagechooser.cpp
-    ${SRCROOT}/main.cpp
-    ${SRCROOT}/mainpacketreceiver.cpp
-    ${SRCROOT}/mainwindow.cpp
-    ${SRCROOT}/multicastsetup.cpp
-    ${SRCROOT}/packet.cpp
-    ${SRCROOT}/packetlogmodel.cpp
-    ${SRCROOT}/packetnetwork.cpp
-    ${SRCROOT}/panel.cpp
-    ${SRCROOT}/panelgenerator.cpp
-    ${SRCROOT}/persistentconnection.cpp
-    ${SRCROOT}/persistenthttp.cpp
-    ${SRCROOT}/postdatagen.cpp
-    ${SRCROOT}/sendpacketbutton.cpp
-    ${SRCROOT}/settings.cpp
-    ${SRCROOT}/subnetcalc.cpp
-    ${SRCROOT}/tcpthread.cpp
-    ${SRCROOT}/threadedtcpserver.cpp
-    ${SRCROOT}/udpflooding.cpp
-    ${SRCROOT}/wakeonlan.cpp
+    about.cpp
+    brucethepoodle.cpp
+    cloudui.cpp
+    irisandmarigold.cpp
+    languagechooser.cpp
+    main.cpp
+    mainpacketreceiver.cpp
+    mainwindow.cpp
+    multicastsetup.cpp
+    packet.cpp
+    packetlogmodel.cpp
+    packetnetwork.cpp
+    panel.cpp
+    panelgenerator.cpp
+    persistentconnection.cpp
+    persistenthttp.cpp
+    postdatagen.cpp
+    sendpacketbutton.cpp
+    settings.cpp
+    subnetcalc.cpp
+    tcpthread.cpp
+    threadedtcpserver.cpp
+    udpflooding.cpp
+    wakeonlan.cpp
 )
 
 set(HEADERS 
-    ${SRCROOT}/about.h
-    ${SRCROOT}/brucethepoodle.h
-    ${SRCROOT}/cloudui.h
-    ${SRCROOT}/globals.h
-    ${SRCROOT}/irisandmarigold.h
-    ${SRCROOT}/languagechooser.h
-    ${SRCROOT}/mainpacketreceiver.h
-    ${SRCROOT}/mainwindow.h
-    ${SRCROOT}/multicastsetup.h
-    ${SRCROOT}/packet.h
-    ${SRCROOT}/packetlogmodel.h
-    ${SRCROOT}/packetnetwork.h
-    ${SRCROOT}/panel.h
-    ${SRCROOT}/panelgenerator.h
-    ${SRCROOT}/persistenthttp.h
-    ${SRCROOT}/postdatagen.h
-    ${SRCROOT}/sendpacketbutton.h
-    ${SRCROOT}/settings.h
-    ${SRCROOT}/subnetcalc.h
-    ${SRCROOT}/tcpthread.h
-    ${SRCROOT}/threadedtcpserver.h
-    ${SRCROOT}/udpflooding.h
-    ${SRCROOT}/wakeonlan.h
+    about.h
+    brucethepoodle.h
+    cloudui.h
+    globals.h
+    irisandmarigold.h
+    languagechooser.h
+    mainpacketreceiver.h
+    mainwindow.h
+    multicastsetup.h
+    packet.h
+    packetlogmodel.h
+    packetnetwork.h
+    panel.h
+    panelgenerator.h
+    persistenthttp.h
+    postdatagen.h
+    sendpacketbutton.h
+    settings.h
+    subnetcalc.h
+    tcpthread.h
+    threadedtcpserver.h
+    udpflooding.h
+    wakeonlan.h
 )
 
 set(FORMS 
-    ${SRCROOT}/about.ui
-    ${SRCROOT}/brucethepoodle.ui
-    ${SRCROOT}/cloudui.ui
-    ${SRCROOT}/irisandmarigold.ui
-    ${SRCROOT}/languagechooser.ui
-    ${SRCROOT}/mainwindow.ui
-    ${SRCROOT}/multicastsetup.ui
-    ${SRCROOT}/panelgenerator.ui
-    ${SRCROOT}/persistentconnection.ui
-    ${SRCROOT}/persistenthttp.ui
-    ${SRCROOT}/postdatagen.ui
-    ${SRCROOT}/settings.ui
-    ${SRCROOT}/subnetcalc.ui
-    ${SRCROOT}/udpflooding.ui
-    ${SRCROOT}/wakeonlan.ui
+    about.ui
+    brucethepoodle.ui
+    cloudui.ui
+    irisandmarigold.ui
+    languagechooser.ui
+    mainwindow.ui
+    multicastsetup.ui
+    panelgenerator.ui
+    persistentconnection.ui
+    persistenthttp.ui
+    postdatagen.ui
+    settings.ui
+    subnetcalc.ui
+    udpflooding.ui
+    wakeonlan.ui
 
 )
 
-qt_add_resources(RESOURCES ${SRCROOT}/packetsender.qrc ${SRCROOT}/translations.qrc ${SRCROOT}/qdarkstyle/style.qrc)
+qt_add_resources(RESOURCES packetsender.qrc translations.qrc qdarkstyle/style.qrc)
 
 set(CSS
-    ${SRCROOT}/packetsender.css
+    packetsender.css
 )
 
 qt_add_executable(packetsender 
     ${SOURCES} ${HEADERS} ${FORMS} ${RESOURCES} ${CSS}
 )
 
-execute_process(COMMAND git -C ${SRCROOT}/ rev-parse --short HEAD OUTPUT_VARIABLE GIT_SHA COMMAND_ERROR_IS_FATAL ANY OUTPUT_STRIP_TRAILING_WHITESPACE)
+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)
 
 target_compile_definitions(packetsender PRIVATE
     GUI_BUILD
@@ -127,8 +124,8 @@ install(TARGETS packetsender
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 )
 
-install(FILES ${SRCROOT}/packetsender.desktop DESTINATION /usr/share/applications)
-install(FILES ${SRCROOT}/packetsender.svg DESTINATION /usr/share/icons)
+install(FILES packetsender.desktop DESTINATION /usr/share/applications)
+install(FILES packetsender.svg DESTINATION /usr/share/icons)
 
 # Consider using qt_generate_deploy_app_script() for app deployment if
 # the project can use Qt 6.3. In that case rerun qmake2cmake with