* fix windows language from russian to English

* fix creating of distinct resource files for our set of commandline tools.

Installation/Windows/version/VersionResource.rc

@@ -1,4 +1,4 @@
-#include "VersionInfo.h"
+#include "VersionInfo_@PRODUCT_NAME@.h"
 #include "winres.h"
 
 IDI_ICON1               ICON                    PRODUCT_ICON
@@ -20,7 +20,7 @@ VS_VERSION_INFO VERSIONINFO
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
-        BLOCK "041904b0"
+        BLOCK "040904b0"
         BEGIN
             VALUE "Comments", PRODUCT_COMMENTS
             VALUE "CompanyName", PRODUCT_COMPANY_NAME
@@ -35,6 +35,6 @@ BEGIN
     END
     BLOCK "VarFileInfo"
     BEGIN
-        VALUE "Translation", 0x419, 1200
+        VALUE "Translation", 0x409, 1200
     END
 END

Installation/Windows/version/generate_product_version.cmake

@@ -75,6 +75,10 @@ function(generate_product_version outfiles)
         set(PRODUCT_VERSION_REVISION 0)
     endif()
 
+    if (NOT PRODUCT_NAME OR "${PRODUCT_NAME}" STREQUAL "")
+        set(PRODUCT_NAME "")
+    endif()
+
     if (NOT PRODUCT_COMPANY_COPYRIGHT OR "${PRODUCT_COMPANY_COPYRIGHT}" STREQUAL "")
         string(TIMESTAMP PRODUCT_CURRENT_YEAR "%Y")
         set(PRODUCT_COMPANY_COPYRIGHT "${PRODUCT_COMPANY_NAME} (C) Copyright ${PRODUCT_CURRENT_YEAR}")
@@ -92,8 +96,8 @@ function(generate_product_version outfiles)
         set(PRODUCT_FILE_DESCRIPTION "${PRODUCT_NAME}")
     endif()
 
-    set (_VersionInfoFile ${CMAKE_CURRENT_BINARY_DIR}/VersionInfo.h)
-    set (_VersionResourceFile ${CMAKE_CURRENT_BINARY_DIR}/VersionResource.rc)
+    set (_VersionInfoFile ${CMAKE_CURRENT_BINARY_DIR}/VersionInfo_${PRODUCT_NAME}.h)
+    set (_VersionResourceFile ${CMAKE_CURRENT_BINARY_DIR}/VersionResource_${PRODUCT_NAME}.rc)
     configure_file(
         ${GenerateProductVersionCurrentDir}/VersionInfo.in
         ${_VersionInfoFile}
@@ -101,7 +105,7 @@ function(generate_product_version outfiles)
     configure_file(
         ${GenerateProductVersionCurrentDir}/VersionResource.rc
         ${_VersionResourceFile}
-        COPYONLY)
+        @ONLY)
     list(APPEND ${outfiles} ${_VersionInfoFile} ${_VersionResourceFile})
     set (${outfiles} ${${outfiles}} PARENT_SCOPE)
 endfunction()

arangod/CMakeLists.txt

@@ -40,7 +40,8 @@ if (MSVC)
 
   generate_product_version(
     ProductVersionFiles
-    NAME ${ARANGODB_FRIENDLY_STRING}
+    NAME arangod
+    FILE_DESCRIPTION ${ARANGODB_FRIENDLY_STRING}
     ICON ${ARANGO_ICON}
     VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR}
     VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR}

arangosh/CMakeLists.txt

@@ -24,7 +24,8 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
 if (MSVC)
   generate_product_version(
     ProductVersionFiles_arangob
-    NAME ${ARANGOB_FRIENDLY_STRING}
+    NAME arangob
+    FILE_DESCRIPTION ${ARANGOB_FRIENDLY_STRING}
     ICON ${ARANGO_ICON}
     VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR}
     VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR}
@@ -73,7 +74,8 @@ install_config(arangob)
 if (MSVC)
   generate_product_version(
     ProductVersionFiles_arangodump
-    NAME ${ARANGO_DUMP_FRIENDLY_STRING}
+    NAME arangodump
+    FILE_DESCRIPTION ${ARANGO_DUMP_FRIENDLY_STRING}
     ICON ${ARANGO_ICON}
     VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR}
     VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR}
@@ -122,7 +124,8 @@ install_config(arangodump)
 if (MSVC)
   generate_product_version(
     ProductVersionFiles_arangoimp
-    NAME ${ARANGO_IMP_FRIENDLY_STRING}
+    NAME arangoimp
+    FILE_DESCRIPTION ${ARANGO_IMP_FRIENDLY_STRING}
     ICON ${ARANGO_ICON}
     VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR}
     VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR}
@@ -172,7 +175,8 @@ install_config(arangoimp)
 if (MSVC)
   generate_product_version(
     ProductVersionFiles_arangorestore
-    NAME ${ARANGO_RESTORE_HELP_LINK}
+    NAME arangorestore
+    FILE_DESCRIPTION ${ARANGO_RESTORE_HELP_LINK}
     ICON ${ARANGO_ICON}
     VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR}
     VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR}
@@ -220,7 +224,8 @@ install_config(arangorestore)
 if (MSVC)
   generate_product_version(
     ProductVersionFiles_arangosh
-    NAME ${ARANGOSH_HELP_LINK}
+    NAME arangosh
+    FILE_DESCRIPTION ${ARANGOSH_HELP_LINK}
     ICON ${ARANGO_ICON}
     VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR}
     VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR}