version number changed; legacy console removed from projects
authorVictor Kirhenshtein <victor@netxms.org>
Mon, 20 Oct 2014 08:15:13 +0000 (11:15 +0300)
committerVictor Kirhenshtein <victor@netxms.org>
Mon, 20 Oct 2014 08:15:13 +0000 (11:15 +0300)
.gitignore
android/src/agent/res/values/build_number.xml
android/src/console/res/values/build_number.xml
build/build_number
configure.ac
include/build.h
include/netxms-version.h
netxms.sln
src/java/build/set_build_number.cmd
src/java/netxms-base/src/main/java/org/netxms/base/BuildNumber.java

index 04e053e..c10a6bd 100644 (file)
@@ -66,6 +66,7 @@ target
 /contrib/startup/ubuntu/nxagentd
 /doc/doxygen
 /eclipse
+/eclipse.cpp
 /libtool
 /m4
 /packages/linux/debian/6/netxms-agent
index c83f113..5bcea28 100644 (file)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-       <string name="build_number">7892</string>
+       <string name="build_number">8000</string>
 </resources>
index c83f113..5bcea28 100644 (file)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-       <string name="build_number">7892</string>
+       <string name="build_number">8000</string>
 </resources>
index dbce50b..e002b36 100644 (file)
@@ -1 +1 @@
-7892
+8000
index b2ee351..1645c42 100644 (file)
@@ -4,7 +4,7 @@
 # Configure script
 #
 
-AC_INIT([NetXMS], [1.2.17], [bugs@netxms.org])
+AC_INIT([NetXMS], [2.0-M1], [bugs@netxms.org])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_HEADERS(config.h)
 AM_INIT_AUTOMAKE
index 8895dca..34d96a3 100644 (file)
@@ -1,5 +1,5 @@
 #ifndef __build_h
 #define __build_h
-#define NETXMS_VERSION_BUILD 7892
-#define NETXMS_VERSION_BUILD_STRING _T("7892")
+#define NETXMS_VERSION_BUILD 8000
+#define NETXMS_VERSION_BUILD_STRING _T("8000")
 #endif
index bca2a29..e4f88bb 100644 (file)
 /**
  * Version constants 
  */
-#define NETXMS_VERSION_MAJOR        1
-#define NETXMS_VERSION_MINOR        2
-#define NETXMS_VERSION_RELEASE      17
-#define NETXMS_VERSION_STRING       _T("1.2.17")
-#define NETXMS_VERSION_STRING_A     "1.2.17"
+#define NETXMS_VERSION_MAJOR        2
+#define NETXMS_VERSION_MINOR        0
+#define NETXMS_VERSION_STRING       _T("2.0-M1")
+#define NETXMS_VERSION_STRING_A     "2.0-M1"
 
 #ifdef UNICODE
 #define IS_UNICODE_BUILD_STRING     _T(" (UNICODE)")
index edc0c67..78e2f46 100644 (file)
@@ -244,45 +244,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nxagent", "src\server\smsdr
                {CB89D905-C8BE-4027-B2D8-F96C245E9160} = {CB89D905-C8BE-4027-B2D8-F96C245E9160}
        EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "windows", "windows", "{69EC5B74-D466-422E-B8D1-1386B0421D54}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nxlexer", "src\client\nxlexer\nxlexer.vcproj", "{F0FAC738-1BC6-46A5-A54A-8D7F2219302D}"
