Download as
Browse Code »

Commit d65de460508aacaa7a5351114307df1581461297

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

Fixing windows package.

Showing 2 changed files with 11 additions and 9 deletions   Show diff stats
win/pack.sh
  Diff comments   View file @d65de46
... ... @@ -433,6 +433,8 @@ makeInstaller()
433 433 do
434 434 makensis ${NSIS_ARGS} ${NSI}
435 435 if [ "$?" != "0" ]; then
  436 + echo makensis ${NSIS_ARGS} ${NSI}
  437 + /bin/bash
436 438 failed "Error building ${NSI}"
437 439 fi
438 440  
... ...
win/pw3270.nsi.in
  Diff comments   View file @d65de46
... ... @@ -79,8 +79,8 @@ SubSection "@PACKAGE@" SecMain
79 79 file "/oname=$INSTDIR\@PACKAGE@.dll" "@PACKAGE@.dll"
80 80  
81 81 # Configuration files
82   - file "/oname=$INSTDIR\@PACKAGE@-logo.png" "@PACKAGE@-logo.png"
83   - file "/oname=$INSTDIR\@PACKAGE@.png" "@PACKAGE@.png"
  82 + file "/oname=$INSTDIR\@PACKAGE@-logo.png" "@PRODUCT_NAME@\@PACKAGE@-logo.png"
  83 + file "/oname=$INSTDIR\@PACKAGE@.png" "@PRODUCT_NAME@\@PACKAGE@.png"
84 84 file "/oname=$INSTDIR\colors.conf" "@PRODUCT_NAME@\colors.conf"
85 85  
86 86 # Documentation files
... ... @@ -93,11 +93,11 @@ SubSection "@PACKAGE@" SecMain
93 93  
94 94 # UI definition files
95 95 CreateDirectory "$INSTDIR\ui"
96   - file "/oname=$INSTDIR\ui\00default.xml" "uiui\00default.xml"0default.xml"
  96 + file "/oname=$INSTDIR\ui\00default.xml" "@PRODUCT_NAME@\uiui\00default.xml"0default.xml"
97 97  
98 98 # Charset definition files
99 99 CreateDirectory "$INSTDIR\charsets"
100   - file "/oname=$INSTDIR\charsets\bracket.xml" "charsets\bracket.xml"
  100 + file "/oname=$INSTDIR\charsets\bracket.xml" "@PRODUCT_NAME@\charsets\bracket.xml"
101 101  
102 102 # Locale files
103 103 CreateDirectory "$INSTDIR\locale\pt_BR\LC_MESSAGES"
... ... @@ -152,7 +152,7 @@ SubSection "@PACKAGE@" SecMain
152 152 ${DisableX64FSRedirection}
153 153 CreateDirectory "$INSTDIR\plugins"
154 154  
155   - file "/oname=$INSTDIR\plugins\ipcserver.dll" "pw3270-plugins\ipcserver.dll"
  155 + file "/oname=$INSTDIR\plugins\ipcserver.dll" "@PRODUCT_NAME@-plugins\ipcserver.dll"
156 156  
157 157 sectionEnd
158 158 !endif
... ... @@ -196,19 +196,19 @@ SubSection "@PACKAGE@" SecMain
196 196 SubSection "Menus, Keypads & Toolbars" SecMenu
197 197  
198 198 Section "Keypad" KeypadMenu
199   - file "/oname=$INSTDIR\ui\10keypad.xml" "ui0keypad.xml"
  199 + file "/oname=$INSTDIR\ui\10keypad.xml" "@PRODUCT_NAME@\ui0keypad.xml"
200 200 sectionEnd
201 201  
202 202 Section "Functions" FunctionsMenu
203   - file "/oname=$INSTDIR\ui\10functions.xml" "ui0functions.xml"
  203 + file "/oname=$INSTDIR\ui\10functions.xml" "@PRODUCT_NAME@\ui0functions.xml"
204 204 sectionEnd
205 205  
206 206 Section /o "View trace Menu" TraceMenu
207   - file "/oname=$INSTDIR\ui\98trace.xml" "ui8trace.xml"
  207 + file "/oname=$INSTDIR\ui\98trace.xml" "@PRODUCT_NAME@\ui8trace.xml"
208 208 sectionEnd
209 209  
210 210 Section /o "Application debug" DBGMenu
211   - file "/oname=$INSTDIR\ui\99debug.xml" "ui9debug.xml"
  211 + file "/oname=$INSTDIR\ui\99debug.xml" "@PRODUCT_NAME@\ui9debug.xml"
212 212 sectionEnd
213 213  
214 214 SubSectionEnd
... ...