more Windows makefiles added

diff --git a/Makefile.inc.w32 b/Makefile.inc.w32
index 10fcd82..7d369db 100644 (file)
--- a/Makefile.inc.w32
+++ b/Makefile.inc.w32
@@ -138,9 +138,15 @@ all: Makefile.w32 subdirs $(GENERATED) $(BINFILE)
 
 !if "$(TYPE)" == "jar"
 
+!if "$(JAR_BUILD_MODE)" == "install"
+MVNCMD=install
+!else
+MVNCMD=package
+!endif
+
 $(BINFILE): pom.xml
        mvn clean
-       mvn install
+       mvn $(MVNCMD) $(MVNFLAGS)
        mv target/$(TARGET) $(BINFILE)
 
 !else

diff --git a/build/msvc_setenv_x64.cmd b/build/msvc_setenv_x64.cmd
index 6e4125a..a5b7883 100644 (file)
--- a/build/msvc_setenv_x64.cmd
+++ b/build/msvc_setenv_x64.cmd
@@ -1,5 +1,5 @@
 @echo off
 set PATH=C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64;C:\SDK\Windows 7 SDK\Bin\x64;%PATH%
-set INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include;C:\SDK\Windows 7 SDK\Include;C:\SDK\WINDDK\inc\wnet
+set INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include;C:\SDK\Windows 7 SDK\Include;C:\SDK\WINDDK\inc\wnet;%JAVA_HOME%\include;%JAVA_HOME%\include\win32
 set LIB=C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\lib\amd64;C:\SDK\Windows 7 SDK\Lib\x64;C:\SDK\WINDDK\lib\wnet\amd64
 set LIBPATH=%LIB%

diff --git a/build/msvc_setenv_x86.cmd b/build/msvc_setenv_x86.cmd
index 2d550b0..73eb4ed 100644 (file)
--- a/build/msvc_setenv_x86.cmd
+++ b/build/msvc_setenv_x86.cmd
@@ -1,5 +1,5 @@
 @echo off
 set PATH=C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;C:\SDK\Windows 7 SDK\Bin;%PATH%
-set INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include;C:\SDK\Windows 7 SDK\Include;C:\SDK\WINDDK\inc\wnet
+set INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include;C:\SDK\Windows 7 SDK\Include;C:\SDK\WINDDK\inc\wnet;%JAVA_HOME%\include;%JAVA_HOME%\include\win32
 set LIB=C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\lib;C:\SDK\Windows 7 SDK\Lib;C:\SDK\WINDDK\lib\wnet\i386
 set LIBPATH=%LIB%

diff --git a/src/Makefile.w32 b/src/Makefile.w32
index 5f56a26..b6491f1 100644 (file)
--- a/src/Makefile.w32
+++ b/src/Makefile.w32
@@ -1,4 +1,5 @@
-SUBDIRS = jansson libexpat libtre sqlite zlib libnetxms libnxlp libnxmb libnxsl libstrophe \
-          nxscript db snmp appagent agent server tools
+SUBDIRS = jansson libexpat libtre sqlite zlib libnetxms libnxlp libnxmb \
+          libnxsl libpng libstrophe nxscript db snmp appagent agent \
+          client server tools
 
 include ..\Makefile.inc.w32

diff --git a/src/agent/subagents/java/java/Makefile.w32 b/src/agent/subagents/java/java/Makefile.w32
index fce84eb..13dc032 100644 (file)
--- a/src/agent/subagents/java/java/Makefile.w32
+++ b/src/agent/subagents/java/java/Makefile.w32
@@ -1,4 +1,5 @@
 TARGET = netxms-agent.jar
 TYPE = jar
+JAR_BUILD_MODE = install
 
 include ..\..\..\..\..\Makefile.inc.w32

diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index 02f5f5b..5db764c 100644 (file)
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -9,4 +9,4 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 SUBDIRS = libnxclient @CLIENT_COMPONENTS@ install
-EXTRA_DIST = readme.txt
+EXTRA_DIST = Makefile.w32 readme.txt

diff --git a/src/client/Makefile.w32 b/src/client/Makefile.w32
new file mode 100644 (file)
index 0000000..9b11c22
--- /dev/null
+++ b/src/client/Makefile.w32
@@ -0,0 +1,3 @@
+SUBDIRS = libnxclient nxalarm nxevent nxpush nxshell nxsms
+
+include ..\..\Makefile.inc.w32

