Download as
Browse Code »

Commit 17264499996be0cec2e338372555623993b1d662

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

Ajustando detecção do runtime gtk

Showing 4 changed files with 65 additions and 20 deletions   Show diff stats
po/pt_BR.po
  Diff comments   View file @1726449
... ... @@ -5,7 +5,7 @@ msgid ""
5 5 msgstr ""
6 6 "Project-Id-Version: pw3270 5.0\n"
7 7 "Report-Msgid-Bugs-To: \n"
8   -"POT-Creation-Date: 2013-07-17 08:29-0300\n"
  8 +"POT-Creation-Date: 2013-07-17 09:44-0300\n"
9 9 "PO-Revision-Date: 2013-07-03 10:51-0300\n"
10 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 11 "Language-Team: Português <perry.werneck@gmail.com>\n"
... ...
pw3270-i686.nsi.in
  Diff comments   View file @1726449
... ... @@ -155,21 +155,26 @@ Section /o &quot;Software Development Kit&quot; SecSDK
155 155 CreateDirectory "$INSTDIR\sdk\include"
156 156 CreateDirectory "$INSTDIR\sdk\include\lib3270"
157 157 CreateDirectory "$INSTDIR\sdk\include\pw3270"
  158 + CreateDirectory "$INSTDIR\sdk\sample"
  159 + CreateDirectory "$INSTDIR\sdk\sample\classlib"
158 160  
159   - file "/oname=$INSTDIR\sdk\include\lib3270.h" "src\include\lib3270.h"
160   - file "/oname=$INSTDIR\sdk\include\pw3270.h" "src\include\pw3270.h"
161   - file "/oname=$INSTDIR\sdk\include\pw3270\v3270.h" "src\include\pw3270\v3270.h"
162   - file "/oname=$INSTDIR\sdk\include\pw3270\hllapi.h" "src\include\pw3270\hllapi.h"
  161 + setOutPath $INSTDIR\sdk\include
  162 + file "src\include\lib3270.h"
  163 + file "src\include\pw3270.h"
  164 + file "src\include\pw3270\v3270.h"
  165 + file "src\include\pw3270\hllapi.h"
163 166  
164   - file "/oname=$INSTDIR\sdk\include\lib3270\config.h" "src\include\lib3270\config.h"
165   - file "/oname=$INSTDIR\sdk\include\lib3270\rules.mak" "src\include\rules.mak"
  167 + setOutPath $INSTDIR\sdk\include\lib3270
  168 + file "src\include\lib3270\config.h"
  169 + file "src\include\rules.mak"
166 170  
167   - file "/oname=$INSTDIR\sdk\sample\Makefile" "src\sample\Makefile"
168   - file "/oname=$INSTDIR\sdk\sample\connect.c" "src\sample\connect.c"
  171 + setOutPath $INSTDIR\sdk\sample\connect
  172 + file "src\sample\Makefile"
  173 + file "src\sample\connect.c"
169 174  
170   - file "/oname=$INSTDIR\sdk\lib3270.def" ".bin\Release\lib3270.dll.@PACKAGE_VERSION@.def"
171   - file "/oname=$INSTDIR\sdk\pw3270.def" ".bin\Release\pw3270.dll.@PACKAGE_VERSION@.def"
172   - file "/oname=$INSTDIR\sdk\libhllapi.def" ".bin\Release\libhllapi.dll.def"
  175 + setOutPath $INSTDIR\sdk\sample\classlib
  176 + file "src\classlib\*.cc"
  177 + file "src\include\pw3270\class.h"
173 178  
174 179 SectionEnd
175 180  
... ... @@ -217,14 +222,39 @@ sectionEnd
217 222  
218 223 Function .onInit
219 224  
220   -IfFileExists $PROGRAMFILES\ooRexx\rexx.exe EnableRexx RexxSET
  225 +${if} ${FileExists} `$PROGRAMFILES\ooRexx\rexx.exe`
221 226  
222   -EnableRexx:
223 227 SectionGetFlags "${RexxPlugin}" $0
224 228 IntOp $0 $0 | ${SF_SELECTED}
225 229 SectionSetFlags "${RexxPlugin}" $0
226 230  
227   -RexxSET:
  231 +${EndIf}
  232 +
  233 +ReadRegStr $4 HKLM "Software\gtkwin\@GTK_MODVERSION@" "path"
  234 +
  235 +${if} $4 == ""
  236 +
  237 + SectionGetFlags "${SecGTK}" $0
  238 + IntOp $0 $0 | ${SF_SELECTED}
  239 + SectionSetFlags "${SecGTK}" $0
  240 +
  241 +${Else}
  242 +
  243 + ${if} ${FileExists} `$4\*.*`
  244 +
  245 + SectionGetFlags "${SecGTK}" $0
  246 + IntOp $0 $0 & ${SECTION_OFF}
  247 + SectionSetFlags "${SecGTK}" $0
  248 +
  249 + ${Else}
  250 +
  251 + SectionGetFlags "${SecGTK}" $0
  252 + IntOp $0 $0 | ${SF_SELECTED}
  253 + SectionSetFlags "${SecGTK}" $0
  254 +
  255 + ${EndIf}
  256 +
  257 +${EndIf}
228 258  
229 259 FunctionEnd
230 260  
... ...
pw3270-x86_64.nsi.in
  Diff comments   View file @1726449
... ... @@ -239,16 +239,31 @@ ${if} ${FileExists} `$PROGRAMFILES64\ooRexx\rexx.exe`
239 239  
240 240 ${EndIf}
241 241  
242   -ReadRegStr $4 HKLM "Software\gtk3win\@GTK_MODVERSION@" "path"
  242 +ReadRegStr $4 HKLM "Software\gtkwin\@GTK_MODVERSION@" "path"
243 243  
244   -${if} ${FileExists} `$4\*.*`
  244 +${if} $4 == ""
245 245  
246 246 SectionGetFlags "${SecGTK}" $0
247   - IntOp $0 $0 & ${SECTION_OFF}
  247 + IntOp $0 $0 | ${SF_SELECTED}
248 248 SectionSetFlags "${SecGTK}" $0
249 249  
250   -${EndIf}
  250 +${Else}
  251 +
  252 + ${if} ${FileExists} `$4\*.*`
  253 +
  254 + SectionGetFlags "${SecGTK}" $0
  255 + IntOp $0 $0 & ${SECTION_OFF}
  256 + SectionSetFlags "${SecGTK}" $0
251 257  
  258 + ${Else}
  259 +
  260 + SectionGetFlags "${SecGTK}" $0
  261 + IntOp $0 $0 | ${SF_SELECTED}
  262 + SectionSetFlags "${SecGTK}" $0
  263 +
  264 + ${EndIf}
  265 +
  266 +${EndIf}
252 267  
253 268 FunctionEnd
254 269  
... ...
src/include/pw3270/class.h
  Diff comments   View file @1726449
... ... @@ -18,7 +18,7 @@
18 18 * programa; se não, escreva para a Free Software Foundation, Inc., 59 Temple
19 19 * Place, Suite 330, Boston, MA, 02111-1307, USA
20 20 *
21   - * Este programa está nomeado como pw3270class.c e possui - linhas de código.
  21 + * Este programa está nomeado como class.h e possui - linhas de código.
22 22 *
23 23 * Contatos:
24 24 *
... ...