libnxsrv and nxcore moved to VS2005 (nxcore cannot be linked because libnxsl not...
authorVictor Kirhenshtein <victor@netxms.org>
Tue, 30 Dec 2008 15:20:28 +0000 (15:20 +0000)
committerVictor Kirhenshtein <victor@netxms.org>
Tue, 30 Dec 2008 15:20:28 +0000 (15:20 +0000)
18 files changed:
.gitattributes
include/nms_common.h
netxms.sln
src/server/core/Makefile.am
src/server/core/netinfo.cpp
src/server/core/nxcore.dsw [deleted file]
src/server/core/nxcore.vcproj [new file with mode: 0644]
src/server/include/nms_core.h
src/server/include/nxsrvapi.h
src/server/libnxsrv/Makefile.am
src/server/libnxsrv/libnxsrv.dsw [deleted file]
src/server/libnxsrv/libnxsrv.vcproj [new file with mode: 0644]
src/snmp/nxmibc/Makefile.am
src/snmp/nxmibc/nxmibc.vcproj
src/snmp/nxmibc/parser.l
src/snmp/nxmibc/parser.y
tools/flex_bison.rule
tools/mc.rule

index e67c6f7..2173b81 100644 (file)
@@ -413,7 +413,7 @@ src/nxscript/nxscript.dsp eol=crlf
 src/nxscript/nxscript.dsw eol=crlf
 src/server/core/isc.cpp -text
 src/server/core/nxcore.dsp eol=crlf
-src/server/core/nxcore.dsw eol=crlf
+src/server/core/nxcore.vcproj -text
 src/server/dbdrv/mssql/mssql.dsp eol=crlf
 src/server/dbdrv/mssql/mssql.dsw eol=crlf
 src/server/dbdrv/mysql/mysql.dsp eol=crlf
@@ -427,7 +427,7 @@ src/server/dbdrv/pgsql/pgsql.dsw eol=crlf
 src/server/dbdrv/sqlite/sqlite.dsp eol=crlf
 src/server/dbdrv/sqlite/sqlite.dsw eol=crlf
 src/server/libnxsrv/libnxsrv.dsp eol=crlf
-src/server/libnxsrv/libnxsrv.dsw eol=crlf
+src/server/libnxsrv/libnxsrv.vcproj -text
 src/server/modules/hpdp/hpdp.dsp eol=crlf
 src/server/modules/hpdp/hpdp.dsw eol=crlf
 src/server/netxmsd/netxmsd.dsp eol=crlf
index 1f87607..b322095 100644 (file)
 #define write     _write
 #define close     _close
 #define getpid    _getpid
+#define fileno    _fileno
 
 typedef unsigned __int64 QWORD;
 typedef __int64 INT64;
index eb94eb3..79d3fa9 100644 (file)
@@ -17,8 +17,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libexpatw", "src\libexpat\l
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnxlp", "src\libnxlp\libnxlp.vcproj", "{64EFC0C2-C67B-41F6-851D-F11DAB27A60B}"
        ProjectSection(ProjectDependencies) = postProject
-               {6A88EF62-C4F2-4295-A833-549DAE4DF5ED} = {6A88EF62-C4F2-4295-A833-549DAE4DF5ED}
                {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
+               {6A88EF62-C4F2-4295-A833-549DAE4DF5ED} = {6A88EF62-C4F2-4295-A833-549DAE4DF5ED}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nxagentd", "src\agent\core\nxagentd.vcproj", "{57598B02-3295-4FE8-9322-94CE871CC84D}"
@@ -78,8 +78,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "odbcquery", "src\agent\suba
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "logwatch", "src\agent\subagents\logwatch\logwatch.vcproj", "{F8A8749E-E539-4A3B-A21C-2C5C86AE33EA}"
        ProjectSection(ProjectDependencies) = postProject
-               {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
                {64EFC0C2-C67B-41F6-851D-F11DAB27A60B} = {64EFC0C2-C67B-41F6-851D-F11DAB27A60B}
+               {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ecs", "src\agent\subagents\ecs\ecs.vcproj", "{BBE9028E-725C-45C6-97C9-BFC443F19DB6}"
@@ -101,77 +101,92 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnxmapw", "src\libnxmap\l
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnxcl", "src\libnxcl\libnxcl.vcproj", "{3CB9B8C6-E6BF-4002-A61A-7A21FEADB531}"
        ProjectSection(ProjectDependencies) = postProject
-               {AB386821-B630-49F5-95C3-677B9DCE1270} = {AB386821-B630-49F5-95C3-677B9DCE1270}
                {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
+               {AB386821-B630-49F5-95C3-677B9DCE1270} = {AB386821-B630-49F5-95C3-677B9DCE1270}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnxclw", "src\libnxcl\libnxclw.vcproj", "{3CB9B8C6-E6BF-4002-A61A-7A21FEADB532}"
        ProjectSection(ProjectDependencies) = postProject
-               {0A5E80F3-485D-40C8-BE1E-9D7EE744DB8B} = {0A5E80F3-485D-40C8-BE1E-9D7EE744DB8B}
                {AEB182ED-7F5C-4F5A-BCE1-9A38E98579BA} = {AEB182ED-7F5C-4F5A-BCE1-9A38E98579BA}
+               {0A5E80F3-485D-40C8-BE1E-9D7EE744DB8B} = {0A5E80F3-485D-40C8-BE1E-9D7EE744DB8B}
        EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{39BF23C9-D903-4C20-8E88-19533A745625}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nxalarm", "src\client\nxalarm\nxalarm.vcproj", "{F9FFAAE9-D669-451E-B9EF-18BC8AD37FAB}"
        ProjectSection(ProjectDependencies) = postProject
-               {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
                {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}") = "nxevent", "src\client\nxevent\nxevent.vcproj", "{C7A460E8-12A8-4FC7-9F59-C9C5CE17ED20}"
        ProjectSection(ProjectDependencies) = postProject
-               {3CB9B8C6-E6BF-4002-A61A-7A21FEADB531} = {3CB9B8C6-E6BF-4002-A61A-7A21FEADB531}
                {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}") = "nxpush", "src\client\nxpush\nxpush.vcproj", "{B8671BF7-94E1-4615-A8C2-F5C78DB8C515}"
        ProjectSection(ProjectDependencies) = postProject
-               {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
                {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}") = "nxsms", "src\client\nxsms\nxsms.vcproj", "{B0A70A32-A8F0-4071-8044-FDA3C834A5C5}"
        ProjectSection(ProjectDependencies) = postProject
-               {3CB9B8C6-E6BF-4002-A61A-7A21FEADB531} = {3CB9B8C6-E6BF-4002-A61A-7A21FEADB531}
                {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}") = "libnxsnmp", "src\snmp\libnxsnmp\libnxsnmp.vcproj", "{7DC90EE4-E31C-4F12-8F1E-81F10E9099FB}"
        ProjectSection(ProjectDependencies) = postProject
-               {E7410EB4-3355-4C83-8E05-D2877581CDA1} = {E7410EB4-3355-4C83-8E05-D2877581CDA1}
                {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
+               {E7410EB4-3355-4C83-8E05-D2877581CDA1} = {E7410EB4-3355-4C83-8E05-D2877581CDA1}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nxzlib", "src\zlib\nxzlib.vcproj", "{E7410EB4-3355-4C83-8E05-D2877581CDA1}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nxsnmpget", "src\snmp\nxsnmpget\nxsnmpget.vcproj", "{0A4CE471-020A-42C6-91C0-DFEFA7E815E0}"
        ProjectSection(ProjectDependencies) = postProject
-               {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
                {7DC90EE4-E31C-4F12-8F1E-81F10E9099FB} = {7DC90EE4-E31C-4F12-8F1E-81F10E9099FB}
+               {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnxsnmpw", "src\snmp\libnxsnmp\libnxsnmpw.vcproj", "{7DC90EE4-E31C-4F12-8F1E-81F10E9099FC}"
        ProjectSection(ProjectDependencies) = postProject
-               {AEB182ED-7F5C-4F5A-BCE1-9A38E98579BA} = {AEB182ED-7F5C-4F5A-BCE1-9A38E98579BA}
                {E7410EB4-3355-4C83-8E05-D2877581CDA1} = {E7410EB4-3355-4C83-8E05-D2877581CDA1}
+               {AEB182ED-7F5C-4F5A-BCE1-9A38E98579BA} = {AEB182ED-7F5C-4F5A-BCE1-9A38E98579BA}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nxsnmpset", "src\snmp\nxsnmpset\nxsnmpset.vcproj", "{9EA98E79-EB7D-4F6C-8105-AC7B231ABB10}"
        ProjectSection(ProjectDependencies) = postProject
-               {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
                {7DC90EE4-E31C-4F12-8F1E-81F10E9099FB} = {7DC90EE4-E31C-4F12-8F1E-81F10E9099FB}
+               {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nxsnmpwalk", "src\snmp\nxsnmpwalk\nxsnmpwalk.vcproj", "{5FA3AADC-3AD7-4B17-A581-D5E02DE17727}"
        ProjectSection(ProjectDependencies) = postProject
-               {7DC90EE4-E31C-4F12-8F1E-81F10E9099FB} = {7DC90EE4-E31C-4F12-8F1E-81F10E9099FB}
                {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
+               {7DC90EE4-E31C-4F12-8F1E-81F10E9099FB} = {7DC90EE4-E31C-4F12-8F1E-81F10E9099FB}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nxmibc", "src\snmp\nxmibc\nxmibc.vcproj", "{9F722C62-78FD-4D8C-A7C7-2815B09F1943}"
        ProjectSection(ProjectDependencies) = postProject
+               {7DC90EE4-E31C-4F12-8F1E-81F10E9099FB} = {7DC90EE4-E31C-4F12-8F1E-81F10E9099FB}
                {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnxsrv", "src\server\libnxsrv\libnxsrv.vcproj", "{CB89D905-C8BE-4027-B2D8-F96C245E9160}"
+       ProjectSection(ProjectDependencies) = postProject
+               {7DC90EE4-E31C-4F12-8F1E-81F10E9099FB} = {7DC90EE4-E31C-4F12-8F1E-81F10E9099FB}
+               {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nxcore", "src\server\core\nxcore.vcproj", "{3B172035-5EEC-45A3-8471-2C390B7ED683}"
+       ProjectSection(ProjectDependencies) = postProject
+               {CB89D905-C8BE-4027-B2D8-F96C245E9160} = {CB89D905-C8BE-4027-B2D8-F96C245E9160}
+               {AB386821-B630-49F5-95C3-677B9DCE1270} = {AB386821-B630-49F5-95C3-677B9DCE1270}
+               {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
+               {64EFC0C2-C67B-41F6-851D-F11DAB27A60B} = {64EFC0C2-C67B-41F6-851D-F11DAB27A60B}
                {7DC90EE4-E31C-4F12-8F1E-81F10E9099FB} = {7DC90EE4-E31C-4F12-8F1E-81F10E9099FB}
        EndProjectSection
 EndProject
@@ -431,6 +446,18 @@ Global
                {9F722C62-78FD-4D8C-A7C7-2815B09F1943}.Release|Win32.Build.0 = Release|Win32
                {9F722C62-78FD-4D8C-A7C7-2815B09F1943}.Release|x64.ActiveCfg = Release|x64
                {9F722C62-78FD-4D8C-A7C7-2815B09F1943}.Release|x64.Build.0 = Release|x64
+               {CB89D905-C8BE-4027-B2D8-F96C245E9160}.Debug|Win32.ActiveCfg = Debug|Win32
+               {CB89D905-C8BE-4027-B2D8-F96C245E9160}.Debug|Win32.Build.0 = Debug|Win32
+               {CB89D905-C8BE-4027-B2D8-F96C245E9160}.Debug|x64.ActiveCfg = Debug|Win32
+               {CB89D905-C8BE-4027-B2D8-F96C245E9160}.Release|Win32.ActiveCfg = Release|Win32
+               {CB89D905-C8BE-4027-B2D8-F96C245E9160}.Release|Win32.Build.0 = Release|Win32
+               {CB89D905-C8BE-4027-B2D8-F96C245E9160}.Release|x64.ActiveCfg = Release|Win32
+               {3B172035-5EEC-45A3-8471-2C390B7ED683}.Debug|Win32.ActiveCfg = Debug|Win32
+               {3B172035-5EEC-45A3-8471-2C390B7ED683}.Debug|Win32.Build.0 = Debug|Win32
+               {3B172035-5EEC-45A3-8471-2C390B7ED683}.Debug|x64.ActiveCfg = Debug|Win32
+               {3B172035-5EEC-45A3-8471-2C390B7ED683}.Release|Win32.ActiveCfg = Release|Win32
+               {3B172035-5EEC-45A3-8471-2C390B7ED683}.Release|Win32.Build.0 = Release|Win32
+               {3B172035-5EEC-45A3-8471-2C390B7ED683}.Release|x64.ActiveCfg = Release|Win32
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
@@ -456,6 +483,8 @@ Global
                {1A2D2691-D9D4-4078-BBC4-A53DAF086D0C} = {451F583D-C2DB-4414-870C-7FA0189BE7DD}
                {F8A8749E-E539-4A3B-A21C-2C5C86AE33EA} = {451F583D-C2DB-4414-870C-7FA0189BE7DD}
                {BBE9028E-725C-45C6-97C9-BFC443F19DB6} = {451F583D-C2DB-4414-870C-7FA0189BE7DD}
+               {CB89D905-C8BE-4027-B2D8-F96C245E9160} = {B93920F5-65F4-4531-B87E-A5B357AF2476}
+               {3B172035-5EEC-45A3-8471-2C390B7ED683} = {B93920F5-65F4-4531-B87E-A5B357AF2476}
                {7DC90EE4-E31C-4F12-8F1E-81F10E9099FB} = {268BC97D-BFC6-4BD7-BF78-E6AC1D8BA37E}
                {0A4CE471-020A-42C6-91C0-DFEFA7E815E0} = {268BC97D-BFC6-4BD7-BF78-E6AC1D8BA37E}
                {7DC90EE4-E31C-4F12-8F1E-81F10E9099FC} = {268BC97D-BFC6-4BD7-BF78-E6AC1D8BA37E}
index fde2895..faf138c 100644 (file)
@@ -13,7 +13,7 @@ libnxcore_la_SOURCES = acl.cpp agent.cpp actions.cpp admin.cpp alarm.cpp \
                        interface.cpp isc.cpp layer2.cpp locks.cpp lpp.cpp \
                        main.cpp map.cpp modules.cpp netinfo.cpp netobj.cpp \
                        netsrv.cpp node.cpp nortel.cpp np.cpp nxmp_data.cpp \
-                       nxmp_lex.yy.cpp nxmp_lexer.cpp \
+                       lex.nxmp_parser.cpp nxmp_lexer.cpp \
                        nxmp_parser.cpp nxmp_parser.tab.cpp \
                        nxsl_classes.cpp nxslext.cpp objects.cpp \
                        objtools.cpp package.cpp poll.cpp radius.cpp \
@@ -30,14 +30,14 @@ libnxcore_la_LIBADD = ../../libnetxms/libnetxms.la \
                      ../libnxsrv/libnxsrv.la ../../libnxsl/libnxsl.la
 
 EXTRA_DIST = \
-       nxcore.dsp nxcore.dsw \
+       nxcore.vcproj \
        nxcore.h radius.h \
        nxmp_parser.l nxmp_parser.y nxmp_parser.h nxmp_parser.tab.hpp
 
 nxmp_data.cpp: nxmp_parser.tab.cpp
 
-nxmp_lex.yy.cpp: nxmp_parser.l nxmp_parser.tab.cpp nxmp_parser.tab.hpp
-       $(LEX) -B -f -8 -onxmp_lex.yy.cpp nxmp_parser.l
+lex.nxmp_parser.cpp: nxmp_parser.l nxmp_parser.tab.cpp nxmp_parser.tab.hpp
+       $(LEX) -B -f -8 -olex.nxmp_parser.cpp nxmp_parser.l
 
 nxmp_parser.tab.cpp: nxmp_parser.y
        $(YACC) -b nxmp_parser -o nxmp_parser.tab.cpp -d -t -v nxmp_parser.y
index 181f0eb..df617ce 100644 (file)
@@ -265,7 +265,7 @@ static INTERFACE_LIST *SysGetLocalIfList(void)
          // Get network connection name from adapter name, if possible
          if (imp_HrLanConnectionNameFromGuidOrPath != NULL)
          {
-            WORD wGUID[256], wName[256];
+            WCHAR wGUID[256], wName[256];
 
             // Resolve GUID to network connection name
             MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, pInfo->AdapterName, -1, wGUID, 256);
diff --git a/src/server/core/nxcore.dsw b/src/server/core/nxcore.dsw
deleted file mode 100644 (file)
index ed7f4d4..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "nxcore"=.\nxcore.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/src/server/core/nxcore.vcproj b/src/server/core/nxcore.vcproj
new file mode 100644 (file)
index 0000000..5e908fd
--- /dev/null
@@ -0,0 +1,656 @@
+<?xml version="1.0" encoding="windows-1251"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="nxcore"\r
+       ProjectGUID="{3B172035-5EEC-45A3-8471-2C390B7ED683}"\r
+       RootNamespace="nxcore"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+               <ToolFile\r
+                       RelativePath="..\..\..\tools\flex_bison.rule"\r
+               />\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="FLEX"\r
+                               USE8BIT="true"\r
+                               NOUNISTD="true"\r
+                               BATCH="true"\r
+                               FAST="true"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="BISON"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\..\include;..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;NXCORE_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="false"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib libeay32.lib"\r
+                               LinkIncremental="2"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="FLEX"\r
+                               USE8BIT="true"\r
+                               NOUNISTD="true"\r
+                               BATCH="true"\r
+                               FAST="true"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="BISON"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="..\..\..\include;..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;NXCORE_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="false"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib libeay32.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\acl.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\actions.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\admin.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\agent.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\alarm.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\audit.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\beacon.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\cert.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\client.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\cluster.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\condition.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\config.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\container.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\correlate.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\datacoll.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\dbwrite.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\dcitem.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\dcithreshold.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\dcivalue.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\debug.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\ef.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\email.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\entirenet.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\epp.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\events.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\evproc.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\hk.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\id.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\image.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\interface.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\isc.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\layer2.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\lex.nxmp_parser.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\locks.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\lpp.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\main.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\map.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\modules.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\netinfo.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\netobj.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\netsrv.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\node.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\nortel.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\np.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\nxmp_data.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\nxmp_lexer.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\nxmp_parser.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\nxmp_parser.tab.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\nxsl_classes.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\nxslext.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\objects.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\objtools.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\package.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\poll.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\radius.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\rootobj.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\script.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\session.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\situation.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\sms.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\snmp.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\snmptrap.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\subnet.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\syncer.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\syslogd.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\template.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\tools.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\tracert.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\uniroot.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\users.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\vpnconn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\watchdog.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\webmaps.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\zone.cpp"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\include\dbdrv.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\include\local_admin.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\include\netxms-regex.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\include\netxms-version.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\include\netxms_maps.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\include\nms_actions.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\include\nms_alarm.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\include\nms_common.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\include\nms_core.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\include\nms_dcoll.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\include\nms_events.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\include\nms_locks.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\include\nms_objects.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\include\nms_pkg.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\include\nms_script.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\include\nms_threads.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\include\nms_topo.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\include\nms_users.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\include\nms_util.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\nxcore.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\include\nxcore_maps.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\include\nxcore_situations.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\include\nxcpapi.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\include\nxlog.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\include\nxmodule.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\nxmp_parser.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\include\nxqueue.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\include\nxsnmp.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\include\nxsrvapi.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\radius.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\include\rwlock.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\include\unicode.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+               <Filter\r
+                       Name="Parser Files"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\nxmp_parser.l"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\nxmp_parser.y"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
index 71f6fb7..ac4df05 100644 (file)
@@ -96,7 +96,6 @@ typedef __console_ctx * CONSOLE_CTX;
 #include "nms_dcoll.h"
 #include "nms_users.h"
 #include "nms_objects.h"
-#include "messages.h"
 #include "nms_locks.h"
 #include "nms_pkg.h"
 #include "nms_topo.h"
index 24fb59f..94de417 100644 (file)
@@ -40,7 +40,7 @@
 #include <nxclapi.h>
 #include <nxcpapi.h>
 #include <nms_agent.h>
-#include <messages.h>
+#include "../libnxsrv/messages.h"
 #include <dbdrv.h>
 #include <nxsnmp.h>
 #include <netxms_isc.h>
index 7c7d731..2bf22e7 100644 (file)
@@ -6,13 +6,12 @@ libnxsrv_la_SOURCES = messages.c agent.cpp db.cpp isc.cpp license.cpp \
 libnxsrv_la_LDFLAGS = -version-info $(NETXMS_LIBRARY_VERSION)
 libnxsrv_la_LIBADD = ../../libnetxms/libnetxms.la ../../libnxsnmp/libnxsnmp.la
 
-messages.c: ../include/messages.h
+messages.c: messages.h
 
-../include/messages.h: messages.mc
+messages.h: messages.mc
        $(PERL) @top_builddir@/tools/mc.pl messages.mc
-       mv messages.h ../include
 
 EXTRA_DIST = \
-       libnxsrv.dsp libnxsrv.dsw libnxsrv.rc \
+       libnxsrv.vcproj libnxsrv.rc \
        messages.mc messages.c \
        libnxsrv.h resource.h
diff --git a/src/server/libnxsrv/libnxsrv.dsw b/src/server/libnxsrv/libnxsrv.dsw
deleted file mode 100644 (file)
index 90de9dc..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "libnxsrv"=.\libnxsrv.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/src/server/libnxsrv/libnxsrv.vcproj b/src/server/libnxsrv/libnxsrv.vcproj
new file mode 100644 (file)
index 0000000..1e6b70d
--- /dev/null
@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="windows-1251"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="libnxsrv"\r
+       ProjectGUID="{CB89D905-C8BE-4027-B2D8-F96C245E9160}"\r
+       RootNamespace="libnxsrv"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+               <ToolFile\r
+                       RelativePath="..\..\..\tools\mc.rule"\r
+               />\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="Message compiler"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\..\include;..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBNXSRV_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="false"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               LinkIncremental="2"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="Message compiler"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="..\..\..\include;..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBNXSRV_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="false"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\agent.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\db.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\isc.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\license.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\main.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\snmpproxy.cpp"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\include\dbdrv.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\libnxsrv.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\include\netxms-version.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\include\nms_common.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\include\nms_util.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\include\nxsnmp.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\include\nxsrvapi.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\include\unicode.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\libnxsrv.rc"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Message Files"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\messages.mc"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="Message compiler"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="Message compiler"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
index 048696d..c880fa5 100644 (file)
 INCLUDES=-I@top_srcdir@/include
 
 bin_PROGRAMS = nxmibc
-nxmibc_SOURCES = array.cpp lex.mp.c mibparse.cpp nxmibc.cpp parser.tab.c
+nxmibc_SOURCES = array.cpp lex.parser.cpp mibparse.cpp nxmibc.cpp parser.tab.cpp
 nxmibc_LDADD = ../../libnetxms/libnetxms.la ../libnxsnmp/libnxsnmp.la
 
-EXTRA_DIST = nxmibc.vcproj nxmibc.dsw nxmibc.h mibparse.h parser.l parser.y parser.tab.h
+EXTRA_DIST = nxmibc.vcproj nxmibc.dsw nxmibc.h mibparse.h parser.l parser.y parser.tab.hpp
 
-lex.mp.c: parser.l parser.tab.c parser.tab.h
-       $(LEX) -Pmp parser.l
+lex.parser.cpp: parser.l parser.tab.cpp parser.tab.hpp
+       $(LEX) -Pmp -B -f -olex.parser.cpp parser.l
 
-parser.tab.c: parser.y
-       $(YACC) -b parser -d -p mp -t -v parser.y
+parser.tab.cpp: parser.y
+       $(YACC) -b parser -o parser.tab.cpp -d -p mp -t -v parser.y
index eff9e98..e5c5300 100644 (file)
@@ -34,6 +34,8 @@
                        <Tool\r
                                Name="FLEX"\r
                                PREFIX="mp"\r
+                               BATCH="true"\r
+                               FAST="true"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
-                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        <Tool\r
                                Name="FLEX"\r
                                PREFIX="mp"\r
+                               BATCH="true"\r
+                               FAST="true"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\..\include"\r
                                PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"\r
-                               RuntimeLibrary="2"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkIncremental="1"\r
+                               LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        <Tool\r
                                Name="FLEX"\r
                                PREFIX="mp"\r
+                               BATCH="true"\r
+                               FAST="true"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\..\include"\r
                                PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
+                               RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               Detect64BitPortabilityProblems="false"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
-                               TargetMachine="17"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="FLEX"\r
                                PREFIX="mp"\r
+                               BATCH="true"\r
+                               FAST="true"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\lex.parser.c"\r
+                               RelativePath=".\lex.parser.cpp"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\parser.tab.c"\r
+                               RelativePath=".\parser.tab.cpp"\r
                                >\r
                        </File>\r
                </Filter>\r
index 3e937d7..b4e625f 100644 (file)
@@ -53,7 +53,7 @@ WHITESPC  [[:blank:]\t\n\r]
 #define ECHO
 
 #include "mibparse.h"
-#include "parser.tab.h"/* token codes from the parser */
+#include "parser.tab.hpp"/* token codes from the parser */
 #include <nms_util.h>
 
 #if defined(_WIN32) 
index 5f1809d..58d0194 100644 (file)
  * A parser for the basic grammar to use for snmp V2c modules
  */
 
-#pragma warning(disable : 4102)
+#pragma warning(disable : 4065 4102)
 
+/*
 #ifndef __STDC__
 #define __STDC__       1
 #endif
+*/
 
 #define YYMALLOC       malloc
 #define YYFREE         free
 
+#include <nms_common.h>
+#include <nms_util.h>
 #include <string.h>
 #include <time.h>
 #include "mibparse.h"
@@ -95,11 +99,11 @@ void *__zmalloc(unsigned int nSize)
    return p;
 }
 
-static int AccessFromText(char *pszText)
+static int AccessFromText(const char *pszText)
 {
-   static char *pText[] = { "read-only", "read-write", "write-only",
-                            "not-accessible", "accessible-for-notify",
-                            "read-create", NULL };
+   static const char *pText[] = { "read-only", "read-write", "write-only",
+                                  "not-accessible", "accessible-for-notify",
+                                  "read-create", NULL };
    char szBuffer[256];
    int i;
 
@@ -1316,7 +1320,7 @@ MP_MODULE *ParseMIB(char *pszFilename)
    return m_pModule;
 }
 
-int mpwrap()
+extern "C" int mpwrap()
 {
        return 1;
 }
index 71afcc4..5346153 100644 (file)
@@ -7,9 +7,9 @@
                <CustomBuildRule\r
                        Name="FLEX"\r
                        DisplayName="FLEX"\r
-                       CommandLine="flex [AllOptions] -olex.$(InputName).c $(InputName).l"\r
-                       Outputs="lex.$(InputName).c"\r
-                       AdditionalDependencies="$(InputName).tab.h"\r
+                       CommandLine="flex [AllOptions] -olex.$(InputName).cpp $(InputName).l"\r
+                       Outputs="lex.$(InputName).cpp"\r
+                       AdditionalDependencies="$(InputName).tab.hpp"\r
                        FileExtensions="*.l"\r
                        ExecutionDescription="Running FLEX on $(InputName).l"\r
                        SupportsFileBatching="true"\r
                                        Switch="-P[value]"\r
                                        DefaultValue="yy"\r
                                />\r
+                               <BooleanProperty\r
+                                       Name="USE8BIT"\r
+                                       DisplayName="Generate 8-bit scanner"\r
+                                       Description="Generate 8-bit scanner"\r
+                                       Switch="-8"\r
+                               />\r
+                               <BooleanProperty\r
+                                       Name="NOUNISTD"\r
+                                       DisplayName="Do not include unistd.h"\r
+                                       Description="Do not include unistd.h"\r
+                                       Switch="--nounistd"\r
+                               />\r
+                               <BooleanProperty\r
+                                       Name="BATCH"\r
+                                       DisplayName="Generate batch scanner"\r
+                                       Description="Generate batch scanner"\r
+                                       Switch="-B"\r
+                               />\r
+                               <BooleanProperty\r
+                                       Name="FAST"\r
+                                       DisplayName="Generate fast scanner"\r
+                                       Description="Generate fast, large scanner"\r
+                                       Switch="-f"\r
+                               />\r
                        </Properties>\r
                </CustomBuildRule>\r
                <CustomBuildRule\r
                        Name="BISON"\r
                        DisplayName="BISON"\r
-                       CommandLine="bison -b $(InputName) -d -t -v [AllOptions] $(InputName).y"\r
-                       Outputs="$(InputName).tab.c;$(InputName).tab.h"\r
+                       CommandLine="bison -b $(InputName) -o $(InputName).tab.cpp -d -t -v [AllOptions] $(InputName).y"\r
+                       Outputs="$(InputName).tab.cpp;$(InputName).tab.hpp"\r
                        FileExtensions="*.y"\r
                        ExecutionDescription="Running BISON on $(InputName).y"\r
                        >\r
index c42b106..a53c3ca 100644 (file)
@@ -7,7 +7,7 @@
                <CustomBuildRule\r
                        Name="Message compiler"\r
                        DisplayName="Message compiler"\r
-                       CommandLine="mc -s -U -h &quot;$(ProjectDir)&quot; -r &quot;$(ProjectDir)&quot; &quot;$(InputFileName)&quot;&#x0D;&#x0A;del &quot;$(ProjectDir)messages.rc&quot;&#x0D;&#x0A;"\r
+                       CommandLine="mc -s -U -h $(ProjectDir) -r $(ProjectDir) $(InputFileName)&#x0D;&#x0A;del $(ProjectDir)messages.rc&#x0D;&#x0A;"\r
                        Outputs="$(InputName).h;MSG00001.bin"\r
                        FileExtensions="*.mc"\r
                        ExecutionDescription="Running message compiler"\r