Download as
Browse Code »

Commit 43e943e80b9cd1438920f33b2cde42af7789b8c2

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

Fixing customized windows build.

Showing 1 changed file with 16 additions and 16 deletions   Show diff stats
win/pw3270.nsi.in
  Diff comments   View file @43e943e
@@ -3,17 +3,17 @@ @@ -3,17 +3,17 @@
3 !include "FileFunc.nsh" 3 !include "FileFunc.nsh"
4 !include "LogicLib.nsh" 4 !include "LogicLib.nsh"
5 5
6 -Name "@APPLICATION_NAME@"  
7 -Caption "@APPLICATION_NAME@ - @PACKAGE_DESCRIPTION@" 6 +Name "@PRODUCT_NAME@"
  7 +Caption "@PRODUCT_NAME@ - @PACKAGE_DESCRIPTION@"
8 !ifdef WITHGTK 8 !ifdef WITHGTK
9 -outfile "@APPLICATION_NAME@-@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@-gtk-@GTK_MODVERSION@-@host_cpu@.exe" 9 +outfile "@PRODUCT_NAME@-@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@-gtk-@GTK_MODVERSION@-@host_cpu@.exe"
10 !else 10 !else
11 -outfile "@APPLICATION_NAME@-@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@-requires-gtk-@GTK_MODVERSION@-@host_cpu@.exe" 11 +outfile "@PRODUCT_NAME@-@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@-requires-gtk-@GTK_MODVERSION@-@host_cpu@.exe"
12 !endif 12 !endif
13 13
14 XPStyle on 14 XPStyle on
15 15
16 -installDir "$@PROGRAMFILES@\@APPLICATION_NAME@" 16 +installDir "$@PROGRAMFILES@\@PRODUCT_NAME@"
17 17
18 #define the installer icon 18 #define the installer icon
19 !define MUI_ICON "@PACKAGE@.ico" 19 !define MUI_ICON "@PACKAGE@.ico"
@@ -32,7 +32,7 @@ VIFileVersion "@WIN32_VERSION@" @@ -32,7 +32,7 @@ VIFileVersion "@WIN32_VERSION@"
32 VIAddVersionKey "ProductVersion" "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.0" 32 VIAddVersionKey "ProductVersion" "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.0"
33 VIAddVersionKey "FileVersion" "@WIN32_VERSION@" 33 VIAddVersionKey "FileVersion" "@WIN32_VERSION@"
34 34
35 -VIAddVersionKey "ProductName" "@APPLICATION_NAME@" 35 +VIAddVersionKey "ProductName" "@PRODUCT_NAME@"
36 VIAddVersionKey "FileDescription" "@PACKAGE_DESCRIPTION@" 36 VIAddVersionKey "FileDescription" "@PACKAGE_DESCRIPTION@"
37 VIAddVersionKey "LegalCopyright" "GPL-2.0" 37 VIAddVersionKey "LegalCopyright" "GPL-2.0"
38 38
@@ -68,12 +68,12 @@ SubSection "@PACKAGE@" SecMain @@ -68,12 +68,12 @@ SubSection "@PACKAGE@" SecMain
68 setOutPath $INSTDIR 68 setOutPath $INSTDIR
69 SetShellVarContext all 69 SetShellVarContext all
70 70
71 - createShortCut "$SMPROGRAMS\@APPLICATION_NAME@.lnk" "$INSTDIR\@APPLICATION_NAME@.exe"  
72 - createShortCut "$DESKTOP\@APPLICATION_NAME@.lnk" "$INSTDIR\@APPLICATION_NAME@.exe" 71 + createShortCut "$SMPROGRAMS\@PRODUCT_NAME@.lnk" "$INSTDIR\@PRODUCT_NAME@.exe"
  72 + createShortCut "$DESKTOP\@PRODUCT_NAME@.lnk" "$INSTDIR\@PRODUCT_NAME@.exe"