-       ProjectSection(ProjectDependencies) = postProject
-               {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
-               {8E5A517B-93AB-4EA8-BB53-AE6346756343} = {8E5A517B-93AB-4EA8-BB53-AE6346756343}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scilexer", "src\client\scilexer\scilexer.vcproj", "{8E5A517B-93AB-4EA8-BB53-AE6346756343}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nxuilib", "src\client\windows\nxuilib\nxuilib.vcproj", "{BECC966D-AFC8-48F6-97B1-2FE92062D7B4}"
-       ProjectSection(ProjectDependencies) = postProject
-               {3CB9B8C6-E6BF-4002-A61A-7A21FEADB531} = {3CB9B8C6-E6BF-4002-A61A-7A21FEADB531}
-               {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nxav", "src\client\windows\nxav\nxav.vcproj", "{23F22F68-D562-4E80-8267-9F1DD9398357}"
-       ProjectSection(ProjectDependencies) = postProject
-               {BECC966D-AFC8-48F6-97B1-2FE92062D7B4} = {BECC966D-AFC8-48F6-97B1-2FE92062D7B4}
-               {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
-               {3CB9B8C6-E6BF-4002-A61A-7A21FEADB531} = {3CB9B8C6-E6BF-4002-A61A-7A21FEADB531}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nxnotify", "src\client\windows\nxnotify\nxnotify.vcproj", "{169A4446-A035-4CF7-8377-3C517ADF0C50}"
-       ProjectSection(ProjectDependencies) = postProject
-               {3CB9B8C6-E6BF-4002-A61A-7A21FEADB531} = {3CB9B8C6-E6BF-4002-A61A-7A21FEADB531}
-               {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
-               {BECC966D-AFC8-48F6-97B1-2FE92062D7B4} = {BECC966D-AFC8-48F6-97B1-2FE92062D7B4}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nxcon", "src\client\windows\nxcon\nxcon.vcproj", "{956DD617-0939-4B25-B8D0-E10AA645064E}"
-       ProjectSection(ProjectDependencies) = postProject
-               {AB386821-B630-49F5-95C3-677B9DCE1270} = {AB386821-B630-49F5-95C3-677B9DCE1270}
-               {BECC966D-AFC8-48F6-97B1-2FE92062D7B4} = {BECC966D-AFC8-48F6-97B1-2FE92062D7B4}
-               {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
-               {3CB9B8C6-E6BF-4002-A61A-7A21FEADB531} = {3CB9B8C6-E6BF-4002-A61A-7A21FEADB531}
-               {7DC90EE4-E31C-4F12-8F1E-81F10E9099FB} = {7DC90EE4-E31C-4F12-8F1E-81F10E9099FB}
-       EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nxlptest", "src\nxlptest\nxlptest.vcproj", "{1EA79FC6-F395-43DF-9E3C-2030CA05ED1D}"
        ProjectSection(ProjectDependencies) = postProject
                {64EFC0C2-C67B-41F6-851D-F11DAB27A60B} = {64EFC0C2-C67B-41F6-851D-F11DAB27A60B}
@@ -983,54 +944,6 @@ Global
                {C317231C-B984-4423-ACF2-C19DE8B6AA3F}.Release|Win32.Build.0 = Release|Win32
                {C317231C-B984-4423-ACF2-C19DE8B6AA3F}.Release|x64.ActiveCfg = Release|x64
                {C317231C-B984-4423-ACF2-C19DE8B6AA3F}.Release|x64.Build.0 = Release|x64
-               {F0FAC738-1BC6-46A5-A54A-8D7F2219302D}.Debug|Win32.ActiveCfg = Debug|Win32
-               {F0FAC738-1BC6-46A5-A54A-8D7F2219302D}.Debug|Win32.Build.0 = Debug|Win32
-               {F0FAC738-1BC6-46A5-A54A-8D7F2219302D}.Debug|x64.ActiveCfg = Debug|x64
-               {F0FAC738-1BC6-46A5-A54A-8D7F2219302D}.Debug|x64.Build.0 = Debug|x64
-               {F0FAC738-1BC6-46A5-A54A-8D7F2219302D}.Release|Win32.ActiveCfg = Release|Win32
-               {F0FAC738-1BC6-46A5-A54A-8D7F2219302D}.Release|Win32.Build.0 = Release|Win32
-               {F0FAC738-1BC6-46A5-A54A-8D7F2219302D}.Release|x64.ActiveCfg = Release|x64
-               {F0FAC738-1BC6-46A5-A54A-8D7F2219302D}.Release|x64.Build.0 = Release|x64
-               {8E5A517B-93AB-4EA8-BB53-AE6346756343}.Debug|Win32.ActiveCfg = Debug|Win32
-               {8E5A517B-93AB-4EA8-BB53-AE6346756343}.Debug|Win32.Build.0 = Debug|Win32
-               {8E5A517B-93AB-4EA8-BB53-AE6346756343}.Debug|x64.ActiveCfg = Debug|x64
-               {8E5A517B-93AB-4EA8-BB53-AE6346756343}.Debug|x64.Build.0 = Debug|x64
-               {8E5A517B-93AB-4EA8-BB53-AE6346756343}.Release|Win32.ActiveCfg = Release|Win32
-               {8E5A517B-93AB-4EA8-BB53-AE6346756343}.Release|Win32.Build.0 = Release|Win32
-               {8E5A517B-93AB-4EA8-BB53-AE6346756343}.Release|x64.ActiveCfg = Release|x64
-               {8E5A517B-93AB-4EA8-BB53-AE6346756343}.Release|x64.Build.0 = Release|x64
-               {BECC966D-AFC8-48F6-97B1-2FE92062D7B4}.Debug|Win32.ActiveCfg = Debug|Win32
-               {BECC966D-AFC8-48F6-97B1-2FE92062D7B4}.Debug|Win32.Build.0 = Debug|Win32
-               {BECC966D-AFC8-48F6-97B1-2FE92062D7B4}.Debug|x64.ActiveCfg = Debug|x64
-               {BECC966D-AFC8-48F6-97B1-2FE92062D7B4}.Debug|x64.Build.0 = Debug|x64
-               {BECC966D-AFC8-48F6-97B1-2FE92062D7B4}.Release|Win32.ActiveCfg = Release|Win32
-               {BECC966D-AFC8-48F6-97B1-2FE92062D7B4}.Release|Win32.Build.0 = Release|Win32
-               {BECC966D-AFC8-48F6-97B1-2FE92062D7B4}.Release|x64.ActiveCfg = Release|x64
-               {BECC966D-AFC8-48F6-97B1-2FE92062D7B4}.Release|x64.Build.0 = Release|x64
-               {23F22F68-D562-4E80-8267-9F1DD9398357}.Debug|Win32.ActiveCfg = Debug|Win32
-               {23F22F68-D562-4E80-8267-9F1DD9398357}.Debug|Win32.Build.0 = Debug|Win32
-               {23F22F68-D562-4E80-8267-9F1DD9398357}.Debug|x64.ActiveCfg = Debug|x64
-               {23F22F68-D562-4E80-8267-9F1DD9398357}.Debug|x64.Build.0 = Debug|x64
-               {23F22F68-D562-4E80-8267-9F1DD9398357}.Release|Win32.ActiveCfg = Release|Win32
-               {23F22F68-D562-4E80-8267-9F1DD9398357}.Release|Win32.Build.0 = Release|Win32
-               {23F22F68-D562-4E80-8267-9F1DD9398357}.Release|x64.ActiveCfg = Release|x64
-               {23F22F68-D562-4E80-8267-9F1DD9398357}.Release|x64.Build.0 = Release|x64
-               {169A4446-A035-4CF7-8377-3C517ADF0C50}.Debug|Win32.ActiveCfg = Debug|Win32
-               {169A4446-A035-4CF7-8377-3C517ADF0C50}.Debug|Win32.Build.0 = Debug|Win32
-               {169A4446-A035-4CF7-8377-3C517ADF0C50}.Debug|x64.ActiveCfg = Debug|x64
-               {169A4446-A035-4CF7-8377-3C517ADF0C50}.Debug|x64.Build.0 = Debug|x64
-               {169A4446-A035-4CF7-8377-3C517ADF0C50}.Release|Win32.ActiveCfg = Release|Win32
-               {169A4446-A035-4CF7-8377-3C517ADF0C50}.Release|Win32.Build.0 = Release|Win32
-               {169A4446-A035-4CF7-8377-3C517ADF0C50}.Release|x64.ActiveCfg = Release|x64
-               {169A4446-A035-4CF7-8377-3C517ADF0C50}.Release|x64.Build.0 = Release|x64
-               {956DD617-0939-4B25-B8D0-E10AA645064E}.Debug|Win32.ActiveCfg = Debug|Win32
-               {956DD617-0939-4B25-B8D0-E10AA645064E}.Debug|Win32.Build.0 = Debug|Win32
-               {956DD617-0939-4B25-B8D0-E10AA645064E}.Debug|x64.ActiveCfg = Debug|x64
-               {956DD617-0939-4B25-B8D0-E10AA645064E}.Debug|x64.Build.0 = Debug|x64
-               {956DD617-0939-4B25-B8D0-E10AA645064E}.Release|Win32.ActiveCfg = Release|Win32
-               {956DD617-0939-4B25-B8D0-E10AA645064E}.Release|Win32.Build.0 = Release|Win32
-               {956DD617-0939-4B25-B8D0-E10AA645064E}.Release|x64.ActiveCfg = Release|x64
-               {956DD617-0939-4B25-B8D0-E10AA645064E}.Release|x64.Build.0 = Release|x64
                {1EA79FC6-F395-43DF-9E3C-2030CA05ED1D}.Debug|Win32.ActiveCfg = Debug|Win32
                {1EA79FC6-F395-43DF-9E3C-2030CA05ED1D}.Debug|Win32.Build.0 = Debug|Win32
                {1EA79FC6-F395-43DF-9E3C-2030CA05ED1D}.Debug|x64.ActiveCfg = Debug|x64
@@ -1599,9 +1512,6 @@ Global
                {9F722C62-78FD-4D8C-A7C7-2815B09F1943} = {268BC97D-BFC6-4BD7-BF78-E6AC1D8BA37E}
                {3CB9B8C6-E6BF-4002-A61A-7A21FEADB531} = {E431F5D5-AAD8-4315-928A-23F86969DB35}
                {39BF23C9-D903-4C20-8E88-19533A745625} = {E431F5D5-AAD8-4315-928A-23F86969DB35}
-               {69EC5B74-D466-422E-B8D1-1386B0421D54} = {E431F5D5-AAD8-4315-928A-23F86969DB35}
-               {F0FAC738-1BC6-46A5-A54A-8D7F2219302D} = {E431F5D5-AAD8-4315-928A-23F86969DB35}
-               {8E5A517B-93AB-4EA8-BB53-AE6346756343} = {E431F5D5-AAD8-4315-928A-23F86969DB35}
                {F9FFAAE9-D669-451E-B9EF-18BC8AD37FAB} = {39BF23C9-D903-4C20-8E88-19533A745625}
                {C7A460E8-12A8-4FC7-9F59-C9C5CE17ED20} = {39BF23C9-D903-4C20-8E88-19533A745625}
                {B8671BF7-94E1-4615-A8C2-F5C78DB8C515} = {39BF23C9-D903-4C20-8E88-19533A745625}
@@ -1623,10 +1533,6 @@ Global
                {912783D2-CF6F-4040-B564-4E2436EB0827} = {5818CCA9-B585-44B8-B29E-98B1DC278A3C}
                {60BB5936-BF12-423F-9276-26F179E9C230} = {5818CCA9-B585-44B8-B29E-98B1DC278A3C}
                {60BB5936-BF12-423F-9276-26F179E9C231} = {5818CCA9-B585-44B8-B29E-98B1DC278A3C}
-               {BECC966D-AFC8-48F6-97B1-2FE92062D7B4} = {69EC5B74-D466-422E-B8D1-1386B0421D54}
-               {23F22F68-D562-4E80-8267-9F1DD9398357} = {69EC5B74-D466-422E-B8D1-1386B0421D54}
-               {169A4446-A035-4CF7-8377-3C517ADF0C50} = {69EC5B74-D466-422E-B8D1-1386B0421D54}
-               {956DD617-0939-4B25-B8D0-E10AA645064E} = {69EC5B74-D466-422E-B8D1-1386B0421D54}
                {49F5280F-147B-46D0-98BF-931F0646CF82} = {3AB343C9-A67D-49F1-A8CD-EA0D9CA98467}
                {1EA79FC6-F395-43DF-9E3C-2030CA05ED1D} = {3AB343C9-A67D-49F1-A8CD-EA0D9CA98467}
                {44417A1C-341A-4D06-8F86-1D8027A10FF3} = {2AD11F39-3F76-4269-A6E9-4B9A294F8F48}
index 8e284c6..dd3cd2a 100644 (file)
@@ -1,5 +1,5 @@
 package org.netxms.base;
 public final class BuildNumber {
-   public static final String TEXT = "7892";
-   public static final int NUMBER = 7892;
+   public static final String TEXT = "8000";
+   public static final int NUMBER = 8000;
 }