Commit c38f244f authored by Gilles Dubois's avatar Gilles Dubois
Browse files

Update version for alpha release, update deps version, update deps scripts, update setup nsi

parent 167dcb0b
......@@ -34,8 +34,8 @@ IDR_MAINFRAME ICON "res\\OCSInventory.ico"
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,1,1,5
PRODUCTVERSION 2,1,1,5
FILEVERSION 2,2,0,0
PRODUCTVERSION 2,2,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
......@@ -53,13 +53,13 @@ BEGIN
VALUE "Comments", "OCS Inventory NG Agent"
VALUE "CompanyName", "OCS Inventory NG"
VALUE "FileDescription", "OCS Inventory NG Agent"
VALUE "FileVersion", "2.1.1.5"
VALUE "FileVersion", "2.2.0.0"
VALUE "InternalName", "OCSInventory.exe"
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
VALUE "OriginalFilename", "OCSInventory.exe"
VALUE "ProductName", "OCS Inventory NG Windows Agent"
VALUE "ProductVersion", "2.1.1.5"
VALUE "ProductVersion", "2.2.0.0"
END
END
BLOCK "VarFileInfo"
......
......@@ -112,7 +112,7 @@
<MkTypLibCompatible>false</MkTypLibCompatible>
</Midl>
<ClCompile>
<AdditionalIncludeDirectories>..\External_Deps\openssl-1.0.0s\inc32;..\External_Deps\curl-7.45.0\include;..\External_Deps\tinyxml;..\OCSInventory Front;..\OcsWmi;..\SysInfo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\External_Deps\openssl-1.0.0s\inc32;..\External_Deps\curl-7.48.0\include;..\External_Deps\tinyxml;..\OCSInventory Front;..\OcsWmi;..\SysInfo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;_AFX_NO_DB_SUPPORT;_AFX_NO_DAO_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION;OCS_PROVIDER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader />
......
......@@ -22,22 +22,22 @@ Rem Set path to Perl 5.6 or higher binary
set PERL_PATH=C:\Perl\bin
Rem Set path to Zlib sources
set ZLIB_PATH=C:\Users\Win-Agent\Desktop\WindowsAgent-master\External_Deps\zlib-1.2.8
set ZLIB_PATH=C:\Users\user-win-dev\Documents\GitHub\WindowsAgent\External_Deps\zlib-1.2.8
Rem Set path to OpenSSL sources
set OPENSSL_PATH=C:\Users\Win-Agent\Desktop\WindowsAgent-master\External_Deps\openssl-1.0.0s
set OPENSSL_PATH=C:\Users\user-win-dev\Documents\GitHub\WindowsAgent\External_Deps\openssl-1.0.0s
Rem Set path to cURL sources
set CURL_PATH=C:\Users\Win-Agent\Desktop\WindowsAgent-master\External_Deps\curl-7.45.0
set CURL_PATH=C:\Users\user-win-dev\Documents\GitHub\WindowsAgent\External_Deps\curl-7.48.0\src
Rem Set path to tinyXML sources
SET XML_PATH=C:\Users\Win-Agent\Desktop\WindowsAgent-master\External_Deps\tinyxml
SET XML_PATH=C:\Users\user-win-dev\Documents\GitHub\WindowsAgent\External_Deps\tinyxml
Rem Set path to ZipArchive sources, for example
SET ZIP_PATH=C:\Users\Win-Agent\Desktop\WindowsAgent-master\External_Deps\ZipArchive
SET ZIP_PATH=C:\Users\user-win-dev\Documents\GitHub\WindowsAgent\External_Deps\ZipArchive
Rem Set path to Net-SNMP sources, for example
SET SNMP_PATH=C:\Users\Win-Agent\Desktop\WindowsAgent-master\External_Deps\net-snmp-5.7.3
SET SNMP_PATH=C:\Users\user-win-dev\Documents\GitHub\WindowsAgent\External_Deps\net-snmp-5.7.3
Rem ========= DO NOT MODIFY BELOW, UNTIL YOU KNOW WHAT YOU ARE DOING =========
......@@ -113,11 +113,11 @@ echo.
cd "%CURL_PATH%"
Rem Disable LDAP support, not needed in OCS Inventory NG Agent
set WINDOWS_SSPI=0
cd lib
cd ..\lib
Rem Fix cURL DLL config for MS Visual C++ with lastest Service Pack ( -D_BIND_TO_CURRENT_VCLIBS_VERSION)
perl.exe -pi.bak -e "s# /DBUILDING_LIBCURL# /DBUILDING_LIBCURL /D_BIND_TO_CURRENT_VCLIBS_VERSION#g" Makefile.vc9
perl.exe -pi.bak -e "s# /DBUILDING_LIBCURL# /DBUILDING_LIBCURL /D_BIND_TO_CURRENT_VCLIBS_VERSION#g" Makefile.vc12
Rem Build cURL dll using OpenSSL Dlls and Zlib dll
nmake /NOLOGO /f Makefile.vc9 cfg=release-dll-ssl-dll-zlib-dll
nmake /NOLOGO /f Makefile.vc12 cfg=release-dll-ssl-dll-zlib-dll
if ERRORLEVEL 1 goto ERROR
Rem Insert manifest into DLL
cd release-dll-ssl-dll-zlib-dll
......
......@@ -12,7 +12,7 @@ setcompressor /SOLID lzma
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "OCS Inventory NG Agent"
!define PRODUCT_VERSION "2.1.1.5"
!define PRODUCT_VERSION "2.2.0.0"
!define PRODUCT_PUBLISHER "OCS Inventory NG Team"
!define PRODUCT_WEB_SITE "http://www.ocsinventory-ng.org"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\OCSInventory.exe"
......
No preview for this file type
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment