Introduction of CMake for BUSMASTER solution/project generation.

Signed-off-by: Tobias Lorenz <[email protected]>
tonyzhu918 · Aug 28, 2014 · c1a4a39 · c1a4a39
1 parent 623daaf
commit c1a4a39
Show file tree

Hide file tree

Showing 294 changed files with 2,848 additions and 35,057 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,257 +1,14 @@
 # Generic files
 *~
 *.orig
+*.user
 
-# Visual Studio intermediate files
-*.aps
-*.APS
-*.bak
-*.ipch
-*.opensdf
-*.ncb
-*.pch
-*.pdb
-*.sdf
-*.sln
-*.sln.cache
-*.suo
-*.vcproj.*.user
-*.vcxproj.user
-*.db
-Sources/Application/BUSMASTER_Interface.c
-Sources/Application/BUSMASTER_Interface.h
-Sources/Application/LDFLexer.c
-Sources/Application/ldfparser.cpp
-Sources/Application/ldfparser.cpp.output
-Sources/Application/ldfparser.cpp.h
-Sources/BusEmulation/BusEmulation.h
-Sources/BusEmulation/BusEmulation_i.c
-Sources/BusEmulation/BusEmulation_p.c
-Sources/BusEmulation/dlldata.c
-Sources/EXTERNAL/DmGraph/DMGraph.h
-Sources/EXTERNAL/DmGraph/DMGraph.tlb
-Sources/EXTERNAL/DmGraph/DMGraph_i.c
-Sources/EXTERNAL/DmGraph/DMGraph_p.c
-Sources/Format Converter/AscLogConverter/Asc_Log_Lexer.c
-Sources/Format Converter/AscLogConverter/asc_log_parser.c
-Sources/Format Converter/AscLogConverter/Asc_Log_Parser.h
-Sources/Format Converter/CAPL2CConverter/CAPL_C_Lexer.h
-Sources/Format Converter/DBC2DBFConverterLibrary/dbc_dbf_Lexer.c
-Sources/Format Converter/LogAscConverter/Log_Asc_Lexer.c
-Sources/Format Converter/LogAscConverter/log_asc_parser.c
-Sources/Format Converter/LogAscConverter/log_asc_parser.h
-Sources/TestSuiteExecutorGUI/lexer.c
-Sources/TestSuiteExecutorGUI/parser.c
-Sources/TestSuiteExecutorGUI/parser.h
+# build directories
+Sources/build
+Sources/Format Converter/build
 
