Skip to content
GitLab
Commit f9ab09f6 authored by Gilles Dubois's avatar Gilles Dubois
Browse files

Prepapre 2.6.0.1 release and NSIS to visual 2019 DLL

parent 743d442c
Hide whitespace changes
Inline Side-by-side
Agent/OCSInventory.rc
View file @ f9ab09f6
......@@ -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.6.0.0"
VALUE "FileVersion", "2.6.0.1"
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.6.0.0"
VALUE "ProductVersion", "2.6.0.1"
END
END
BLOCK "VarFileInfo"
......
ComHTTP/HTTP.rc
View file @ f9ab09f6
......@@ -44,13 +44,13 @@ BEGIN
VALUE "Comments", "OCS Inventory NG Communication Provider"
VALUE "CompanyName", "OCS Inventory NG"
VALUE "FileDescription", "OCS Inventory NG cURL Communication Provider"
VALUE "FileVersion", "2.6.0.0"
VALUE "FileVersion", "2.6.0.1"
VALUE "InternalName", "ComHTTP.dll"
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
VALUE "OriginalFilename", "ComHTTP.dll"
VALUE "ProductName", "OCS Inventory NG Windows Agent"
VALUE "ProductVersion", "2.6.0.0"
VALUE "ProductVersion", "2.6.0.1"
END
END
BLOCK "VarFileInfo"
......
Download/Download.rc
View file @ f9ab09f6
......@@ -47,13 +47,13 @@ BEGIN
VALUE "Comments", "OCS Inventory NG Package Download and Setup Tool"
VALUE "CompanyName", "OCS Inventory NG"
VALUE "FileDescription", "OCS Inventory NG Package Download and Setup Tool"
VALUE "FileVersion", "2.6.0.0"
VALUE "FileVersion", "2.6.0.1"
VALUE "InternalName", "Download.exe"
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
VALUE "OriginalFilename", "Download.exe"
VALUE "ProductName", "OCS Inventory NG Windows Agent"
VALUE "ProductVersion", "2.6.0.0"
VALUE "ProductVersion", "2.6.0.1"
END
END
BLOCK "VarFileInfo"
......
NSIS_agent_setup/OCS-NG_Windows_Agent_Setup.nsi
View file @ f9ab09f6
......@@ -12,7 +12,7 @@ setcompressor /SOLID lzma
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "OCS Inventory NG Agent"
!define PRODUCT_VERSION "2.6.0.0"
!define PRODUCT_VERSION "2.6.0.1"
!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"
......@@ -1616,7 +1616,7 @@ Section "OCS Inventory Agent" SEC03
clearerrors
; MSVC 9 CRT redist current for XP and higher
SetOutPath "$INSTDIR"
File "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CRT\msvcp140.dll"
File "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CRT\msvcp140.dll"
Iferrors 0 +5
StrCpy $logBuffer "$logBuffer ERROR copying msvcp140.dll $\r$\n"
Call Write_Log
......@@ -1628,44 +1628,50 @@ Section "OCS Inventory Agent" SEC03
Call Write_Log
strcpy $installSatus ":("
clearerrors
File "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.MFC\mfc140.dll"
File "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.MFC\mfc140.dll"
Iferrors 0 +5
StrCpy $logBuffer "$logBuffer ERROR copying mfc140.dll $\r$\n"
Call Write_Log
strcpy $installSatus ":("
clearerrors
File "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.MFC\mfc140u.dll"
File "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.MFC\mfc140u.dll"
Iferrors 0 +5
StrCpy $logBuffer "$logBuffer ERROR copying mfc140u.dll $\r$\n"
Call Write_Log
strcpy $installSatus ":("
clearerrors
File "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.MFC\mfcm140.dll"
File "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.MFC\mfcm140.dll"
Iferrors 0 +5
StrCpy $logBuffer "$logBuffer ERROR copying mfcm140.dll $\r$\n"
Call Write_Log
strcpy $installSatus ":("
clearerrors
File "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.MFC\mfcm140u.dll"
File "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.MFC\mfcm140u.dll"
Iferrors 0 +5
StrCpy $logBuffer "$logBuffer ERROR copying mfcm140u.dll $\r$\n"
Call Write_Log
strcpy $installSatus ":("
clearerrors
;Lib for Win 8.0 / 8.1 / win 10
File "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CRT\vcruntime140.dll"
File "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CRT\vcruntime140.dll"
Iferrors 0 +5
StrCpy $logBuffer "$logBuffer ERROR copying vcruntime140.dll $\r$\n"
Call Write_Log
strcpy $installSatus ":("
clearerrors
File "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.OpenMP\vcomp140.dll"
File "vcruntime140_1.dll"
Iferrors 0 +5
StrCpy $logBuffer "$logBuffer ERROR copying vcruntime140.dll $\r$\n"
Call Write_Log
strcpy $installSatus ":("
clearerrors
File "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.OpenMP\vcomp140.dll"
Iferrors 0 +5
StrCpy $logBuffer "$logBuffer ERROR copying vcomp140.dll $\r$\n"
Call Write_Log
strcpy $installSatus ":("
clearerrors
File "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CXXAMP\vcamp140.dll"
File "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CXXAMP\vcamp140.dll"
Iferrors 0 +5
StrCpy $logBuffer "$logBuffer ERROR copying vcamp140.dll $\r$\n"
Call Write_Log
......
OCSInventory Front/OCSInventory Front.rc
View file @ f9ab09f6
......@@ -44,13 +44,13 @@ BEGIN
VALUE "Comments", "OCS Inventory NG Framework Provider"
VALUE "CompanyName", "OCS Inventory NG"
VALUE "FileDescription", "OCS Inventory NG Framework Provider"
VALUE "FileVersion", "2.6.0.0"
VALUE "FileVersion", "2.6.0.1"
VALUE "InternalName", "OCSInventory Front.dll"
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
VALUE "OriginalFilename", "OCSInventory Front.dll"
VALUE "ProductName", "OCS Inventory NG Windows Agent"
VALUE "ProductVersion", "2.6.0.0"
VALUE "ProductVersion", "2.6.0.1"
END
END
BLOCK "VarFileInfo"
......
OcsNotifyUser/OcsNotifyUser.rc
View file @ f9ab09f6
......@@ -404,13 +404,13 @@ BEGIN
VALUE "Comments", "OCS Inventory NG User Notification Provider"
VALUE "CompanyName", "OCS Inventory NG"
VALUE "FileDescription", "OCS Inventory NG User Notification Provider"
VALUE "FileVersion", "2.6.0.0"
VALUE "FileVersion", "2.6.0.1"
VALUE "InternalName", "OcsNotifyUser.exe"
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
VALUE "OriginalFilename", "OcsNotifyUser.exe"
VALUE "ProductName", "OCS Inventory NG Windows Agent"
VALUE "ProductVersion", "2.6.0.0"
VALUE "ProductVersion", "2.6.0.1"
END
END
BLOCK "VarFileInfo"
......
OcsSystray/OcsSystray.rc
View file @ f9ab09f6
......@@ -407,13 +407,13 @@ BEGIN
VALUE "Comments", "OCS Inventory NG Systray applet"
VALUE "CompanyName", "OCS Inventory NG"
VALUE "FileDescription", "OCS Inventory NG Systray applet"
VALUE "FileVersion", "2.6.0.0"
VALUE "FileVersion", "2.6.0.1"
VALUE "InternalName", "OcsSystray.exe"
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
VALUE "OriginalFilename", "OcsSystray.exe"
VALUE "ProductName", "OCS Inventory NG Windows Agent"
VALUE "ProductVersion", "2.6.0.0"
VALUE "ProductVersion", "2.6.0.1"
END
END
BLOCK "VarFileInfo"
......
OcsWmi/OcsWmi.rc
View file @ f9ab09f6
......@@ -44,13 +44,13 @@ BEGIN
VALUE "Comments", "OCS Inventory NG WMI Provider"
VALUE "CompanyName", "OCS Inventory NG"
VALUE "FileDescription", "OCS Inventory NG WMI Provider"
VALUE "FileVersion", "2.6.0.0"
VALUE "FileVersion", "2.6.0.1"
VALUE "InternalName", "OcsWmi.dll"
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
VALUE "OriginalFilename", "OcsWmi.dll"
VALUE "ProductName", "OCS Inventory NG Windows Agent"
VALUE "ProductVersion", "2.6.0.0"
VALUE "ProductVersion", "2.6.0.1"
END
END
BLOCK "VarFileInfo"
......
Service/Service.rc
View file @ f9ab09f6
......@@ -44,13 +44,13 @@ BEGIN
VALUE "Comments", "OCS Inventory NG Service"
VALUE "CompanyName", "OCS Inventory NG"
VALUE "FileDescription", "OCS Inventory NG Service"
VALUE "FileVersion", "2.6.0.0"
VALUE "FileVersion", "2.6.0.1"
VALUE "InternalName", "OcsService.exe"
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
VALUE "OriginalFilename", "OcsService.exe"
VALUE "ProductName", "OCS Inventory NG Windows Agent"
VALUE "ProductVersion", "2.6.0.0"
VALUE "ProductVersion", "2.6.0.1"
END
END
BLOCK "VarFileInfo"
......
SysInfo/SysInfo.rc
View file @ f9ab09f6
......@@ -44,13 +44,13 @@ BEGIN
VALUE "Comments", "OCS Inventory NG System Provider"
VALUE "CompanyName", "OCS Inventory NG"
VALUE "FileDescription", "OCS Inventory NG System Provider"
VALUE "FileVersion", "2.6.0.0"
VALUE "FileVersion", "2.6.0.1"
VALUE "InternalName", "SysInfo.dll"
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
VALUE "OriginalFilename", "SysInfo.dll"
VALUE "ProductName", "OCS Inventory NG Windows Agent"
VALUE "ProductVersion", "2.6.0.0"
VALUE "ProductVersion", "2.6.0.1"
END
END
BLOCK "VarFileInfo"
......
TestSysInfo/TestSysInfo.rc
View file @ f9ab09f6
......@@ -70,13 +70,13 @@ BEGIN
VALUE "Comments", "OCS Inventory NG System Information Testing tool"
VALUE "CompanyName", "OCS Inventory NG"
VALUE "FileDescription", "OCS Inventory NG System Information Testing tool"
VALUE "FileVersion", "2.6.0.0"
VALUE "FileVersion", "2.6.0.1"
VALUE "InternalName", "TestSysInfo.exe"
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
VALUE "OriginalFilename", "TestSysInfo.exe"
VALUE "ProductName", "OCS Inventory NG Windows Agent"
VALUE "ProductVersion", "2.6.0.0"
VALUE "ProductVersion", "2.6.0.1"
END
END
BLOCK "VarFileInfo"
......
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