Preparing for 1.12.4

grodansparadis · May 13, 2016 · f808763 · f808763
1 parent f3b7180
commit f808763
Show file tree

Hide file tree

Showing 10 changed files with 52 additions and 74 deletions.
diff --git a/nbproject/private/configurations.xml b/nbproject/private/configurations.xml
@@ -162,8 +162,6 @@
           </df>
           <df name="testws">
           </df>
-          <df name="web">
-          </df>
         </df>
       </df>
       <df name="database">

diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
@@ -43,31 +43,6 @@
         </file>
     </editor-bookmarks>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
-        <group>
-            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/register.h</file>
-            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/vscpworks/vscpworks.h</file>
-            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpautomation.h</file>
-            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/tcpipclientthread.cpp</file>
-            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpwebserver.cpp</file>
-            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscprestserver.cpp</file>
-            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpeventhelper.cpp</file>
-            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/vscpworks/frmmain.cpp</file>
-            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpwebsocketserver.cpp</file>
-            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpwebserver.h</file>
-            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpvariable.cpp</file>
-            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/daemon/linux/vscpd.cpp</file>
-            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/vscpworks/frmdeviceconfig.h</file>
-            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/webserver_websocket.h</file>
-            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/vscpworks/vscpworks.cpp</file>
-            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/controlobject.cpp</file>
-            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/variablecodes.h</file>
-            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/register.cpp</file>
-            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpautomation.cpp</file>
-            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/vscpworks/frmdeviceconfig.cpp</file>
-            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/clientlist.h</file>
-            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpvariable.h</file>
-            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/vscpworks/devicebootloaderwizard_images.h</file>
-            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/controlobject.h</file>
-        </group>
+        <group/>
     </open-files>
 </project-private>
diff --git a/src/vscp/common/version.h b/src/vscp/common/version.h
@@ -26,10 +26,10 @@
 
 #define VSCPD_MAJOR_VERSION     1
 #define VSCPD_MINOR_VERSION     12
-#define VSCPD_SUB_VERSION       3
-#define VSCPD_BUILD_VERSION     15
+#define VSCPD_SUB_VERSION       4
+#define VSCPD_BUILD_VERSION     0
 
-#define VSCPD_DISPLAY_VERSION "1.12.3.15 Magnesium"
+#define VSCPD_DISPLAY_VERSION "1.12.4.0 Magnesium"
 
 #define VSCPD_COPYRIGHT "Copyright (C) 2000-2016, Grodans Paradis AB, http://www.paradiseofthefrog.com"
 #define VSCPD_COPYRIGHT_HTML "Copyright (C) 2000-2016, <a href=\"mailto:[email protected]\">Paradise of the Frog</a>, <a href=\"http://www.paradiseofthefrog.com\">http://www.paradiseofthefrog.com</a>"

diff --git a/src/vscp/daemon/linux/codelite_vscpd/.codelite/codelite_vscpd.session b/src/vscp/daemon/linux/codelite_vscpd/.codelite/codelite_vscpd.session
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Session Name="/home/akhe/development/VSCP/vscp/src/vscp/daemon/linux/codelite_vscpd/codelite_vscpd.workspace">
-  <int Value="23" Name="m_selectedTab"/>
+  <int Value="24" Name="m_selectedTab"/>
   <wxString Value="/home/akhe/development/VSCP/vscp/src/vscp/daemon/linux/codelite_vscpd/codelite_vscpd.workspace" Name="m_workspaceName"/>
   <TabInfoArray Name="TabInfoArray">
     <TabInfo>
@@ -171,6 +171,13 @@
       <wxArrayString Name="Bookmarks"/>
       <IntVector Name="CollapsedFolds"/>
     </TabInfo>
+    <TabInfo>
+      <wxString Value="/home/akhe/development/VSCP/vscp/src/vscp/common/version.h" Name="FileName"/>
+      <int Value="23" Name="FirstVisibleLine"/>
+      <int Value="31" Name="CurrentLine"/>
+      <wxArrayString Name="Bookmarks"/>
+      <IntVector Name="CollapsedFolds"/>
+    </TabInfo>
   </TabInfoArray>
   <SerializedObject Name="m_breakpoints">
     <long Value="4" Name="Count"/>

diff --git a/src/vscp/daemon/linux/codelite_vscpd/.codelite/refactoring.db b/src/vscp/daemon/linux/codelite_vscpd/.codelite/refactoring.db
diff --git a/src/vscp/daemon/linux/nbproject/configurations.xml b/src/vscp/daemon/linux/nbproject/configurations.xml
@@ -486,6 +486,9 @@
             <preprocessorList>
               <Elem>MG_ENABLE_THREADS</Elem>
               <Elem>VSCP_ENABLE_LUA</Elem>
