Minor build changes:auto versioning

5 files changed, 31 insertions, 13 deletions

diff --git a/ldmicro/CMakeLists.txt b/ldmicro/CMakeLists.txt
index 8f5a5e8..b013b90 100644
--- a/ldmicro/CMakeLists.txt
+++ b/ldmicro/CMakeLists.txt
@@ -2,11 +2,10 @@ cmake_minimum_required(VERSION 2.6)
 
 project(LDMicro)
 
-file(READ "${CMAKE_CURRENT_SOURCE_DIR}/includes/ldmicroVC.h" VersionRead)
-
-string(REGEX MATCH "LDMicro_VERSION_MAJOR ([0-9]*)" LDMicro_VERSION_MAJOR ${VersionRead})
-string(REGEX MATCH "LDMicro_VERSION_MINOR ([0-9]*)" LDMicro_VERSION_MINOR ${VersionRead})
-string(REGEX MATCH "LDMicro_VERSION_PATCH ([0-9]*)" LDMicro_VERSION_PATCH ${VersionRead})
+#set version here. This version is updated to ldmicroVC.h
+set(LDMicro_VERSION_MAJOR 2)
+set(LDMicro_VERSION_MINOR 3)
+set(LDMicro_VERSION_PATCH 0)
 
 macro(use_cxx14)
 
@@ -207,6 +206,9 @@ endif()
     set(CPACK_PACKAGE_VERSION_MAJOR ${LDMicro_VERSION_MAJOR})
     set(CPACK_PACKAGE_VERSION_MINOR ${LDMicro_VERSION_MINOR})
     set(CPACK_PACKAGE_VERSION_PATCH ${LDMicro_VERSION_PATCH})
+
+    set (CPACK_DEBIAN_FILE_NAME
+        "LDmicro_Qt-${LDMicro_VERSION_MAJOR}.${LDMicro_VERSION_MINOR}.${LDMicro_VERSION_PATCH}-${RELEASE_CODENAME}.deb")
     
     set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
     set(CPACK_PACKAGE_DESCRIPTION "Ladder Logic editor, simulator and compiler for 8 bit microcontrollers")
diff --git a/ldmicro/helpdialog.cpp b/ldmicro/helpdialog.cpp
index 79791f1..a0148a8 100644
--- a/ldmicro/helpdialog.cpp
+++ b/ldmicro/helpdialog.cpp
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <iostream>
+#include "ldmicroVC.h"
 //#include <commctrl.h>
 //#include <richedit.h>
 
@@ -59,13 +60,19 @@ static char *AboutText[] = {
 "You should have received a copy of the GNU General Public License along",
 "with this program. If not, see <http://www.gnu.org/licenses/>.",
 "",
-"The source code for LDmicro is available at",
+"The source code for LDmicroQt is available at",
+"",
+"    https://github.com/FOSSEE/LDmicroQt",
+"",
+"The original LDmicro source code is available at",
 "",
 "    http://cq.cx/ladder.pl",
 "",
 "Copyright 2005-2010 Jonathan Westhues",
-"Release 2.2, built " __TIME__ " " __DATE__ ".",
+"Release " LDMicro_VERSION_MAJOR "." LDMicro_VERSION_MINOR
+", built " __TIME__ " " __DATE__ ".",
 "",
+"Email: user info, at host fossee.in",
 "Email: user jwesthues, at host cq.cx",
 "",
 NULL
diff --git a/ldmicro/includes/ldmicroVC.h b/ldmicro/includes/ldmicroVC.h
index 151beb9..18a7c19 100644
--- a/ldmicro/includes/ldmicroVC.h
+++ b/ldmicro/includes/ldmicroVC.h
@@ -1,4 +1,8 @@
 /// version control
-#define LDMicro_VERSION_MAJOR 2
-#define LDMicro_VERSION_MINOR 2
-#define LDMicro_VERSION_PATCH 1
+#ifndef __LDMICRO_VC_
+#define __LDMICRO_VC_
+
+#define LDMicro_VERSION_MAJOR "2"
+#define LDMicro_VERSION_MINOR "3"
+
+#endif
diff --git a/ldmicro/includes/ldmicroVC.h.in b/ldmicro/includes/ldmicroVC.h.in
index 46c0e4a..9fa9d38 100644
--- a/ldmicro/includes/ldmicroVC.h.in
+++ b/ldmicro/includes/ldmicroVC.h.in
@@ -1,3 +1,8 @@
 /// version control
-#define LDMicro_VERSION_MAJOR @LDMicro_VERSION_MAJOR@
-#define LDMicro_VERSION_MINOR @LDMicro_VERSION_MINOR@
+#ifndef __LDMICRO_VC_
+#define __LDMICRO_VC_
+
+#define LDMicro_VERSION_MAJOR "@LDMicro_VERSION_MAJOR@"
+#define LDMicro_VERSION_MINOR "@LDMicro_VERSION_MINOR@"
+
+#endif
diff --git a/ldmicro/lib/linuxUI/linuxUI.h b/ldmicro/lib/linuxUI/linuxUI.h
index 631e11d..356dca6 100644
--- a/ldmicro/lib/linuxUI/linuxUI.h
+++ b/ldmicro/lib/linuxUI/linuxUI.h
@@ -36,7 +36,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include "linuxLD.h"
-#include "ldmicroVC.h"
+// #include "ldmicroVC.h"
 
 // 4000 ICON "ldmicro.ico"