intermediate release; some cosmetic changes
authorVictor Kirhenshtein <victor@netxms.org>
Wed, 3 Sep 2014 12:01:03 +0000 (15:01 +0300)
committerVictor Kirhenshtein <victor@netxms.org>
Wed, 3 Sep 2014 12:01:03 +0000 (15:01 +0300)
ChangeLog
netxms.sln
src/agent/nxsagent/screenshot.cpp
src/install/windows/netxms-x64.iss
src/install/windows/netxms.iss
src/install/windows/setup.iss
src/java/build/pack.cmd
src/java/netxms-eclipse/Core/nxmc.product
src/java/netxms-eclipse/Core/plugin.xml
src/libpng/libpng.vcproj

index 22b21de..f6dff50 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,7 +35,7 @@
    - Fixed incorrect processing of ilike, match, and imatch operators
    - Added try / catch operator
 - New MIBs added: NETUP-MIB
-- Fixed issues: #424, #618, #619, #620
+- Fixed issues: #424, #463, #543, #618, #619, #620
 
 
 *
index 5e98130..28de7c7 100644 (file)
@@ -1485,7 +1485,8 @@ Global
                {C1A5E28A-CF47-4D96-9656-3312F16E3724}.Debug|x64.Build.0 = Debug|x64
                {C1A5E28A-CF47-4D96-9656-3312F16E3724}.Release|Win32.ActiveCfg = Release|Win32
                {C1A5E28A-CF47-4D96-9656-3312F16E3724}.Release|Win32.Build.0 = Release|Win32
-               {C1A5E28A-CF47-4D96-9656-3312F16E3724}.Release|x64.ActiveCfg = Release|Win32
+               {C1A5E28A-CF47-4D96-9656-3312F16E3724}.Release|x64.ActiveCfg = Release|x64
+               {C1A5E28A-CF47-4D96-9656-3312F16E3724}.Release|x64.Build.0 = Release|x64
                {9C6790BA-385D-476D-944A-552C87018733}.Debug|Win32.ActiveCfg = Debug|Win32
                {9C6790BA-385D-476D-944A-552C87018733}.Debug|Win32.Build.0 = Debug|Win32
                {9C6790BA-385D-476D-944A-552C87018733}.Debug|x64.ActiveCfg = Debug|x64
index d734501..b6c2f01 100644 (file)
@@ -44,7 +44,7 @@ void TakeScreenshot(CSCPMessage *response)
          if (bitmap != NULL)
          {
             SelectObject(memdc, bitmap);
-            BitBlt(memdc, 0, 0, cx, cy, dc, x, y, SRCCOPY);
+            BitBlt(memdc, 0, 0, cx, cy, dc, x, y, SRCCOPY | CAPTUREBLT);
          }
 
          DeleteDC(memdc);
index 2b902c4..aa1abd6 100644 (file)
@@ -1,7 +1,7 @@
 ; Installation script for NetXMS Server / Windows x64
 
 #include "setup.iss"
-OutputBaseFilename=netxms-1.2.16-x64
+OutputBaseFilename=netxms-1.2.17-x64
 ArchitecturesInstallIn64BitMode=x64
 ArchitecturesAllowed=x64
 
index 1b8647e..543dc6f 100644 (file)
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #include "setup.iss"
-OutputBaseFilename=netxms-1.2.16
+OutputBaseFilename=netxms-1.2.17
 
 [Components]
 Name: "base"; Description: "Base Files"; Types: full compact custom; Flags: fixed
index 82f74f8..9e14380 100644 (file)
@@ -1,7 +1,7 @@
 [Setup]
 AppName=NetXMS
-AppVerName=NetXMS 1.2.16
-AppVersion=1.2.16
+AppVerName=NetXMS 1.2.17
+AppVersion=1.2.17
 AppPublisher=Raden Solutions
 AppPublisherURL=http://www.radensolutions.com
 AppSupportURL=http://www.netxms.org
index 64dc412..fdd38ae 100644 (file)
@@ -1,6 +1,6 @@
 @echo off
 call set_build_number.cmd
-set version=1.2.16
+set version=1.2.17-%build_number%
 
 cd win32.win32.x86
 zip -r nxmc-%version%-win32-x86.zip nxmc
index 83f4654..cf11d88 100644 (file)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="%product.name" id="org.netxms.ui.eclipse.console.product" application="org.netxms.ui.eclipse.console.application" version="1.2.16" useFeatures="false" includeLaunchers="true">
+<product name="%product.name" id="org.netxms.ui.eclipse.console.product" application="org.netxms.ui.eclipse.console.application" version="1.2.17" useFeatures="false" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/Core/icons/launcher/128x128.png"/>
       <text>
          NetXMS Management Console
 
-Version 1.2.16
+Version 1.2.17
 Copyright (c) 2003-2014 Raden Solutions
       </text>
    </aboutInfo>
index 5095e5b..4f5ea85 100644 (file)
@@ -62,7 +62,7 @@
          </property>
          <property
                name="aboutText"
-               value="NetXMS Management Console&#x0A;&#x0A;Version 1.2.16&#x0A;Copyright (c) 2003-2014 Raden Solutions">
+               value="NetXMS Management Console&#x0A;&#x0A;Version 1.2.17&#x0A;Copyright (c) 2003-2014 Raden Solutions">
          </property>
          <property
                name="startupForegroundColor"
index bb7ed3d..df9cc21 100644 (file)
@@ -44,7 +44,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\include;..\zlib"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPNG_EXPORTS"
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPNG_EXPORTS;_CRT_SECURE_NO_WARNINGS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                        />
                </Configuration>
                <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
+                       Name="Debug|x64"
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="2"
                        CharacterSet="1"
-                       WholeProgramOptimization="1"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
                        />
                        <Tool
                                Name="VCMIDLTool"
+                               TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               Optimization="0"
                                AdditionalIncludeDirectories="..\..\include;..\zlib"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPNG_EXPORTS"
-                               RuntimeLibrary="2"
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPNG_EXPORTS;_CRT_SECURE_NO_WARNINGS"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="true"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               LinkIncremental="1"
+                               LinkIncremental="2"
                                GenerateDebugInformation="true"
                                SubSystem="2"
-                               OptimizeReferences="2"
-                               EnableCOMDATFolding="2"
-                               TargetMachine="1"
+                               TargetMachine="17"
                        />
                        <Tool
                                Name="VCALinkTool"
                        />
                </Configuration>
                <Configuration
-                       Name="Debug|x64"
-                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+                       Name="Release|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
                        ConfigurationType="2"
                        CharacterSet="1"
+                       WholeProgramOptimization="1"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               Optimization="0"
                                AdditionalIncludeDirectories="..\..\include;..\zlib"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPNG_EXPORTS"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPNG_EXPORTS;_CRT_SECURE_NO_WARNINGS"
+                               RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="true"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               LinkIncremental="2"
+                               LinkIncremental="1"
                                GenerateDebugInformation="true"
                                SubSystem="2"
-                               TargetMachine="17"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               TargetMachine="1"
                        />
                        <Tool
                                Name="VCALinkTool"
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="..\..\include;..\zlib"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPNG_EXPORTS"
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPNG_EXPORTS;_CRT_SECURE_NO_WARNINGS"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"