diff --git a/src/client/libnxclient/Makefile.am b/src/client/libnxclient/Makefile.am
index d1b05c5..8176dfa 100644 (file)
--- a/src/client/libnxclient/Makefile.am
+++ b/src/client/libnxclient/Makefile.am
@@ -9,4 +9,5 @@ libnxclient_la_LIBADD = ../../libnetxms/libnetxms.la
 
 EXTRA_DIST = \
        libnxclient.vcproj \
-       libnxclient.h
+       libnxclient.h \
+       Makefile.w32

diff --git a/src/client/libnxclient/Makefile.w32 b/src/client/libnxclient/Makefile.w32
new file mode 100644 (file)
index 0000000..74025d0
--- /dev/null
+++ b/src/client/libnxclient/Makefile.w32
@@ -0,0 +1,8 @@
+TARGET = libnxclient.dll
+TYPE = dll
+SOURCES = alarms.cpp dc.cpp events.cpp main.cpp objects.cpp server.cpp session.cpp
+
+CPPFLAGS = /DLIBNXCLIENT_EXPORTS
+LIBS = libnetxms.lib ws2_32.lib
+         
+include ..\..\..\Makefile.inc.w32

diff --git a/src/client/nxalarm/Makefile.am b/src/client/nxalarm/Makefile.am
index a002656..974c6e8 100644 (file)
--- a/src/client/nxalarm/Makefile.am
+++ b/src/client/nxalarm/Makefile.am
@@ -3,4 +3,4 @@ nxalarm_SOURCES = nxalarm.cpp
 nxalarm_CPPFLAGS=-I@top_srcdir@/include
 nxalarm_LDADD = ../../libnetxms/libnetxms.la ../libnxclient/libnxclient.la
 
-EXTRA_DIST = nxalarm.vcproj nxalarm.h
+EXTRA_DIST = Makefile.w32 nxalarm.vcproj nxalarm.h

diff --git a/src/client/nxalarm/Makefile.w32 b/src/client/nxalarm/Makefile.w32
new file mode 100644 (file)
index 0000000..27cb9af
--- /dev/null
+++ b/src/client/nxalarm/Makefile.w32
@@ -0,0 +1,7 @@
+TARGET = nxalarm.exe
+TYPE = exe
+SOURCES = nxalarm.cpp
+
+LIBS = libnxclient.lib libnetxms.lib ws2_32.lib
+         
+include ..\..\..\Makefile.inc.w32

diff --git a/src/client/nxevent/Makefile.am b/src/client/nxevent/Makefile.am
index f18a14b..4c0e472 100644 (file)
--- a/src/client/nxevent/Makefile.am
+++ b/src/client/nxevent/Makefile.am
@@ -13,4 +13,4 @@ nxevent_SOURCES = nxevent.cpp
 nxevent_CPPFLAGS=-I@top_srcdir@/include
 nxevent_LDADD = ../../libnetxms/libnetxms.la ../libnxclient/libnxclient.la
 
-EXTRA_DIST = nxevent.vcproj nxevent.h
+EXTRA_DIST = Makefile.w32 nxevent.vcproj nxevent.h

diff --git a/src/client/nxevent/Makefile.w32 b/src/client/nxevent/Makefile.w32
new file mode 100644 (file)
index 0000000..e03ef34
--- /dev/null
+++ b/src/client/nxevent/Makefile.w32
@@ -0,0 +1,7 @@
+TARGET = nxevent.exe
+TYPE = exe
+SOURCES = nxevent.cpp
+
+LIBS = libnxclient.lib libnetxms.lib ws2_32.lib
+         
+include ..\..\..\Makefile.inc.w32

diff --git a/src/client/nxpush/Makefile.am b/src/client/nxpush/Makefile.am
index 1d78410..b74b535 100644 (file)
--- a/src/client/nxpush/Makefile.am
+++ b/src/client/nxpush/Makefile.am
@@ -13,4 +13,4 @@ nxpush_SOURCES = nxpush.cpp
 nxpush_CPPFLAGS=-I@top_srcdir@/include
 nxpush_LDADD = ../../libnetxms/libnetxms.la ../libnxclient/libnxclient.la
 
-EXTRA_DIST = nxpush.vcproj
+EXTRA_DIST = Makefile.w32 nxpush.vcproj

diff --git a/src/client/nxpush/Makefile.w32 b/src/client/nxpush/Makefile.w32
new file mode 100644 (file)
index 0000000..8db9df9
--- /dev/null
+++ b/src/client/nxpush/Makefile.w32
@@ -0,0 +1,7 @@
+TARGET = nxpush.exe
+TYPE = exe
+SOURCES = nxpush.cpp
+
+LIBS = libnxclient.lib libnetxms.lib ws2_32.lib
+         
+include ..\..\..\Makefile.inc.w32

