Download as
Browse Code »

Commit 5623112ad78a4428ff84f6cd1dd090095f670556

Authored by perry.werneck@gmail.com
1 parent 20351684
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Instalador windows 64 bits passa a detectar o gtk-runtime pré instalado

Showing 2 changed files with 31 additions and 12 deletions   Show diff stats
@@ -5,7 +5,7 @@ msgid "" @@ -5,7 +5,7 @@ msgid ""
5 msgstr "" 5 msgstr ""
6 "Project-Id-Version: pw3270 5.0\n" 6 "Project-Id-Version: pw3270 5.0\n"
7 "Report-Msgid-Bugs-To: \n" 7 "Report-Msgid-Bugs-To: \n"
8 -"POT-Creation-Date: 2013-07-11 09:37-0300\n" 8 +"POT-Creation-Date: 2013-07-17 08:29-0300\n"
9 "PO-Revision-Date: 2013-07-03 10:51-0300\n" 9 "PO-Revision-Date: 2013-07-03 10:51-0300\n"
10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n" 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 "Language-Team: Português <perry.werneck@gmail.com>\n" 11 "Language-Team: Português <perry.werneck@gmail.com>\n"
pw3270-x86_64.nsi.in
  Diff comments   View file @5623112
@@ -160,17 +160,26 @@ Section /o &quot;Software Development Kit&quot; SecSDK @@ -160,17 +160,26 @@ Section /o &quot;Software Development Kit&quot; SecSDK
160 CreateDirectory "$INSTDIR\sdk\include" 160 CreateDirectory "$INSTDIR\sdk\include"
161 CreateDirectory "$INSTDIR\sdk\include\lib3270" 161 CreateDirectory "$INSTDIR\sdk\include\lib3270"
162 CreateDirectory "$INSTDIR\sdk\include\pw3270" 162 CreateDirectory "$INSTDIR\sdk\include\pw3270"
  163 + CreateDirectory "$INSTDIR\sdk\sample"
  164 + CreateDirectory "$INSTDIR\sdk\sample\classlib"
163 165
164 - file "/oname=$INSTDIR\sdk\include\lib3270.h" "src\include\lib3270.h"  
165 - file "/oname=$INSTDIR\sdk\include\pw3270.h" "src\include\pw3270.h"  
166 - file "/oname=$INSTDIR\sdk\include\pw3270\v3270.h" "src\include\pw3270\v3270.h"  
167 - file "/oname=$INSTDIR\sdk\include\pw3270\hllapi.h" "src\include\pw3270\hllapi.h" 166 + setOutPath $INSTDIR\sdk\include
  167 + file "src\include\lib3270.h"
  168 + file "src\include\pw3270.h"
  169 + file "src\include\pw3270\v3270.h"
  170 + file "src\include\pw3270\hllapi.h"
168 171
169 - file "/oname=$INSTDIR\sdk\include\lib3270\config.h" "src\include\lib3270\config.h"  
170 - file "/oname=$INSTDIR\sdk\include\lib3270\rules.mak" "src\include\rules.mak" 172 + setOutPath $INSTDIR\sdk\include\lib3270
  173 + file "src\include\lib3270\config.h"
  174 + file "src\include\rules.mak"
171 175
172 - file "/oname=$INSTDIR\sdk\sample\Makefile" "src\sample\Makefile"  
173 - file "/oname=$INSTDIR\sdk\sample\connect.c" "src\sample\connect.c" 176 + setOutPath $INSTDIR\sdk\sample\connect
  177 + file "src\sample\Makefile"
  178 + file "src\sample\connect.c"
  179 +
  180 + setOutPath $INSTDIR\sdk\sample\classlib
  181 + file "src\classlib\*.cc"
  182 + file "src\include\pw3270\class.h"
174 183
175 SectionEnd 184 SectionEnd
176 185
@@ -220,15 +229,25 @@ sectionEnd @@ -220,15 +229,25 @@ sectionEnd
220 229
221 Function .onInit 230 Function .onInit
222 231
223 -IfFileExists $PROGRAMFILES64\ooRexx\rexx.exe EnableRexx RexxSET 232 +SetRegView 64
  233 +
  234 +${if} ${FileExists} `$PROGRAMFILES64\ooRexx\rexx.exe`
224 235
225 -EnableRexx:  
226 SectionGetFlags "${RexxPlugin}" $0 236 SectionGetFlags "${RexxPlugin}" $0
227 IntOp $0 $0 | ${SF_SELECTED} 237 IntOp $0 $0 | ${SF_SELECTED}
228 SectionSetFlags "${RexxPlugin}" $0 238 SectionSetFlags "${RexxPlugin}" $0
229 239
230 -RexxSET: 240 +${EndIf}
  241 +
  242 +ReadRegStr $4 HKLM "Software\gtk3win\@GTK_MODVERSION@" "path"
  243 +
  244 +${if} ${FileExists} `$4\*.*`
  245 +
  246 + SectionGetFlags "${SecGTK}" $0
  247 + IntOp $0 $0 & ${SECTION_OFF}
  248 + SectionSetFlags "${SecGTK}" $0
231 249
  250 +${EndIf}
232 251
233 252
234 FunctionEnd 253 FunctionEnd