From b93df83a71ff11e35658ea0056cdfc55dbf741c2 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Mon, 2 Sep 2019 11:20:26 -0300 Subject: [PATCH] Adding product name for windows build. --- configure.ac | 4 ++++ src/core/windows/resources.rc.in | 2 +- win/hllapi.nsi | 16 ++++++++-------- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 961589c..2925a0e 100644 --- a/configure.ac +++ b/configure.ac @@ -74,6 +74,10 @@ dnl --------------------------------------------------------------------------- AC_SUBST(PACKAGE_DESCRIPTION,"PW3270 HLLAPI Module") +AC_ARG_WITH([product-name], [AS_HELP_STRING([--with-product-name], [Set product name])], [ app_cv_product="$withval" ],[ app_cv_product="pw3270" ]) +AC_DEFINE_UNQUOTED(PRODUCT_NAME, $app_cv_product) +AC_SUBST(PRODUCT_NAME,$app_cv_product) + app_vrs_major=$(echo $VERSION | cut -d. -f1) app_vrs_minor=$(echo $VERSION | cut -d. -f2) diff --git a/src/core/windows/resources.rc.in b/src/core/windows/resources.rc.in index 4bab1b3..69c7814 100644 --- a/src/core/windows/resources.rc.in +++ b/src/core/windows/resources.rc.in @@ -15,7 +15,7 @@ BEGIN VALUE "FileVersion", "@WIN32_VERSION@\0" VALUE "LegalCopyright", "(C) 2017 Banco do Brasil S/A. All Rights Reserved\0" VALUE "OriginalFilename", "hllapi@DLLEXT@\0" - VALUE "ProductName", "pw3270\0" + VALUE "ProductName", "@PRODUCT_NAME@\0" VALUE "ProductVersion", "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@\0" END END diff --git a/win/hllapi.nsi b/win/hllapi.nsi index f6a03bb..3d683c2 100644 --- a/win/hllapi.nsi +++ b/win/hllapi.nsi @@ -4,11 +4,11 @@ Name "hllapi" Caption "hllapi - PW3270 HLLAPI Module" -outfile "hllapi-5.2.19.8-x86_64.exe" +outfile "hllapi-5.2.19.9-i686.exe" XPStyle on -installDir "$PROGRAMFILES64\hllapi" +installDir "$PROGRAMFILES\hllapi" # Get installation folder from registry if available InstallDirRegKey HKLM "Software\hllapi" "InstallLocation" @@ -16,11 +16,11 @@ InstallDirRegKey HKLM "Software\hllapi" "InstallLocation" RequestExecutionLevel admin # Properties -VIProductVersion "5.2.19.8" -VIFileVersion "19.8.30.16" +VIProductVersion "5.2.19.9" +VIFileVersion "19.9.2.11" -VIAddVersionKey "ProductVersion" "5.2.19.8" -VIAddVersionKey "FileVersion" "19.8.30.16" +VIAddVersionKey "ProductVersion" "5.2.19.9" +VIAddVersionKey "FileVersion" "19.9.2.11" VIAddVersionKey "ProductName" "hllapi" VIAddVersionKey "FileDescription" "PW3270 HLLAPI Module" @@ -51,7 +51,7 @@ SubSection "hllapi" SecMain Section "Core" SecCore - SetRegView 64 + SetRegView 32 ${DisableX64FSRedirection} # define the output path for this file @@ -107,7 +107,7 @@ Section "Uninstall" DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\hllapi" DeleteRegKey HKLM "Software\hllapi" - SetRegView 64 + SetRegView 32 DeleteRegKey HKLM "Software\hllapi" SectionEnd -- libgit2 0.21.2