Download as
Browse Code »

Commit 8051e83b82bf5dce51516647729fe765739ad766

Authored by Perry Werneck
1 parent 03d34987
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Updating windows package.

Showing 1 changed file with 18 additions and 25 deletions   Show diff stats
win/pw3270.nsi.in
  Diff comments   View file @8051e83
@@ -21,7 +21,7 @@ installDir "$@PROGRAMFILES@\@PRODUCT_NAME@" @@ -21,7 +21,7 @@ installDir "$@PROGRAMFILES@\@PRODUCT_NAME@"
21 icon "@PACKAGE@.ico" 21 icon "@PACKAGE@.ico"
22 22
23 # Get installation folder from registry if available 23 # Get installation folder from registry if available
24 -InstallDirRegKey HKLM "Software\@PACKAGE@" "InstallLocation" 24 +InstallDirRegKey HKLM "Software\@PRODUCT_NAME@" "InstallLocation"
25 25
26 RequestExecutionLevel admin 26 RequestExecutionLevel admin
27 27
@@ -29,12 +29,13 @@ RequestExecutionLevel admin @@ -29,12 +29,13 @@ RequestExecutionLevel admin
29 VIProductVersion "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@" 29 VIProductVersion "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@"
30 VIFileVersion "@WIN32_VERSION@" 30 VIFileVersion "@WIN32_VERSION@"
31 31
32 -VIAddVersionKey "ProductVersion" "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@"  
33 -VIAddVersionKey "FileVersion" "@WIN32_VERSION@" 32 +VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@"
  33 +VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "@WIN32_VERSION@"
34 34
35 -VIAddVersionKey "ProductName" "@PRODUCT_NAME@"  
36 -VIAddVersionKey "FileDescription" "@PACKAGE_DESCRIPTION@"  
37 -VIAddVersionKey "LegalCopyright" "GPL-2.0" 35 +VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "@PRODUCT_NAME@"
  36 +VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "@PACKAGE_DESCRIPTION@"
  37 +VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "(C) 2017 Banco do Brasil S/A. All Rights Reserved"
  38 +# VIAddVersionKey /LANG=${LANG_ENGLISH} "PrivateBuild" ""
38 39
39 # Interface 40 # Interface
40 41
@@ -57,7 +58,7 @@ VIAddVersionKey "LegalCopyright" "GPL-2.0" @@ -57,7 +58,7 @@ VIAddVersionKey "LegalCopyright" "GPL-2.0"
57 !include Sections.nsh 58 !include Sections.nsh
58 59
59 # default section 60 # default section
60 -SubSection "@PACKAGE@" SecMain 61 +SubSection "@PRODUCT_NAME@" SecMain
61 62
62 Section "Core" SecCore 63 Section "Core" SecCore
63 64
@@ -103,35 +104,27 @@ SubSection "@PACKAGE@" SecMain @@ -103,35 +104,27 @@ SubSection "@PACKAGE@" SecMain
103 CreateDirectory "$INSTDIR\locale\pt_BR\LC_MESSAGES" 104 CreateDirectory "$INSTDIR\locale\pt_BR\LC_MESSAGES"
104 file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\@PACKAGE@.mo" "locale\pt_BR\LC_MESSAGES\@PACKAGE@.mo" 105 file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\@PACKAGE@.mo" "locale\pt_BR\LC_MESSAGES\@PACKAGE@.mo"
105 106
106 - # Save DataDir  
107 - SetRegView @WINARCH@  
108 - WriteRegStr HKLM "Software\@PACKAGE@" "datadir" "$INSTDIR"  
109 - WriteRegStr HKLM "Software\@PACKAGE@" "appName" "$INSTDIR\@PACKAGE@.exe"  
110 -  
111 # define uninstaller name 107 # define uninstaller name
112 SetRegView 32 108 SetRegView 32
113 109
114 writeUninstaller $INSTDIR\uninstall.exe 110 writeUninstaller $INSTDIR\uninstall.exe
115 111
116 - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ 112 + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PRODUCT_NAME@" \
117 "DisplayName" "@PRODUCT_NAME@ - @PACKAGE_DESCRIPTION@" 113 "DisplayName" "@PRODUCT_NAME@ - @PACKAGE_DESCRIPTION@"
118 - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ 114 + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PRODUCT_NAME@" \
119 "DisplayIcon" "$INSTDIR\@PRODUCT_NAME@.ico" 115 "DisplayIcon" "$INSTDIR\@PRODUCT_NAME@.ico"
120 - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ 116 + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PRODUCT_NAME@" \
121 "DisplayVersion" "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@" 117 "DisplayVersion" "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@"
122 118
123 - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ 119 + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PRODUCT_NAME@" \
124 "UninstallString" "$INSTDIR\uninstall.exe" 120 "UninstallString" "$INSTDIR\uninstall.exe"
125 - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ 121 + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PRODUCT_NAME@" \
126 "InstallLocation" "$INSTDIR" 122 "InstallLocation" "$INSTDIR"
127 - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ 123 + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PRODUCT_NAME@" \
128 "NoModify" "1" 124 "NoModify" "1"
129 - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ 125 + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PRODUCT_NAME@" \
130 "NoRepair" "1" 126 "NoRepair" "1"
131 127
132 - # Save instalation dir  
133 - WriteRegStr HKCU "Software\@PACKAGE@" "" $INSTDIR  
134 -  
135 sectionEnd 128 sectionEnd
136 129
137 !ifdef WITHCERTS 130 !ifdef WITHCERTS
@@ -249,11 +242,11 @@ Section "Uninstall" @@ -249,11 +242,11 @@ Section "Uninstall"
249 242
250 # Remove registry 243 # Remove registry
251 SetRegView 32 244 SetRegView 32
252 - DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@"  
253 - DeleteRegKey HKLM "Software\@PACKAGE@" 245 + DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PRODUCT_NAME@"
  246 + DeleteRegKey HKLM "Software\@PRODUCT_NAME@"
254 247
255 SetRegView @WINARCH@ 248 SetRegView @WINARCH@
256 - DeleteRegKey HKLM "Software\@PACKAGE@" 249 + DeleteRegKey HKLM "Software\@PRODUCT_NAME@"
257 250
258 # Delete System libraries 251 # Delete System libraries
259 !ifdef WITHHLLAPI 252 !ifdef WITHHLLAPI