Download as
Browse Code »

Commit b93df83a71ff11e35658ea0056cdfc55dbf741c2

Authored by Perry Werneck
1 parent 6a281517
Exists in master and in 1 other branch develop

Adding product name for windows build.

Showing 3 changed files with 13 additions and 9 deletions   Show diff stats
configure.ac
  Diff comments   View file @b93df83
... ... @@ -74,6 +74,10 @@ dnl ---------------------------------------------------------------------------
74 74  
75 75 AC_SUBST(PACKAGE_DESCRIPTION,"PW3270 HLLAPI Module")
76 76  
  77 +AC_ARG_WITH([product-name], [AS_HELP_STRING([--with-product-name], [Set product name])], [ app_cv_product="$withval" ],[ app_cv_product="pw3270" ])
  78 +AC_DEFINE_UNQUOTED(PRODUCT_NAME, $app_cv_product)
  79 +AC_SUBST(PRODUCT_NAME,$app_cv_product)
  80 +
77 81 app_vrs_major=$(echo $VERSION | cut -d. -f1)
78 82 app_vrs_minor=$(echo $VERSION | cut -d. -f2)
79 83  
... ...
src/core/windows/resources.rc.in
  Diff comments   View file @b93df83
... ... @@ -15,7 +15,7 @@ BEGIN
15 15 VALUE "FileVersion", "@WIN32_VERSION@\0"
16 16 VALUE "LegalCopyright", "(C) 2017 Banco do Brasil S/A. All Rights Reserved\0"
17 17 VALUE "OriginalFilename", "hllapi@DLLEXT@\0"
18   - VALUE "ProductName", "pw3270\0""
  18 + VALUE "ProductName", "@PRODUCT_NAME@\0""
19 19 VALUE "ProductVersion", "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@\0"
20 20 END
21 21 END
... ...
win/hllapi.nsi
  Diff comments   View file @b93df83
... ... @@ -4,11 +4,11 @@
4 4  
5 5 Name "hllapi"
6 6 Caption "hllapi - PW3270 HLLAPI Module"
7   -outfile "hllapi-5.2.19.8-x86_64.exe"
  7 +outfile "hllapi-5.2.19.9-i686.exe"
8 8  
9 9 XPStyle on
10 10  
11   -installDir "$PROGRAMFILES64\hllapi"
  11 +installDir "$PROGRAMFILES\hllapi"
12 12  
13 13 # Get installation folder from registry if available
14 14 InstallDirRegKey HKLM "Software\hllapi" "InstallLocation"
... ... @@ -16,11 +16,11 @@ InstallDirRegKey HKLM "Software\hllapi" "InstallLocation"
16 16 RequestExecutionLevel admin
17 17  
18 18 # Properties
19   -VIProductVersion "5.2.19.8"
20   -VIFileVersion "19.8.30.16"
  19 +VIProductVersion "5.2.19.9"
  20 +VIFileVersion "19.9.2.11"
21 21  
22   -VIAddVersionKey "ProductVersion" "5.2.19.8"
23   -VIAddVersionKey "FileVersion" "19.8.30.16"
  22 +VIAddVersionKey "ProductVersion" "5.2.19.9"
  23 +VIAddVersionKey "FileVersion" "19.9.2.11"
24 24  
25 25 VIAddVersionKey "ProductName" "hllapi"
26 26 VIAddVersionKey "FileDescription" "PW3270 HLLAPI Module"
... ... @@ -51,7 +51,7 @@ SubSection "hllapi" SecMain
51 51  
52 52 Section "Core" SecCore
53 53  
54   - SetRegView 64
  54 + SetRegView 32
55 55 ${DisableX64FSRedirection}
56 56  
57 57 # define the output path for this file
... ... @@ -107,7 +107,7 @@ Section "Uninstall"
107 107 DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\hllapi"
108 108 DeleteRegKey HKLM "Software\hllapi"
109 109  
110   - SetRegView 64
  110 + SetRegView 32
111 111 DeleteRegKey HKLM "Software\hllapi"
112 112  
113 113 SectionEnd
... ...