-# Release dirs (except BIN)
-Sources/Application/Release
-Sources/BusEmulation/Release
-Sources/CAN_ETAS_BOA/Release
-Sources/CAN_ICS_neoVI/Release
-Sources/CAN_iVIEW/Release
-Sources/CAN_ISOLAR_EVE_VCAN/Release
-Sources/CAN_IXXAT_VCI/Release
-Sources/CAN_Kvaser_CAN/Release
-Sources/CAN_MHS/Release
-Sources/CAN_NSI/Release
-Sources/CAN_STUB/Release
-Sources/CAN_Vector_XL/Release
-Sources/CAN_VSCOM/Release
-Sources/CommonClass/Release
-Sources/ConfigDialogsDIL/Release
-Sources/DataTypes/Release
-Sources/DIL_Interface/Release
-Sources/DIL_J1939/Release
-Sources/EXTERNAL/*/Release
-Sources/Filter/Release
-Sources/FLEXRAY_ETAS_BOA/Release
-Sources/Format Converter/build/
-Sources/Format Converter/Release
-Sources/Format Converter/*/Release
-Sources/FrameProcessor/Release
-Sources/LIN_ETAS_BOA/Release
-Sources/LIN_ISOLAR_EVE_VLIN/Release
-Sources/LIN_PEAK_USB/Release
-Sources/LIN_Vector_XL/Release
-Sources/MHS_CNFG/Release
-Sources/NodeSimEx/Release
-Sources/ProjectConfiguration/Release
-Sources/PSDI_CAN/Release
-Sources/Replay/Release
-Sources/SigGrphWnd/Release
-Sources/SignalDefiner/Release
-Sources/SignalWatch/Release
-Sources/TestSetupEditorGUI/Release
-Sources/TestSetupEditorLib/Release
-Sources/TestSuiteExecutorGUI/Release
-Sources/TXWindow/Release
-Sources/TXWindowFlexRay/Release
-Sources/TXWindowLIN/Release
-Sources/UDS_Protocol/Release
-Sources/Utility/Release
-
-# Debug dirs (except BIN)
-Sources/Application/Debug
-Sources/BusEmulation/Debug
-Sources/CAN_ETAS_BOA/Debug
-Sources/CAN_ICS_neoVI/Debug
-Sources/CAN_iVIEW/Debug
-Sources/CAN_ISOLAR_EVE_VCAN/Debug
-Sources/CAN_IXXAT_VCI/Debug
-Sources/CAN_Kvaser_CAN/Debug
-Sources/CAN_MHS/Debug
-Sources/CAN_NSI/Debug
-Sources/CAN_STUB/Debug
-Sources/CAN_Vector_XL/Debug
-Sources/CAN_VSCOM/Debug
-Sources/CommonClass/Debug
-Sources/ConfigDialogsDIL/Debug
-Sources/DataTypes/Debug
-Sources/DIL_Interface/Debug
-Sources/DIL_J1939/Debug
-Sources/EXTERNAL/*/Debug
-Sources/EXTERNAL/*/DebugU
-Sources/EXTERNAL/*/ReleaseUMinSize
-Sources/Filter/Debug
-Sources/FLEXRAY_ETAS_BOA/Debug
-Sources/Format Converter/Debug
-Sources/Format Converter/*/Debug
-Sources/FrameProcessor/Debug
-Sources/LIN_ETAS_BOA/Debug
-Sources/LIN_ISOLAR_EVE_VLIN/Debug
-Sources/LIN_PEAK_USB/Debug
-Sources/LIN_Vector_XL/Debug
-Sources/MHS_CNFG/Debug
-Sources/NodeSimEx/Debug
-Sources/ProjectConfiguration/Debug
-Sources/PSDI_CAN/Debug
-Sources/Replay/Debug
-Sources/SigGrphWnd/Debug
-Sources/SignalDefiner/Debug
-Sources/SignalWatch/Debug
-Sources/TestSetupEditorGUI/Debug
-Sources/TestSetupEditorLib/Debug
-Sources/TestSuiteExecutorGUI/Debug
-Sources/TXWindow/Debug
-Sources/TXWindowFlexRay/Debug
-Sources/TXWindowLIN/Debug
-Sources/UDS_Protocol/Debug
-Sources/Utility/Debug
-
-# Files in BIN (except hardware specific files)
-Sources/BIN/*/*.bmp
-Sources/BIN/*/*.c
-Sources/BIN/*/*.chm
-Sources/BIN/*/*.exe
-Sources/BIN/*/*.h
-Sources/BIN/*/*.ilk
-Sources/BIN/*/*.pdb
-Sources/BIN/*/*.tlb
-Sources/BIN/*/AdvancedUIPlugin.dll
-Sources/BIN/*/BUSMASTER.Build.CppClean.log
-Sources/BIN/*/CAN_ETAS_BOA.dll
-Sources/BIN/*/CAN_ETAS_BOA_1_4.dll
-Sources/BIN/*/CAN_ETAS_BOA_1_5.dll
-Sources/BIN/*/CAN_ETAS_BOA_2.dll
-Sources/BIN/*/CAN_ICS_neoVI.dll
-Sources/BIN/*/CAN_i-View.dll
-Sources/BIN/*/CAN_ISOLAR_EVE_VCAN.dll
-Sources/BIN/*/CAN_IXXAT_VCI.dll
-Sources/BIN/*/CAN_IXXAT_VCI.map
-Sources/BIN/*/CAN_Kvaser_CAN.dll
-Sources/BIN/*/CAN_MHS.dll
-Sources/BIN/*/CAN_NSI.dll
-Sources/BIN/*/CAN_STUB.dll
-Sources/BIN/*/CAN_Vector_XL.dll
-Sources/BIN/*/CAN_VSCOM.dll
-Sources/BIN/*/Changelog.txt
-Sources/BIN/*/ConfigDialogsDIL.dll
-Sources/BIN/*/ConverterPlugins/AscLogConverter.dll
-Sources/BIN/*/ConverterPlugins/BlfLibrary.dll
-Sources/BIN/*/ConverterPlugins/BlfLogConverter.dll
-Sources/BIN/*/ConverterPlugins/CAPL2CConverter.dll
-Sources/BIN/*/ConverterPlugins/CAPL2CConverterJPN.dll
-Sources/BIN/*/ConverterPlugins/DBC2DBFConverter.dll
-Sources/BIN/*/ConverterPlugins/DBC2DBFConverterLibrary.dll
-Sources/BIN/*/ConverterPlugins/DBF2DBCConverter.dll
-Sources/BIN/*/ConverterPlugins/J1939DBC2DBFConverter.dll
-Sources/BIN/*/ConverterPlugins/LogAscConverter.dll
-Sources/BIN/*/ConverterPlugins/LogToExcelConverter.dll
-Sources/BIN/*/ConverterPlugins/LogToExcelConverterJPN.dll
-Sources/BIN/*/DIL_Interface.dll
-Sources/BIN/*/DIL_J1939.dll
-Sources/BIN/*/DMGraph.dll
-Sources/BIN/*/DMGraph.exp
-Sources/BIN/*/DMGraph.lib
-Sources/BIN/*/Filter.dll
-Sources/BIN/*/FlexRay_ETAS_BOA_1_4.dll
-Sources/BIN/*/FlexRay_ETAS_BOA_1_5.dll
-Sources/BIN/*/FlexRay_ETAS_BOA_2.dll
-Sources/BIN/*/FrameProcessor.dll
-Sources/BIN/*/LIN_ETAS_BOA.dll
-Sources/BIN/*/LIN_ISOLAR_EVE_VLIN.dll
-Sources/BIN/*/LIN_PEAK_USB.dll
-Sources/BIN/*/LIN_Vector_XL.dll
-Sources/BIN/*/mhsbmcfg.dll
-Sources/BIN/*/NodeSimEx.dll
-Sources/BIN/*/PSDI_CAN.dll
-Sources/BIN/*/ProjectConfiguration.dll
-Sources/BIN/*/Replay.dll
-Sources/BIN/*/SigGrphWnd.dll
-Sources/BIN/*/SignalDefiner.dll
-Sources/BIN/*/SignalWatch.dll
-Sources/BIN/*/TXWindow.dll
-Sources/BIN/*/TXWindowFlexRay.dll
-Sources/BIN/*/TXWindowLIN.dll
-Sources/BIN/*/TestSetupEditorGUI.dll
-Sources/BIN/*/TestSuiteExecutorGUI.dll
-Sources/BIN/*/UDS_Protocol.dll
-Sources/BIN/*/JPN
-Sources/BIN/DumpFiles
-Sources/BIN/Libs/*/*.exp
-Sources/BIN/Libs/*/CAN_ETAS_BOA.lib
-Sources/BIN/Libs/*/CAN_ETAS_BOA_1_4.lib
-Sources/BIN/Libs/*/CAN_ETAS_BOA_1_5.lib
-Sources/BIN/Libs/*/CAN_ETAS_BOA_2.lib
-Sources/BIN/Libs/*/CAN_i-VIEW.lib
-Sources/BIN/Libs/*/CAN_ISOLAR_EVE_VCAN.lib
-Sources/BIN/Libs/*/CAN_IXXAT_VCI.lib
-Sources/BIN/Libs/*/CAN_ICS_neoVI.lib
-Sources/BIN/Libs/*/CAN_Kvaser_CAN.lib
-Sources/BIN/Libs/*/CAN_MHS.lib
-Sources/BIN/Libs/*/CAN_NSI.lib
-Sources/BIN/Libs/*/CAN_PEAK_USB.lib
-Sources/BIN/Libs/*/CAN_STUB.lib
-Sources/BIN/Libs/*/CAN_Vector_XL.lib
-Sources/BIN/Libs/*/CAN_VSCOM.lib
-Sources/BIN/Libs/*/CommonClass.lib
-Sources/BIN/Libs/*/ConfigDialogsDIL.lib
-Sources/BIN/Libs/*/DIL_Interface.lib
-Sources/BIN/Libs/*/DIL_J1939.lib
-Sources/BIN/Libs/*/DataTypes.lib
-Sources/BIN/Libs/*/Filter.lib
-Sources/BIN/Libs/*/FlexRay_ETAS_BOA_1_4.lib
-Sources/BIN/Libs/*/FlexRay_ETAS_BOA_1_5.lib
-Sources/BIN/Libs/*/FlexRay_ETAS_BOA_2.lib
-Sources/BIN/Libs/*/FrameProcessor.lib
-Sources/BIN/Libs/*/NodeSimEx.lib
-Sources/BIN/Libs/*/PSDI_CAN.lib
-Sources/BIN/Libs/*/ProjectConfiguration.lib
-Sources/BIN/Libs/*/Replay.lib
-Sources/BIN/Libs/*/SigGrphWnd.lib
-Sources/BIN/Libs/*/SignalDefiner.lib
-Sources/BIN/Libs/*/SignalWatch.lib
-Sources/BIN/Libs/*/TXWindow.lib
-Sources/BIN/Libs/*/TXWindowLIN.lib
-Sources/BIN/Libs/*/TestSetupEditorGUI.lib
-Sources/BIN/Libs/*/TestSetupEditorLib.lib
-Sources/BIN/Libs/*/TestSuiteExecutorGUI.lib
-Sources/BIN/Libs/*/UDS_Protocol.lib
-Sources/BIN/Libs/*/Utils.lib
-Sources/EXTERNAL/DmGraph/DMGraph.h
-Sources/EXTERNAL/DmGraph/DMGraph_i.c
-Sources/EXTERNAL/DmGraph/DMGraph_p.c
+# binary target folder
+Sources/BIN
 
 # Installation Setup
 Installation Setup/BUSMASTER_Cleanup_Registry.exe