+              <Elem>VSCP_ENABLE_SQLITE3</Elem>
+              <Elem>VSCP_ENABLE_SQLITE3</Elem>
+              <Elem>VSCP_ENABLE_SQLITE3</Elem>
               <Elem>WXUSINGDLL</Elem>
               <Elem>_FILE_OFFSET_BITS=64</Elem>
               <Elem>__WXGTK__</Elem>
@@ -495,6 +498,8 @@
             <preprocessorList>
               <Elem>MG_ENABLE_THREADS</Elem>
               <Elem>VSCP_ENABLE_LUA</Elem>
+              <Elem>VSCP_ENABLE_SQLITE3</Elem>
+              <Elem>VSCP_ENABLE_SQLITE3</Elem>
               <Elem>WXUSINGDLL</Elem>
               <Elem>_FILE_OFFSET_BITS=64</Elem>
               <Elem>__WXGTK__</Elem>
@@ -1293,39 +1298,6 @@
           </preprocessorList>
         </ccTool>
       </folder>
-      <folder path="common/SendRawPacket">
-        <cTool>
-          <preprocessorList>
-            <Elem>VSCP_ENABLE_SQLITE3</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="common/dl">
-        <cTool>
-          <preprocessorList>
-            <Elem>VSCP_ENABLE_SQLITE3</Elem>
-          </preprocessorList>
-        </cTool>
-        <ccTool>
-          <preprocessorList>
-            <Elem>VSCP_ENABLE_SQLITE3</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="common/kwxIndControlSource-0.3.0">
-        <ccTool>
-          <preprocessorList>
-            <Elem>VSCP_ENABLE_SQLITE3</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="common/zlib">
-        <cTool>
-          <preprocessorList>
-            <Elem>VSCP_ENABLE_SQLITE3</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
       <folder path="src">
         <cTool>
           <incDir>

diff --git a/src/vscp/daemon/linux/nbproject/private/private.xml b/src/vscp/daemon/linux/nbproject/private/private.xml
@@ -9,6 +9,25 @@
     </data>
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
-        <group/>
+        <group>
+            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/register.h</file>
+            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpautomation.h</file>
+            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/tcpipclientthread.cpp</file>
+            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpwebserver.cpp</file>
+            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscprestserver.cpp</file>
+            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpeventhelper.cpp</file>
+            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpwebsocketserver.cpp</file>
+            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpwebserver.h</file>
+            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpvariable.cpp</file>
+            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/daemon/linux/vscpd.cpp</file>
+            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/webserver_websocket.h</file>
+            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/controlobject.cpp</file>
+            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/variablecodes.h</file>
+            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/register.cpp</file>
+            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpautomation.cpp</file>
+            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/clientlist.h</file>
+            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpvariable.h</file>
+            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/controlobject.h</file>
+        </group>
     </open-files>
 </project-private>
diff --git a/src/vscp/drivers/level2/socketcan/linux/nbproject/private/private.xml b/src/vscp/drivers/level2/socketcan/linux/nbproject/private/private.xml
@@ -9,6 +9,11 @@
     </data>
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
-        <group/>
+        <group>
+            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscp.h</file>
+            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscphelper.cpp</file>
+            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpremotetcpif.h</file>
+            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpremotetcpif.cpp</file>
+        </group>
     </open-files>
 </project-private>
diff --git a/src/vscp/drivers/level2/wire1/linux/nbproject/private/private.xml b/src/vscp/drivers/level2/wire1/linux/nbproject/private/private.xml
@@ -9,11 +9,6 @@
     </data>
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
-        <group>
-            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscp.h</file>
-            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscphelper.cpp</file>
-            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpremotetcpif.h</file>
-            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpremotetcpif.cpp</file>
-        </group>
+        <group/>
     </open-files>
 </project-private>
diff --git a/src/vscp/vscpworks/nbproject/private/private.xml b/src/vscp/vscpworks/nbproject/private/private.xml
@@ -9,6 +9,13 @@
     </data>
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
-        <group/>
+        <group>
+            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/vscpworks/vscpworks.h</file>
+            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/vscpworks/frmmain.cpp</file>
+            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/vscpworks/frmdeviceconfig.cpp</file>
+            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/vscpworks/frmdeviceconfig.h</file>
+            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/vscpworks/vscpworks.cpp</file>
+            <file>file:/home/akhe/development/VSCP/vscp/src/vscp/vscpworks/devicebootloaderwizard_images.h</file>
+        </group>
     </open-files>
 </project-private>
-Original file line number
+Diff line change
@@ Expand Up / @@ -162,8 +162,6 @@ @@
               </df>
               <df name="testws">
               </df>
-              <df name="web">
-              </df>
             </df>
           </df>
           <df name="database">
@@ Expand Down @@