diff --git a/src/client/nxshell/Makefile.am b/src/client/nxshell/Makefile.am
index a1e9dca..e38001b 100644 (file)
--- a/src/client/nxshell/Makefile.am
+++ b/src/client/nxshell/Makefile.am
@@ -3,6 +3,6 @@ nxshell_SOURCES = nxshell.cpp
 nxshell_CPPFLAGS=-I@top_srcdir@/include
 nxshell_LDADD = ../../libnetxms/libnetxms.la
 
-EXTRA_DIST = nxshell.vcproj
+EXTRA_DIST = Makefile.w32 nxshell.vcproj
 
 SUBDIRS = java

diff --git a/src/client/nxshell/Makefile.w32 b/src/client/nxshell/Makefile.w32
new file mode 100644 (file)
index 0000000..3b34e28
--- /dev/null
+++ b/src/client/nxshell/Makefile.w32
@@ -0,0 +1,9 @@
+TARGET = nxshell.exe
+TYPE = exe
+SOURCES = nxshell.cpp
+
+LIBS = libnetxms.lib
+
+SUBDIRS = java
+         
+include ..\..\..\Makefile.inc.w32

diff --git a/src/client/nxshell/java/Makefile.am b/src/client/nxshell/java/Makefile.am
index a150727..62c330a 100644 (file)
--- a/src/client/nxshell/java/Makefile.am
+++ b/src/client/nxshell/java/Makefile.am
@@ -6,4 +6,4 @@ nxshell.jar: pom.xml
        MAVEN_OPTS=-Xmx512m mvn package -Pnxshell-launcher
        mv target/nxshell.jar .
 
-EXTRA_DIST = pom.xml nxshell.jar
+EXTRA_DIST = pom.xml nxshell.jar Makefile.w32

diff --git a/src/client/nxshell/java/Makefile.w32 b/src/client/nxshell/java/Makefile.w32
new file mode 100644 (file)
index 0000000..1ca499c
--- /dev/null
+++ b/src/client/nxshell/java/Makefile.w32
@@ -0,0 +1,6 @@
+TARGET = nxshell.jar
+TYPE = jar
+
+MVNFLAGS = -Pnxshell-launcher
+
+include ..\..\..\..\Makefile.inc.w32

diff --git a/src/client/nxsms/Makefile.am b/src/client/nxsms/Makefile.am
index 32ec6d8..daf6f00 100644 (file)
--- a/src/client/nxsms/Makefile.am
+++ b/src/client/nxsms/Makefile.am
@@ -3,4 +3,4 @@ nxsms_SOURCES = nxsms.cpp
 nxsms_CPPFLAGS=-I@top_srcdir@/include
 nxsms_LDADD = ../../libnetxms/libnetxms.la ../libnxclient/libnxclient.la
 
-EXTRA_DIST = nxsms.vcproj nxsms.h
+EXTRA_DIST = Makefile.w32 nxsms.vcproj nxsms.h

diff --git a/src/client/nxsms/Makefile.w32 b/src/client/nxsms/Makefile.w32
new file mode 100644 (file)
index 0000000..5969f91
--- /dev/null
+++ b/src/client/nxsms/Makefile.w32
@@ -0,0 +1,7 @@
+TARGET = nxsms.exe
+TYPE = exe
+SOURCES = nxsms.cpp
+
+LIBS = libnxclient.lib libnetxms.lib ws2_32.lib
+         
+include ..\..\..\Makefile.inc.w32

diff --git a/src/server/tools/Makefile.w32 b/src/server/tools/Makefile.w32
index e6500a7..e2c5a7b 100644 (file)
--- a/src/server/tools/Makefile.w32
+++ b/src/server/tools/Makefile.w32
@@ -1,3 +1,3 @@
-SUBDIRS = nddload nxaction nxadm nxdbmgr
+SUBDIRS = nddload nxaction nxadm nxap nxdbmgr nxget nxminfo nxupload
 
 include ..\..\..\Makefile.inc.w32

diff --git a/src/server/tools/nxap/Makefile.am b/src/server/tools/nxap/Makefile.am
index 1b752a8..359560b 100644 (file)
--- a/src/server/tools/nxap/Makefile.am
+++ b/src/server/tools/nxap/Makefile.am
@@ -4,4 +4,5 @@ nxap_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 nxap_LDADD = ../../../libnetxms/libnetxms.la ../../libnxsrv/libnxsrv.la ../../../snmp/libnxsnmp/libnxsnmp.la
 
 EXTRA_DIST = \