diff --git a/Installation Setup/BUSMASTER INSTALL SCRIPT.nsi b/Installation Setup/BUSMASTER INSTALL SCRIPT.nsi
@@ -398,9 +398,9 @@ Section "BUSMASTER"
   File ..\Sources\BIN\Release\BusEmulation.exe
   File ..\Sources\BIN\Release\BUSMASTER.exe
   File ..\Sources\BIN\Release\BUSMASTER.exe.manifest
-  File ..\Sources\Application\BUSMASTER.tlb
-  File ..\Sources\Application\BUSMASTER_Interface.c
-  File ..\Sources\Application\BUSMASTER_Interface.h
+  File ..\Sources\BIN\Release\BUSMASTER.tlb
+  File ..\Sources\BIN\Release\BUSMASTER_Interface.c
+  File ..\Sources\BIN\Release\BUSMASTER_Interface.h
   File ..\Sources\BIN\Release\CAN_STUB.dll
   File ..\Sources\BIN\Release\Changelog.txt
   File ..\Sources\BIN\Release\DIL_Interface.dll
@@ -537,7 +537,7 @@ SectionEnd
 Section "DMGraph"
     SectionIn RO 1 2 3
     SetOutPath $INSTDIR
-    File ..\Sources\BIN\ReleaseUMinSize\DMGraph.dll
+    File ..\Sources\BIN\Release\DMGraph.dll
 SectionEnd
 
 SectionGroupEnd

