TwoCanPlugIn · rgleason · Jun 22, 2019 · Jun 22, 2019 · Jun 22, 2019 · Jun 23, 2019
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 build
 src/version.h
+data/drivers/
diff --git a/Plugin/.travis.yml → .travis.yml b/Plugin/.travis.yml → .travis.yml
@@ -1,3 +1,20 @@
+# Set encrypted variable 'GitHub_auth_token' in Travis repo settings to deploy packages
+# for tagged commits to GitHub Releases.
+# deploy:
+# - provider: releases
+#  api_key: $GitHub_auth_token
+#  file_glob: true
+#  file: $TRAVIS_BUILD_DIR/build/*.{deb,rpm,dmg,txz,pkg.tar.xz}
+#  skip_cleanup: true
+#  on: # Set deploy conditions
+      # Deploy only when tag is specified
+#      tags: true
+      # or his branch
+#      branch: dev
+      # and only when API token is set
+#      condition: "${#GitHub_auth_token} != 0" 
+
+# ov50 Linux/OSX build - courtesy to https://github.com/seandepagnier
 language: cpp
 
 matrix:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,10 +7,65 @@
 # define minimum cmake version
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
-PROJECT(TwoCanPlugIn)
+PROJECT(twocan_pi)
 
-# The TwoCan plugin
-ADD_SUBDIRECTORY(Plugin)
+SET(PACKAGE_NAME twocan_pi)
+SET(VERBOSE_NAME TWOCAN)
+SET(TITLE_NAME TWOCAN)
+SET(CPACK_PACKAGE_CONTACT "TwoCanPlugin@hotmail.com")
+# SET(PLUGIN_VERSION_MAJOR "1")
+# SET(PLUGIN_VERSION_MINOR "4")
+# SET(PLUGIN_VERSION_PATCH "0")
+# SET(NAME_SUFFIX "ov50")
+# SET(PLUGIN_VERSION_DATE "2019-05-26")
+SET(CMAKE_BUILD_TYPE Release)
+SET(CMAKE_CXX_STANDARD 11)
+
+
+
+INCLUDE("cmake/PluginConfigure.cmake")
+
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/Plugin/inc ${CMAKE_SOURCE_DIR}/{Plugin/src ${CMAKE_SOURCE_DIR}/Plugin/img)
+
+SET(SRC_TWOCAN
+            src/twocanerror.cpp
+            inc/twocanerror.h
+            src/twocandevice.cpp
+            inc/twocandevice.h
+            src/twocanplugin.cpp
+            inc/twocanplugin.h
+            src/twocansettings.cpp
+            inc/twocansettings.h
+            src/twocansettingsbase.cpp
+            inc/twocansettingsbase.h
+            src/twocanutils.cpp
+            inc/twocanutils.h
+            inc/version.h
+            img/twocan_16_icon.xpm
+            img/twocan_32.xpm
+            img/twocan_64.xpm
+            img/twocan_128.xpm
+ 	)
+
+IF(UNIX AND NOT APPLE)
+    LIST(APPEND SRC_TWOCAN 
+	    src/twocansocket.cpp
+            inc/twocansocket.h
+            src/twocanlogreader.cpp
+            inc/twocanlogreader.h
+    )
+ENDIF(UNIX AND NOT APPLE)
+
+ADD_LIBRARY(${PACKAGE_NAME} SHARED ${SRC_TWOCAN} )
+
+IF(WIN32)
+	TARGET_LINK_LIBRARIES(${PACKAGE_NAME} iphlpapi)
+ENDIF(WIN32)
+
+
+INCLUDE("cmake/PluginInstall.cmake")
+INCLUDE("cmake/PluginLocalization.cmake")
+INCLUDE("cmake/PluginPackage.cmake")
 
 # The TwoCan plugin Windows drivers
 IF(WIN32)
@@ -22,4 +77,6 @@ IF(WIN32)
     ADD_SUBDIRECTORY(CandumpLog)
     ADD_SUBDIRECTORY(KeesLog)
     ADD_SUBDIRECTORY(YachtDevicesLog)
-ENDIF(WIN32)
+ENDIF(WIN32)
+
+
diff --git a/Plugin/CMakeLists.txt b/Plugin/CMakeLists.txt
diff --git a/Plugin/src/version.h b/Plugin/src/version.h
diff --git a/Plugin/VERSION.cmake → VERSION.cmake b/Plugin/VERSION.cmake → VERSION.cmake
diff --git a/Plugin/appveyor.yml → appveyor.yml b/Plugin/appveyor.yml → appveyor.yml
@@ -43,7 +43,25 @@ before_build:
   - cmake -T v141_xp ..
 
 build_script:
-  - cmake --build . --target package --config release
+  - cmake --build . --config release
+  - cd ..
+  - cd data
+  - mkdir drivers
+  - cd drivers
+  - copy ..\..\build\axiomtek\release\axiomtek.dll
+  - copy ..\..\build\candumplog\release\candumplog.dll
+  - copy ..\..\build\cantact\release\cantact.dll
+  - copy ..\..\build\Common\Release\twocanutil.lib
+  - copy ..\..\build\KeesLog\Release\keeslog.dll
+  - copy ..\..\build\Kvaser\Release\kvaser.dll
+  - copy ..\..\build\TwoCanLog\Release\twocanlog.dll
+  - copy ..\..\build\YachtDevicesLog\Release\yachtdeviceslog.dll
+  - cd ..\
+  - cd ..\
+  - cd build
+  - cpack
+
+  # - cmake --build . --target package --config release
   # --target package doesn't work because of nsis not correctly installed
 
 artifacts:

diff --git a/.../buildosx/InstallOSX/twocan_pi.pkgproj.in → buildosx/InstallOSX/twocan_pi.pkgproj.in b/.../buildosx/InstallOSX/twocan_pi.pkgproj.in → buildosx/InstallOSX/twocan_pi.pkgproj.in
diff --git a/Plugin/buildwin/NSIS.template.in → buildwin/NSIS.template.in b/Plugin/buildwin/NSIS.template.in → buildwin/NSIS.template.in
diff --git a/Plugin/cmake/PluginConfigure.cmake → cmake/PluginConfigure.cmake b/Plugin/cmake/PluginConfigure.cmake → cmake/PluginConfigure.cmake
diff --git a/Plugin/cmake/PluginInstall.cmake → cmake/PluginInstall.cmake b/Plugin/cmake/PluginInstall.cmake → cmake/PluginInstall.cmake
diff --git a/Plugin/cmake/PluginLocalization.cmake → cmake/PluginLocalization.cmake b/Plugin/cmake/PluginLocalization.cmake → cmake/PluginLocalization.cmake
diff --git a/Plugin/cmake/PluginPackage.cmake → cmake/PluginPackage.cmake b/Plugin/cmake/PluginPackage.cmake → cmake/PluginPackage.cmake
diff --git a/Plugin/cmake/gpl.txt → cmake/gpl.txt b/Plugin/cmake/gpl.txt → cmake/gpl.txt
diff --git a/Plugin/cmake/version.h.in → cmake/version.h.in b/Plugin/cmake/version.h.in → cmake/version.h.in
diff --git a/Plugin/img/twocan_128.xpm → img/twocan_128.xpm b/Plugin/img/twocan_128.xpm → img/twocan_128.xpm
diff --git a/Plugin/img/twocan_16_icon.xpm → img/twocan_16_icon.xpm b/Plugin/img/twocan_16_icon.xpm → img/twocan_16_icon.xpm
diff --git a/Plugin/img/twocan_32.xpm → img/twocan_32.xpm b/Plugin/img/twocan_32.xpm → img/twocan_32.xpm
diff --git a/Plugin/img/twocan_64.xpm → img/twocan_64.xpm b/Plugin/img/twocan_64.xpm → img/twocan_64.xpm
diff --git a/Plugin/inc/ocpn_plugin.h → inc/ocpn_plugin.h b/Plugin/inc/ocpn_plugin.h → inc/ocpn_plugin.h
diff --git a/Plugin/inc/twocandevice.h → inc/twocandevice.h b/Plugin/inc/twocandevice.h → inc/twocandevice.h
diff --git a/Plugin/inc/twocanerror.h → inc/twocanerror.h b/Plugin/inc/twocanerror.h → inc/twocanerror.h
diff --git a/Plugin/inc/twocanlogreader.h → inc/twocanlogreader.h b/Plugin/inc/twocanlogreader.h → inc/twocanlogreader.h
diff --git a/Plugin/inc/twocanplugin.h → inc/twocanplugin.h b/Plugin/inc/twocanplugin.h → inc/twocanplugin.h
diff --git a/Plugin/inc/twocansettings.h → inc/twocansettings.h b/Plugin/inc/twocansettings.h → inc/twocansettings.h
diff --git a/Plugin/inc/twocansettingsbase.h → inc/twocansettingsbase.h b/Plugin/inc/twocansettingsbase.h → inc/twocansettingsbase.h
diff --git a/Plugin/inc/twocansocket.h → inc/twocansocket.h b/Plugin/inc/twocansocket.h → inc/twocansocket.h
diff --git a/Plugin/inc/twocanutils.h → inc/twocanutils.h b/Plugin/inc/twocanutils.h → inc/twocanutils.h
diff --git a/Plugin/inc/version.h → inc/version.h b/Plugin/inc/version.h → inc/version.h
diff --git a/Plugin/po/POTFILES.in → po/POTFILES.in b/Plugin/po/POTFILES.in → po/POTFILES.in
diff --git a/Plugin/po/ar_SA.po → po/ar_SA.po b/Plugin/po/ar_SA.po → po/ar_SA.po
diff --git a/Plugin/po/bg_BG.po → po/bg_BG.po b/Plugin/po/bg_BG.po → po/bg_BG.po
diff --git a/Plugin/po/ca_ES.po → po/ca_ES.po b/Plugin/po/ca_ES.po → po/ca_ES.po
diff --git a/Plugin/po/cs_CZ.po → po/cs_CZ.po b/Plugin/po/cs_CZ.po → po/cs_CZ.po
diff --git a/Plugin/po/da_DK.po → po/da_DK.po b/Plugin/po/da_DK.po → po/da_DK.po
diff --git a/Plugin/po/de_DE.po → po/de_DE.po b/Plugin/po/de_DE.po → po/de_DE.po
diff --git a/Plugin/po/el_GR.po → po/el_GR.po b/Plugin/po/el_GR.po → po/el_GR.po
diff --git a/Plugin/po/es_ES.po → po/es_ES.po b/Plugin/po/es_ES.po → po/es_ES.po
diff --git a/Plugin/po/et_EE.po → po/et_EE.po b/Plugin/po/et_EE.po → po/et_EE.po
diff --git a/Plugin/po/fi_FI.po → po/fi_FI.po b/Plugin/po/fi_FI.po → po/fi_FI.po
diff --git a/Plugin/po/fil_PH.po → po/fil_PH.po b/Plugin/po/fil_PH.po → po/fil_PH.po
diff --git a/Plugin/po/fr_FR.po → po/fr_FR.po b/Plugin/po/fr_FR.po → po/fr_FR.po
diff --git a/Plugin/po/gl_ES.po → po/gl_ES.po b/Plugin/po/gl_ES.po → po/gl_ES.po
diff --git a/Plugin/po/hi_IN.po → po/hi_IN.po b/Plugin/po/hi_IN.po → po/hi_IN.po
diff --git a/Plugin/po/hu_HU.po → po/hu_HU.po b/Plugin/po/hu_HU.po → po/hu_HU.po
diff --git a/Plugin/po/id_ID.po → po/id_ID.po b/Plugin/po/id_ID.po → po/id_ID.po
diff --git a/Plugin/po/is_IS.po → po/is_IS.po b/Plugin/po/is_IS.po → po/is_IS.po
diff --git a/Plugin/po/it_IT.po → po/it_IT.po b/Plugin/po/it_IT.po → po/it_IT.po
diff --git a/Plugin/po/ja_JP.po → po/ja_JP.po b/Plugin/po/ja_JP.po → po/ja_JP.po
diff --git a/Plugin/po/ko_KR.po → po/ko_KR.po b/Plugin/po/ko_KR.po → po/ko_KR.po
diff --git a/Plugin/po/mr_IN.po → po/mr_IN.po b/Plugin/po/mr_IN.po → po/mr_IN.po
diff --git a/Plugin/po/nb_NO.po → po/nb_NO.po b/Plugin/po/nb_NO.po → po/nb_NO.po
diff --git a/Plugin/po/nl_NL.po → po/nl_NL.po b/Plugin/po/nl_NL.po → po/nl_NL.po
diff --git a/Plugin/po/pl_PL.po → po/pl_PL.po b/Plugin/po/pl_PL.po → po/pl_PL.po
diff --git a/Plugin/po/pt_BR.po → po/pt_BR.po b/Plugin/po/pt_BR.po → po/pt_BR.po
diff --git a/Plugin/po/pt_PT.po → po/pt_PT.po b/Plugin/po/pt_PT.po → po/pt_PT.po
diff --git a/Plugin/po/ro_RO.po → po/ro_RO.po b/Plugin/po/ro_RO.po → po/ro_RO.po
diff --git a/Plugin/po/ru_RU.po → po/ru_RU.po b/Plugin/po/ru_RU.po → po/ru_RU.po
diff --git a/Plugin/po/sv_SE.po → po/sv_SE.po b/Plugin/po/sv_SE.po → po/sv_SE.po
diff --git a/Plugin/po/th_TH.po → po/th_TH.po b/Plugin/po/th_TH.po → po/th_TH.po
diff --git a/Plugin/po/tr_TR.po → po/tr_TR.po b/Plugin/po/tr_TR.po → po/tr_TR.po
diff --git a/Plugin/po/twocan_pi.pot → po/twocan_pi.pot b/Plugin/po/twocan_pi.pot → po/twocan_pi.pot
diff --git a/Plugin/po/vi_VN.po → po/vi_VN.po b/Plugin/po/vi_VN.po → po/vi_VN.po
diff --git a/Plugin/po/zh_CN.po → po/zh_CN.po b/Plugin/po/zh_CN.po → po/zh_CN.po
diff --git a/Plugin/po/zh_TW.po → po/zh_TW.po b/Plugin/po/zh_TW.po → po/zh_TW.po
diff --git a/Plugin/src/twocandevice.cpp → src/twocandevice.cpp b/Plugin/src/twocandevice.cpp → src/twocandevice.cpp
@@ -38,7 +38,7 @@
 // 2. Rewrite/Port Adapter drivers to C++
 //
 