73 73
74 # Binary files 74 # Binary files
75 - file "/oname=$INSTDIR\@APPLICATION_NAME@.exe" "@PACKAGE@.exe"  
76 - file "/oname=$INSTDIR\@APPLICATION_NAME@.ico" "@PACKAGE@.ico" 75 + file "/oname=$INSTDIR\@PRODUCT_NAME@.exe" "@PACKAGE@.exe"
  76 + file "/oname=$INSTDIR\@PRODUCT_NAME@.ico" "@PACKAGE@.ico"
77 file "/oname=$INSTDIR\lib3270.dll" "lib3270.dll" 77 file "/oname=$INSTDIR\lib3270.dll" "lib3270.dll"
78 file "/oname=$INSTDIR\libv3270.dll" "libv3270.dll" 78 file "/oname=$INSTDIR\libv3270.dll" "libv3270.dll"
79 file "/oname=$INSTDIR\@PACKAGE@.dll" "@PACKAGE@.dll" 79 file "/oname=$INSTDIR\@PACKAGE@.dll" "@PACKAGE@.dll"
@@ -81,7 +81,7 @@ SubSection "@PACKAGE@" SecMain @@ -81,7 +81,7 @@ SubSection "@PACKAGE@" SecMain
81 # Configuration files 81 # Configuration files
82 file "/oname=$INSTDIR\@PACKAGE@-logo.png" "@PACKAGE@-logo.png" 82 file "/oname=$INSTDIR\@PACKAGE@-logo.png" "@PACKAGE@-logo.png"
83 file "/oname=$INSTDIR\@PACKAGE@.png" "@PACKAGE@.png" 83 file "/oname=$INSTDIR\@PACKAGE@.png" "@PACKAGE@.png"
84 - file "/oname=$INSTDIR\colors.conf" "colors.conf" 84 + file "/oname=$INSTDIR\colors.conf" "@PRODUCT_NAME@\colors.conf"
85 85
86 # Documentation files 86 # Documentation files
87 file "/oname=$INSTDIR\AUTHORS" "AUTHORS" 87 file "/oname=$INSTDIR\AUTHORS" "AUTHORS"
@@ -114,9 +114,9 @@ SubSection "@PACKAGE@" SecMain @@ -114,9 +114,9 @@ SubSection "@PACKAGE@" SecMain
114 writeUninstaller $INSTDIR\uninstall.exe 114 writeUninstaller $INSTDIR\uninstall.exe
115 115
116 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ 116 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \
117 - "DisplayName" "@APPLICATION_NAME@ - @PACKAGE_DESCRIPTION@" 117 + "DisplayName" "@PRODUCT_NAME@ - @PACKAGE_DESCRIPTION@"
118 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ 118 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \
119 - "DisplayIcon" "$INSTDIR\@APPLICATION_NAME@.ico" 119 + "DisplayIcon" "$INSTDIR\@PRODUCT_NAME@.ico"
120 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ 120 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \
121 "DisplayVersion" "@PACKAGE_VERSION@" 121 "DisplayVersion" "@PACKAGE_VERSION@"
122 122
@@ -226,9 +226,9 @@ Section "Uninstall" @@ -226,9 +226,9 @@ Section "Uninstall"
226 SetShellVarContext all 226 SetShellVarContext all
227 227
228 # now delete installed files 228 # now delete installed files
229 - delete $INSTDIR\@APPLICATION_NAME@.exe  
230 - delete $SMPROGRAMS\@APPLICATION_NAME@.lnk  
231 - delete $DESKTOP\@APPLICATION_NAME@.lnk 229 + delete $INSTDIR\@PRODUCT_NAME@.exe
  230 + delete $SMPROGRAMS\@PRODUCT_NAME@.lnk
  231 + delete $DESKTOP\@PRODUCT_NAME@.lnk
232 232
233 RMDir /r "$INSTDIR\locale" 233 RMDir /r "$INSTDIR\locale"
234 RMDir /r "$INSTDIR\share" 234 RMDir /r "$INSTDIR\share"