diff --git a/Sources/Application/Application.cpp b/Sources/Application/Application.cpp
@@ -21,7 +21,7 @@
 
 #include "StdAfx.h"
 #include "Application.h"
-#include "BUSMASTER_Interface.h"
+#include "CAN_MonitorApp.h"
 
 IMPLEMENT_DYNCREATE(CApplication, CCmdTarget)
 

diff --git a/Sources/Application/Application.h b/Sources/Application/Application.h
@@ -39,7 +39,7 @@
 #include "FrameProcessor/BaseFrameProcessor_CAN.h"
 #include "Struct.h"
 #include "Utility/Utility.h"
-#include "BUSMASTER_Interface.h"
+#include "CAN_MonitorApp.h"
 #include "BUSMASTER.h"
 #include "MainFrm.h"
 #include "DIL_interface/BaseDIL_CAN.h"

diff --git a/Sources/Application/BUSMASTER.cpp b/Sources/Application/BUSMASTER.cpp
@@ -37,8 +37,8 @@
 #include "InterfaceGetter.h"
 
 #include "BusmasterDump.h"
-#include "BUSMASTER_Interface.h"
-#include "BUSMASTER_Interface.c"
+#include "CAN_MonitorApp.h"
+#include "CAN_MonitorApp_i.c"
 #include "../Application/MultiLanguage.h"
 #include "Utility\MultiLanguageSupport.h"
 

diff --git a/Sources/BIN/Release/BUSMASTER.exe.manifest → Sources/Application/BUSMASTER.exe.manifest b/Sources/BIN/Release/BUSMASTER.exe.manifest → Sources/Application/BUSMASTER.exe.manifest
diff --git a/Sources/Application/BUSMASTER.rc b/Sources/Application/BUSMASTER.rc
@@ -34,7 +34,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // TYPELIB
 //
 
-1                       TYPELIB                 "BUSMASTER.tlb"
+1                       TYPELIB                 "CAN_MonitorApp.tlb"
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -50,7 +50,7 @@ END
 2 TEXTINCLUDE 
 BEGIN
     "#include ""afxres.h""\r\n"
-    "1 TYPELIB ""BUSMASTER.tlb""\r\n"
+    "1 TYPELIB ""CAN_MonitorApp.tlb""\r\n"
     "\r\n"
     "\r\n"
     "\0"