-#include "twocandevice.h"
+#include "../inc/twocandevice.h"
 
 TwoCanDevice::TwoCanDevice(wxEvtHandler *handler) : wxThread(wxTHREAD_DETACHED) {
 	// Save a reference to our "parent", the plugin event handler so we can pass events to it

diff --git a/Plugin/src/twocanerror.cpp → src/twocanerror.cpp b/Plugin/src/twocanerror.cpp → src/twocanerror.cpp
@@ -24,7 +24,7 @@
 // Date: 6/8/2018
 // Version: 1.0
 
-#include "twocanerror.h"
+#include "..\inc\twocanerror.h"
 
 #ifdef __LINUX__
 #include <cerrno>

diff --git a/Plugin/src/twocanlogreader.cpp → src/twocanlogreader.cpp b/Plugin/src/twocanlogreader.cpp → src/twocanlogreader.cpp
diff --git a/Plugin/src/twocanplugin.cpp → src/twocanplugin.cpp b/Plugin/src/twocanplugin.cpp → src/twocanplugin.cpp
@@ -32,7 +32,7 @@
 //
 
 
-#include "twocanplugin.h"
+#include "../inc/twocanplugin.h"
 
 // Globally accessible variables used by the plugin, device and the settings dialog.
 wxFileConfig *configSettings;

diff --git a/Plugin/src/twocansettings.cpp → src/twocansettings.cpp b/Plugin/src/twocansettings.cpp → src/twocansettings.cpp
@@ -31,7 +31,7 @@
 // 2. Prevent user selecting both LogFile reader and Log Raw frames !
 //
 
-#include "twocansettings.h"
+#include "../inc/twocansettings.h"
 
 // Constructor and destructor implementation
 // inherits froms TwoCanSettingsBase which was implemented using wxFormBuilder

diff --git a/Plugin/src/twocansettingsbase.cpp → src/twocansettingsbase.cpp b/Plugin/src/twocansettingsbase.cpp → src/twocansettingsbase.cpp
@@ -5,7 +5,7 @@
 // PLEASE DO *NOT* EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
-#include "twocansettingsbase.h"
+#include "../inc/twocansettingsbase.h"
 
 ///////////////////////////////////////////////////////////////////////////
 

diff --git a/Plugin/src/twocansocket.cpp → src/twocansocket.cpp b/Plugin/src/twocansocket.cpp → src/twocansocket.cpp
diff --git a/Plugin/src/twocanutils.cpp → src/twocanutils.cpp b/Plugin/src/twocanutils.cpp → src/twocanutils.cpp
@@ -28,7 +28,7 @@
 // 1. Any additional functions ??
 //
 
-#include "twocanutils.h"
+#include "../inc/twocanutils.h"
 
 int TwoCanUtils::ConvertByteArrayToInteger(const byte *buf, unsigned int *value) {
 	if ((buf != NULL) && (value != NULL)) {