Merge pull request #1 from jgeudens/AppImage

AppImage

Author: jgeudens

.github/workflows/ccpp.yml

@@ -0,0 +1,42 @@
+name: Build
+
+# Triggered when code is pushed to any branch in a repository
+on: push
+
+jobs:
+
+  linux:
+    runs-on: ubuntu-20.04
+    container: docker://jgeudens/qt-linux:5.15.2_build_1
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Update Modules and Build
+        run: sh scripts/build_linux.sh
+
+      - name: Deploy
+        run: sh scripts/deploy_linux.sh
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: modbussim-linux
+          path: release/bin/linux/ModbusSim*.AppImage
+
+  windows:
+    runs-on: windows-2019
+    
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install Qt installer
+        run: pip3 install aqtinstall
+
+      - name: Setup, build and deploy
+        shell: cmd
+        run: scripts/full_build_and_deploy_windows.bat ${{ github.workspace }}
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: modbussim-windows
+          path: |
+            release\bin\win\ModbusSim.zip

.travis.yml

@@ -1,8 +1,8 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
 
-project(ModbusTestSlave
+project(modbussim
     LANGUAGES CXX
-    DESCRIPTION "Test module to test Modbus communication"
+    DESCRIPTION "Modbus Slave Simulation"
     VERSION 0.0.0
 )
 
@@ -11,6 +11,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
+# Tell CMake to run moc when necessary:
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
@@ -27,40 +28,27 @@ find_package(Qt5 COMPONENTS
     REQUIRED
 )
 
-set(QT_INCLUDES
-    ${Qt5Core_INCLUDE_DIRS}
-    ${Qt5Gui_INCLUDE_DIRS}
-    ${Qt5Widgets_INCLUDE_DIRS}
-    ${Qt5Xml_INCLUDE_DIRS}
-    ${Qt5Network_INCLUDE_DIRS}
-    ${Qt5SerialBus_INCLUDE_DIRS}
-)
-
 set(QT_LIB
-    Qt5::Core
-    Qt5::Gui
-    Qt5::Widgets
-    Qt5::Xml
-    Qt5::PrintSupport
-    Qt5::Network
-    Qt5::SerialBus
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+    Qt::Xml
+    Qt::PrintSupport
+    Qt::Network
+    Qt::SerialBus
 )
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}/src
-    ${CMAKE_CURRENT_SOURCE_DIR}/testslave
-
-    ${QT_INCLUDES}
-)
+include_directories(SYSTEM ${QT_INCLUDES})
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/testslave)
 
 SET(APP_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/src/main.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/mainwindow.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/registerdatamodel.cpp
-)
 
-SET(APP_UIS
     ${CMAKE_CURRENT_SOURCE_DIR}/src/mainwindow.ui
+
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/app_icon.rc
 )
 
 SET(TESTSLAVE_SRCS
@@ -73,13 +61,30 @@ set(GUI_TYPE "")
 
 if(WIN32)
     set(GUI_TYPE WIN32)
-endif()
+    set(target_dir "bin/win")
+elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    set(target_dir "bin/linux")
+else()
+    message(SEND_ERROR "You are on an unsupported platform! (Not Win or Unix)")
+endif(WIN32)
+
+add_executable(${PROJECT_NAME} ${GUI_TYPE} ${APP_SRCS} ${TESTSLAVE_SRCS})
 
-add_executable(${PROJECT_NAME} ${GUI_TYPE} ${APP_SRCS} ${APP_UIS} ${TESTSLAVE_SRCS})
+set_target_properties(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${target_dir} )
 
 target_link_libraries(${PROJECT_NAME} PRIVATE
+    ${SCOPESOURCE}
     ${QT_LIB}
 )
 
 # Reset GUI type to blank
 set(GUI_TYPE "")
+
+# Do platform specific post target stuff
+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+
+    install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
+
+elseif(WIN32)
+    # not required
+endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")

CMakeLists.txt

@@ -0,0 +1,8 @@
+
+
+
+cmake -DCMAKE_PREFIX_PATH="/opt/Qt/5.15.1/gcc_64/lib/cmake/Qt5" ..
+
+make -j8
+
+

appveyor.yml

@@ -0,0 +1,11 @@
+#!/usr/bin/xdg-open
+[Desktop Entry]
+Comment=ModbusSim - Simulation modbus slave
+Exec=modbussim
+GenericName=ModbusSim
+Icon=ModbusSim
+MimeType=
+Name=ModbusSim
+Terminal=false
+Type=Application
+Categories=Utility

doc/build.md

@@ -0,0 +1,10 @@
+Source: https://commons.wikimedia.org/wiki/File:Icons8_flat_sim_card.svg
+
+
+Copyright © The author(s)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+The Software is provided "as is", without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the Software or the use or other dealings in the Software.