+       Makefile.w32 \
        nxap.vcproj

diff --git a/src/server/tools/nxap/Makefile.w32 b/src/server/tools/nxap/Makefile.w32
new file mode 100644 (file)
index 0000000..42b126d
--- /dev/null
+++ b/src/server/tools/nxap/Makefile.w32
@@ -0,0 +1,8 @@
+TARGET = nxap.exe
+TYPE = exe
+COMPONENT = server
+SOURCES = nxap.cpp
+
+LIBS = libnxsrv.lib libnetxms.lib ws2_32.lib
+         
+include ..\..\..\..\Makefile.inc.w32

diff --git a/src/server/tools/nxget/Makefile.am b/src/server/tools/nxget/Makefile.am
index 3ed457d..e832146 100644 (file)
--- a/src/server/tools/nxget/Makefile.am
+++ b/src/server/tools/nxget/Makefile.am
@@ -4,4 +4,5 @@ nxget_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 nxget_LDADD = ../../../libnetxms/libnetxms.la ../../libnxsrv/libnxsrv.la ../../../snmp/libnxsnmp/libnxsnmp.la
 
 EXTRA_DIST = \
+       Makefile.w32 \
        nxget.vcproj

diff --git a/src/server/tools/nxget/Makefile.w32 b/src/server/tools/nxget/Makefile.w32
new file mode 100644 (file)
index 0000000..6ed59df
--- /dev/null
+++ b/src/server/tools/nxget/Makefile.w32
@@ -0,0 +1,8 @@
+TARGET = nxget.exe
+TYPE = exe
+COMPONENT = server
+SOURCES = nxget.cpp
+
+LIBS = libnxsrv.lib libnetxms.lib ws2_32.lib
+         
+include ..\..\..\..\Makefile.inc.w32

diff --git a/src/server/tools/nxminfo/Makefile.am b/src/server/tools/nxminfo/Makefile.am
index 045997a..415a5a0 100644 (file)
--- a/src/server/tools/nxminfo/Makefile.am
+++ b/src/server/tools/nxminfo/Makefile.am
@@ -3,4 +3,6 @@ nxminfo_SOURCES = nxminfo.cpp
 nxminfo_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 nxminfo_LDADD = ../../../libnetxms/libnetxms.la ../../libnxsrv/libnxsrv.la @SERVER_LIBS@
 
-EXTRA_DIST = nxminfo.vcproj
+EXTRA_DIST = \
+       Makefile.w32 \
+       nxminfo.vcproj

diff --git a/src/server/tools/nxminfo/Makefile.w32 b/src/server/tools/nxminfo/Makefile.w32
new file mode 100644 (file)
index 0000000..0651d00
--- /dev/null
+++ b/src/server/tools/nxminfo/Makefile.w32
@@ -0,0 +1,8 @@
+TARGET = nxminfo.exe
+TYPE = exe
+COMPONENT = server
+SOURCES = nxminfo.cpp
+
+LIBS = libnetxms.lib ws2_32.lib
+         
+include ..\..\..\..\Makefile.inc.w32

diff --git a/src/server/tools/nxupload/Makefile.am b/src/server/tools/nxupload/Makefile.am
index 09f3212..c33f128 100644 (file)
--- a/src/server/tools/nxupload/Makefile.am
+++ b/src/server/tools/nxupload/Makefile.am
@@ -4,4 +4,5 @@ nxupload_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 nxupload_LDADD = ../../../libnetxms/libnetxms.la ../../libnxsrv/libnxsrv.la ../../../snmp/libnxsnmp/libnxsnmp.la
 
 EXTRA_DIST = \
+       Makefile.w32 \
        nxupload.vcproj

diff --git a/src/server/tools/nxupload/Makefile.w32 b/src/server/tools/nxupload/Makefile.w32
new file mode 100644 (file)
index 0000000..8ef87f5
--- /dev/null
+++ b/src/server/tools/nxupload/Makefile.w32
@@ -0,0 +1,8 @@
+TARGET = nxupload.exe
+TYPE = exe
+COMPONENT = server
+SOURCES = nxupload.cpp
+
+LIBS = libnxsrv.lib libnetxms.lib ws2_32.lib
+         
+include ..\..\..\..\Makefile.inc.w32