diff --git a/snapcraft.yaml b/snapcraft.yaml index c5fe5ce6..dd55df8c 100644 --- 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 deleted file mode 100755 index ea98b06f..00000000 --- a/src/PacketSenderSnap.pro +++ /dev/null @@ -1,74 +0,0 @@ -# Project file used by snapcraft - -QT += core gui network widgets - -DEFINES += "ISSNAP=1" - - -TARGET = packetsender -TEMPLATE = app -DEFINES += GUI_BUILD - -TRANSLATIONS += languages/packetsender_en.ts \ - languages/packetsender_es.ts \ - languages/packetsender_fr.ts \ - languages/packetsender_de.ts \ - languages/packetsender_hi.ts \ - languages/packetsender_it.ts - -SOURCES += mainwindow.cpp \ - languagechooser.cpp \ - panel.cpp \ - sendpacketbutton.cpp \ - brucethepoodle.cpp \ - irisandmarigold.cpp \ - persistentconnection.cpp \ - about.cpp \ - subnetcalc.cpp \ - cloudui.cpp \ - multicastsetup.cpp \ - udpflooding.cpp \ - packetlogmodel.cpp \ - postdatagen.cpp \ - panelgenerator.cpp \ - persistenthttp.cpp \ - wakeonlan.cpp - -HEADERS += mainwindow.h \ - languagechooser.h \ - panel.h \ - sendpacketbutton.h \ - brucethepoodle.h \ - irisandmarigold.h \ - persistentconnection.h \ - about.h \ - subnetcalc.h \ - cloudui.h \ - multicastsetup.h \ - udpflooding.h \ - packetlogmodel.h \ - postdatagen.h\ - panelgenerator.h \ - persistenthttp.h \ - wakeonlan.h - - - -FORMS += mainwindow.ui \ - brucethepoodle.ui \ - irisandmarigold.ui \ - languagechooser.ui \ - persistentconnection.ui \ - settings.ui \ - about.ui \ - subnetcalc.ui \ - cloudui.ui \ - multicastsetup.ui \ - udpflooding.ui \ - persistenthttp.ui \ - postdatagen.ui \ - panelgenerator.ui \ - wakeonlan.ui - - -include(packetsender_main.pri) diff --git a/src/snap/CMakeLists.txt b/src/snap/CMakeLists.txt index 5aae7e95..59bb39e9 100644 --- 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