Download as
Browse Code »

Commit 64fb14385b2a75180cd7ccf7280b68d5e417ab18

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

Iniciando implementação do empacotamento windows na versão 5

Showing 8 changed files with 320 additions and 41 deletions   Show diff stats
@@ -126,7 +126,7 @@ src/tools/%@EXEEXT@: src/tools/%.c @@ -126,7 +126,7 @@ src/tools/%@EXEEXT@: src/tools/%.c
126 126
127 all: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) locale filelist 127 all: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) locale filelist
128 128
129 -Release: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) 129 +Release: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) locale
130 130
131 $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Release/lib/@DLLPREFIX@3270@DLLEXT@ $(DEPENDS) 131 $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Release/lib/@DLLPREFIX@3270@DLLEXT@ $(DEPENDS)
132 @$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 ../../$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) 132 @$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 ../../$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
@@ -242,7 +242,7 @@ install-app: install-locale @@ -242,7 +242,7 @@ install-app: install-locale
242 install-lib: 242 install-lib:
243 @$(MAKE) BINRLS="../../.bin/Release/lib" -C src/lib3270 install 243 @$(MAKE) BINRLS="../../.bin/Release/lib" -C src/lib3270 install
244 244
245 -locale: $(foreach SRC, $(basename $(LANG_FILES)), $(SRC).po) 245 +locale: $(foreach MO, $(basename $(LANG_FILES)), $(BINDIR)/Release/$(localedir)/$(notdir $(MO))/LC_MESSAGES/$(PACKAGE_NAME).mo)
246 246
247 install-locale: $(foreach MO, $(basename $(LANG_FILES)), $(BINDIR)/Release/$(localedir)/$(notdir $(MO))/LC_MESSAGES/$(PACKAGE_NAME).mo) 247 install-locale: $(foreach MO, $(basename $(LANG_FILES)), $(BINDIR)/Release/$(localedir)/$(notdir $(MO))/LC_MESSAGES/$(PACKAGE_NAME).mo)
248 @echo -e $(foreach MO, $(notdir $(basename $(LANG_FILES))), mkdir -p $(DESTDIR)/$(localedir)/$(MO)/LC_MESSAGES\\n$(INSTALL_DATA) $(BINDIR)/Release/$(localedir)/$(MO)/LC_MESSAGES/$(PACKAGE_NAME).mo $(DESTDIR)/$(localedir)/$(MO)/LC_MESSAGES/$(PACKAGE_NAME).mo \\n ) | $(SHELL) 248 @echo -e $(foreach MO, $(notdir $(basename $(LANG_FILES))), mkdir -p $(DESTDIR)/$(localedir)/$(MO)/LC_MESSAGES\\n$(INSTALL_DATA) $(BINDIR)/Release/$(localedir)/$(MO)/LC_MESSAGES/$(PACKAGE_NAME).mo $(DESTDIR)/$(localedir)/$(MO)/LC_MESSAGES/$(PACKAGE_NAME).mo \\n ) | $(SHELL)
1 #!/bin/bash 1 #!/bin/bash
2 2
  3 +APPLEVEL="0"
  4 +
3 test -n "$srcdir" || srcdir=`dirname "$0"` 5 test -n "$srcdir" || srcdir=`dirname "$0"`
4 test -n "$srcdir" || srcdir=. 6 test -n "$srcdir" || srcdir=.
5 7
@@ -44,9 +46,11 @@ fi @@ -44,9 +46,11 @@ fi
44 46
45 echo "PACKAGE_REVISION=$PACKAGE_REVISION" > $srcdir/revision 47 echo "PACKAGE_REVISION=$PACKAGE_REVISION" > $srcdir/revision
46 echo "PACKAGE_SOURCE=$PACKAGE_SOURCE" >> $srcdir/revision 48 echo "PACKAGE_SOURCE=$PACKAGE_SOURCE" >> $srcdir/revision
  49 +echo "PACKAGE_LEVEL=$APPLEVEL" >> $srcdir/revision
47 50
48 echo "m4_define([SVN_REVISION], $PACKAGE_REVISION)" > $srcdir/revision.m4 51 echo "m4_define([SVN_REVISION], $PACKAGE_REVISION)" > $srcdir/revision.m4
49 echo "m4_define([SVN_URL], $PACKAGE_SOURCE)" >> $srcdir/revision.m4 52 echo "m4_define([SVN_URL], $PACKAGE_SOURCE)" >> $srcdir/revision.m4
  53 +echo "m4_define([APP_LEVEL], $APPLEVEL)" >> $srcdir/revision.m4
50 54
51 aclocal 55 aclocal
52 if test $? != 0 ; then 56 if test $? != 0 ; then
@@ -68,6 +68,9 @@ AC_SUBST(REXXC) @@ -68,6 +68,9 @@ AC_SUBST(REXXC)
68 AC_PATH_TOOL([VALGRIND], [valgrind], [no]) 68 AC_PATH_TOOL([VALGRIND], [valgrind], [no])
69 AC_PATH_TOOL([REXXCONFIG], [oorexx-config], [no]) 69 AC_PATH_TOOL([REXXCONFIG], [oorexx-config], [no])
70 70
  71 +AC_PATH_TOOL([MAKENSIS], [makensis], [no])
  72 +AC_PATH_TOOL([WINDRES], [windres], [no])
  73 +
71 AC_CHECK_PROGS(GZIP,[gzip],no) 74 AC_CHECK_PROGS(GZIP,[gzip],no)
72 export GZIP; 75 export GZIP;
73 if test $GZIP = "no" ; then 76 if test $GZIP = "no" ; then
@@ -87,6 +90,9 @@ AC_SUBST(PACKAGE_REVISION,"SVN_REVISION") @@ -87,6 +90,9 @@ AC_SUBST(PACKAGE_REVISION,"SVN_REVISION")
87 AC_DEFINE(PACKAGE_SOURCE,"SVN_URL") 90 AC_DEFINE(PACKAGE_SOURCE,"SVN_URL")
88 AC_SUBST(PACKAGE_SOURCE,"SVN_URL") 91 AC_SUBST(PACKAGE_SOURCE,"SVN_URL")
89 92
  93 +AC_DEFINE(PACKAGE_LEVEL,"APP_LEVEL")
  94 +AC_SUBST(PACKAGE_LEVEL,"APP_LEVEL")
  95 +
90 #--[ Set host based options ]--------------------------------------------------------------------------------------------------------------------------------- 96 #--[ Set host based options ]---------------------------------------------------------------------------------------------------------------------------------
91 97
92 DLL_CFLAGS="" 98 DLL_CFLAGS=""
@@ -275,6 +281,7 @@ AC_CONFIG_FILES([ @@ -275,6 +281,7 @@ AC_CONFIG_FILES([
275 lib3270.pc 281 lib3270.pc
276 pw3270.pc 282 pw3270.pc
277 pw3270.spec 283 pw3270.spec
  284 + pw3270.nsi
278 src/include/rules.mak 285 src/include/rules.mak
279 src/lib3270/Makefile 286 src/lib3270/Makefile
280 src/lib3270/mkversion.sh 287 src/lib3270/mkversion.sh
@@ -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: 2012-07-20 09:28-0300\n" 8 +"POT-Creation-Date: 2012-07-30 09:30-0300\n"
9 "PO-Revision-Date: 2012-06-21 11:08-0300\n" 9 "PO-Revision-Date: 2012-06-21 11:08-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 do Brasil <>\n" 11 "Language-Team: Português do Brasil <>\n"
@@ -23,7 +23,7 @@ msgstr &quot;&quot; @@ -23,7 +23,7 @@ msgstr &quot;&quot;
23 msgid "%s: unknown family %d" 23 msgid "%s: unknown family %d"
24 msgstr "%s: Familia %d é inválida" 24 msgstr "%s: Familia %d é inválida"
25 25
26 -#: telnet.c:1083 26 +#: telnet.c:1092
27 #, c-format 27 #, c-format
28 msgid "%s:%d" 28 msgid "%s:%d"
29 msgstr "%s:%d" 29 msgstr "%s:%d"
@@ -36,7 +36,7 @@ msgstr &quot;Erro 3270&quot; @@ -36,7 +36,7 @@ msgstr &quot;Erro 3270&quot;
36 msgid "3270 Warning" 36 msgid "3270 Warning"
37 msgstr "Alerta 3270" 37 msgstr "Alerta 3270"
38 38
39 -#: telnet.c:3312 39 +#: telnet.c:3345
40 #, c-format 40 #, c-format
41 msgid "" 41 msgid ""
42 "<b>Connection state:</b> %s\n" 42 "<b>Connection state:</b> %s\n"
@@ -61,7 +61,7 @@ msgstr &quot;Aviso sonoro&quot; @@ -61,7 +61,7 @@ msgstr &quot;Aviso sonoro&quot;
61 msgid "Auto-Reconnect" 61 msgid "Auto-Reconnect"
62 msgstr "Reconectar automaticamente" 62 msgstr "Reconectar automaticamente"
63 63
64 -#: telnet.c:418 64 +#: telnet.c:414
65 msgid "Bad winsock version" 65 msgid "Bad winsock version"
66 msgstr "Versão winsock inválida" 66 msgstr "Versão winsock inválida"
67 67
@@ -77,11 +77,11 @@ msgstr &quot;Cursor piscante&quot; @@ -77,11 +77,11 @@ msgstr &quot;Cursor piscante&quot;
77 msgid "Bold" 77 msgid "Bold"
78 msgstr "Negrito" 78 msgstr "Negrito"
79 79
80 -#: telnet.c:2037 80 +#: telnet.c:2071
81 msgid "Broken pipe" 81 msgid "Broken pipe"
82 msgstr "Broken pipe" 82 msgstr "Broken pipe"
83 83
84 -#: telnet.c:700 84 +#: telnet.c:698
85 #, c-format 85 #, c-format
86 msgid "Can't connect to %s:%d" 86 msgid "Can't connect to %s:%d"
87 msgstr "Não foi possível conectar a %s:%d" 87 msgstr "Não foi possível conectar a %s:%d"
@@ -98,11 +98,11 @@ msgstr &quot;Não foi possível obter o tamanho do arquivo&quot; @@ -98,11 +98,11 @@ msgstr &quot;Não foi possível obter o tamanho do arquivo&quot;
98 msgid "Can't open local file" 98 msgid "Can't open local file"
99 msgstr "Não foi possível abrir arquivo local" 99 msgstr "Não foi possível abrir arquivo local"
100 100
101 -#: telnet.c:839 101 +#: telnet.c:837
102 msgid "Can't set SSL socket file descriptor" 102 msgid "Can't set SSL socket file descriptor"
103 msgstr "Não foi possível definir o descritor de socket SSL" 103 msgstr "Não foi possível definir o descritor de socket SSL"
104 104
105 -#: telnet.c:419 105 +#: telnet.c:415
106 #, c-format 106 #, c-format
107 msgid "Can't use winsock version %d.%d" 107 msgid "Can't use winsock version %d.%d"
108 msgstr "Não é possível usar a Winsock versão %d.%d" 108 msgstr "Não é possível usar a Winsock versão %d.%d"
@@ -111,7 +111,7 @@ msgstr &quot;Não é possível usar a Winsock versão %d.%d&quot; @@ -111,7 +111,7 @@ msgstr &quot;Não é possível usar a Winsock versão %d.%d&quot;
111 msgid "Cancelled by user" 111 msgid "Cancelled by user"
112 msgstr "Cancelado pelo usuário" 112 msgstr "Cancelado pelo usuário"
113 113
114 -#: telnet.c:734 114 +#: telnet.c:732
115 msgid "Cannot create socket handle" 115 msgid "Cannot create socket handle"
116 msgstr "Não foi possível criar um manipulador de socket" 116 msgstr "Não foi possível criar um manipulador de socket"
117 117
@@ -136,11 +136,11 @@ msgstr &quot;Completo&quot; @@ -136,11 +136,11 @@ msgstr &quot;Completo&quot;
136 msgid "Connect on startup" 136 msgid "Connect on startup"
137 msgstr "Conectar ao iniciar" 137 msgstr "Conectar ao iniciar"
138 138
139 -#: telnet.c:839 telnet.c:857 139 +#: telnet.c:837 telnet.c:855
140 msgid "Connection failed" 140 msgid "Connection failed"
141 msgstr "Conexão falhou" 141 msgstr "Conexão falhou"
142 142
143 -#: telnet.c:2041 143 +#: telnet.c:2075
144 #, fuzzy 144 #, fuzzy
145 msgid "Connection reset by peer" 145 msgid "Connection reset by peer"
146 msgstr "Ação falhou" 146 msgstr "Ação falhou"
@@ -177,7 +177,7 @@ msgstr &quot;Debug&quot; @@ -177,7 +177,7 @@ msgstr &quot;Debug&quot;
177 msgid "Debug window updates" 177 msgid "Debug window updates"
178 msgstr "Mostrar atualizações de janela" 178 msgstr "Mostrar atualizações de janela"
179 179
180 -#: telnet.c:1692 180 +#: telnet.c:1726
181 msgid "Device type rejected" 181 msgid "Device type rejected"
182 msgstr "Tipo de dispositivo rejeitado" 182 msgstr "Tipo de dispositivo rejeitado"
183 183
@@ -185,7 +185,7 @@ msgstr &quot;Tipo de dispositivo rejeitado&quot; @@ -185,7 +185,7 @@ msgstr &quot;Tipo de dispositivo rejeitado&quot;
185 msgid "Disconnected from host" 185 msgid "Disconnected from host"
186 msgstr "Desconectado do servidor" 186 msgstr "Desconectado do servidor"
187 187
188 -#: telnet.c:1285 188 +#: telnet.c:1306
189 msgid "EOR received when not in 3270 mode, ignored." 189 msgid "EOR received when not in 3270 mode, ignored."
190 msgstr "EOR recebido fora do modo 3270, ignorado." 190 msgstr "EOR recebido fora do modo 3270, ignorado."
191 191
@@ -257,11 +257,11 @@ msgstr &quot;Ajuda&quot; @@ -257,11 +257,11 @@ msgstr &quot;Ajuda&quot;
257 msgid "Host disconnected, transfer cancelled" 257 msgid "Host disconnected, transfer cancelled"
258 msgstr "Servidor desconectou, transferência cancelada" 258 msgstr "Servidor desconectou, transferência cancelada"
259 259
260 -#: telnet.c:1680 260 +#: telnet.c:1714
261 msgid "Host rejected device type or request type" 261 msgid "Host rejected device type or request type"
262 msgstr "Host rejected device type or request type" 262 msgstr "Host rejected device type or request type"
263 263
264 -#: telnet.c:1690 264 +#: telnet.c:1724
265 msgid "Host rejected resource(s)" 265 msgid "Host rejected resource(s)"
266 msgstr "Host rejected resource(s)" 266 msgstr "Host rejected resource(s)"
267 267
@@ -310,11 +310,11 @@ msgstr &quot;Múltiplos nomes de porta&quot; @@ -310,11 +310,11 @@ msgstr &quot;Múltiplos nomes de porta&quot;
310 msgid "Must specify port for telnet proxy" 310 msgid "Must specify port for telnet proxy"
311 msgstr "Proxy telnet precisa de porta" 311 msgstr "Proxy telnet precisa de porta"
312 312
313 -#: telnet.c:448 telnet.c:704 313 +#: telnet.c:444 telnet.c:702
314 msgid "Network error" 314 msgid "Network error"
315 msgstr "Erro de rede" 315 msgstr "Erro de rede"
316 316
317 -#: telnet.c:406 telnet.c:417 telnet.c:733 telnet.c:744 317 +#: telnet.c:402 telnet.c:413 telnet.c:731 telnet.c:742
318 msgid "Network startup error" 318 msgid "Network startup error"
319 msgstr "Erro ao iniciar a rede" 319 msgstr "Erro ao iniciar a rede"
320 320
@@ -383,15 +383,15 @@ msgstr &quot;Reselecionar&quot; @@ -383,15 +383,15 @@ msgstr &quot;Reselecionar&quot;
383 msgid "Return" 383 msgid "Return"
384 msgstr "Return" 384 msgstr "Return"
385 385
386 -#: telnet.c:3310 386 +#: telnet.c:3343
387 msgid "SSL Connect error" 387 msgid "SSL Connect error"
388 msgstr "Erro na conexão SSL" 388 msgstr "Erro na conexão SSL"
389 389
390 -#: telnet.c:1066 390 +#: telnet.c:1075
391 msgid "SSL Error" 391 msgid "SSL Error"
392 msgstr "Erro SSL" 392 msgstr "Erro SSL"
393 393
394 -#: telnet.c:1066 394 +#: telnet.c:1075
395 msgid "SSL Read error" 395 msgid "SSL Read error"
396 msgstr "Erro de leitura SSL" 396 msgstr "Erro de leitura SSL"
397 397
@@ -399,11 +399,11 @@ msgstr &quot;Erro de leitura SSL&quot; @@ -399,11 +399,11 @@ msgstr &quot;Erro de leitura SSL&quot;
399 msgid "SSL error" 399 msgid "SSL error"
400 msgstr "Erro SSL" 400 msgstr "Erro SSL"
401 401
402 -#: telnet.c:857 402 +#: telnet.c:855
403 msgid "SSL negotiation failed" 403 msgid "SSL negotiation failed"
404 msgstr "Negociação SSL falhou" 404 msgstr "Negociação SSL falhou"
405 405
406 -#: telnet.c:2027 406 +#: telnet.c:2061
407 #, fuzzy, c-format 407 #, fuzzy, c-format
408 msgid "" 408 msgid ""
409 "SSL_write:\n" 409 "SSL_write:\n"
@@ -474,11 +474,11 @@ msgstr &quot;Mostrar padrão de teste&quot; @@ -474,11 +474,11 @@ msgstr &quot;Mostrar padrão de teste&quot;
474 msgid "Smart paste" 474 msgid "Smart paste"
475 msgstr "Colar inteligente" 475 msgstr "Colar inteligente"
476 476
477 -#: telnet.c:1087 477 +#: telnet.c:1096
478 msgid "Socket read error" 478 msgid "Socket read error"
479 msgstr "Erro ao ler dados da rede" 479 msgstr "Erro ao ler dados da rede"
480 480
481 -#: telnet.c:2048 481 +#: telnet.c:2082
482 msgid "Socket write error" 482 msgid "Socket write error"
483 msgstr "Erro ao enviar dados para a rede" 483 msgstr "Erro ao enviar dados para a rede"
484 484
@@ -544,7 +544,7 @@ msgstr &quot;Não foi possível enviar a requisição de transferência de arquivo&quot; @@ -544,7 +544,7 @@ msgstr &quot;Não foi possível enviar a requisição de transferência de arquivo&quot;
544 msgid "Unexpected error" 544 msgid "Unexpected error"
545 msgstr "Erro inesperado" 545 msgstr "Erro inesperado"
546 546
547 -#: kybd.c:329 547 +#: kybd.c:339
548 #, c-format 548 #, c-format
549 msgid "Unexpected type %d in typeahead queue" 549 msgid "Unexpected type %d in typeahead queue"
550 msgstr "Tipo inesperado %d na fila de teclado" 550 msgstr "Tipo inesperado %d na fila de teclado"
@@ -553,12 +553,12 @@ msgstr &quot;Tipo inesperado %d na fila de teclado&quot; @@ -553,12 +553,12 @@ msgstr &quot;Tipo inesperado %d na fila de teclado&quot;
553 msgid "Unknown FT control code from host" 553 msgid "Unknown FT control code from host"
554 msgstr "Servidor enviou código de controle FT desconhecido" 554 msgstr "Servidor enviou código de controle FT desconhecido"
555 555
556 -#: kybd.c:2844 556 +#: kybd.c:2339
557 #, c-format 557 #, c-format
558 msgid "Unknown PA key %d" 558 msgid "Unknown PA key %d"
559 msgstr "PA %d desconhecida" 559 msgstr "PA %d desconhecida"
560 560
561 -#: kybd.c:2856 561 +#: kybd.c:2351
562 #, c-format 562 #, c-format
563 msgid "Unknown PF key %d" 563 msgid "Unknown PF key %d"
564 msgstr "PF %d desconhecida" 564 msgstr "PF %d desconhecida"
@@ -576,19 +576,19 @@ msgstr &quot;&quot; @@ -576,19 +576,19 @@ msgstr &quot;&quot;
576 "Servidor desconhecido:\n" 576 "Servidor desconhecido:\n"
577 "%s" 577 "%s"
578 578
579 -#: telnet.c:577 579 +#: telnet.c:573
580 #, c-format 580 #, c-format
581 msgid "Unknown passthru host: %s" 581 msgid "Unknown passthru host: %s"
582 msgstr "" 582 msgstr ""
583 "Servidor \"passthru\" desconhecido:\n" 583 "Servidor \"passthru\" desconhecido:\n"
584 "%s" 584 "%s"
585 585
586 -#: telnet.c:606 resolver.c:147 586 +#: telnet.c:602 resolver.c:147
587 #, c-format 587 #, c-format
588 msgid "Unknown port number or service: %s" 588 msgid "Unknown port number or service: %s"
589 msgstr "Número de porta ou serviço desconhecido: %s" 589 msgstr "Número de porta ou serviço desconhecido: %s"
590 590
591 -#: telnet.c:562 591 +#: telnet.c:558
592 msgid "Unsupported passthru host session" 592 msgid "Unsupported passthru host session"
593 msgstr "Unsupported passthru host session" 593 msgstr "Unsupported passthru host session"
594 594
@@ -604,11 +604,11 @@ msgstr &quot;Usar teclas +/- para navegar por campos&quot; @@ -604,11 +604,11 @@ msgstr &quot;Usar teclas +/- para navegar por campos&quot;
604 msgid "View Field Delimiters" 604 msgid "View Field Delimiters"
605 msgstr "View Field Delimiters" 605 msgstr "View Field Delimiters"
606 606
607 -#: telnet.c:745 607 +#: telnet.c:743
608 msgid "WSAEventSelect failed" 608 msgid "WSAEventSelect failed"
609 msgstr "WSAEventSelect falhou" 609 msgstr "WSAEventSelect falhou"
610 610
611 -#: telnet.c:407 611 +#: telnet.c:403
612 msgid "WSAStartup failed" 612 msgid "WSAStartup failed"
613 msgstr "WSAStartup falhou" 613 msgstr "WSAStartup falhou"
614 614
@@ -652,26 +652,26 @@ msgstr &quot;Opções&quot; @@ -652,26 +652,26 @@ msgstr &quot;Opções&quot;
652 msgid "_View" 652 msgid "_View"
653 msgstr "_Exibir" 653 msgstr "_Exibir"
654 654
655 -#: telnet.c:3175 telnet.c:3186 655 +#: telnet.c:3208 telnet.c:3219
656 #, c-format 656 #, c-format
657 msgid "fcntl(%s)" 657 msgid "fcntl(%s)"
658 msgstr "fcntl(%s)" 658 msgstr "fcntl(%s)"
659 659
660 -#: telnet.c:3165 660 +#: telnet.c:3198
661 #, c-format 661 #, c-format
662 msgid "ioctl(%s)" 662 msgid "ioctl(%s)"
663 msgstr "ioctl(%s)" 663 msgstr "ioctl(%s)"
664 664
665 -#: telnet.c:655 telnet.c:661 telnet.c:668 665 +#: telnet.c:653 telnet.c:659 telnet.c:666
666 #, c-format 666 #, c-format
667 msgid "setsockopt(%s)" 667 msgid "setsockopt(%s)"
668 msgstr "setsockopt(%s)" 668 msgstr "setsockopt(%s)"
669 669
670 -#: telnet.c:648 670 +#: telnet.c:646
671 msgid "socket" 671 msgid "socket"
672 msgstr "socket" 672 msgstr "socket"
673 673
674 -#: telnet.c:1062 674 +#: telnet.c:1071
675 msgid "unknown error" 675 msgid "unknown error"
676 msgstr "Erro desconhecido" 676 msgstr "Erro desconhecido"
677 677
pw3270.nsi.in 0 → 100644
  Diff comments   View file @64fb143
@@ -0,0 +1,268 @@ @@ -0,0 +1,268 @@
  1 +!include "MUI2.nsh"
  2 +
  3 +Name "@PACKAGE@"
  4 +Caption "@PACKAGE@ - 3270 Emulator for windows/gtk"
  5 +outfile "@PACKAGE@-@PACKAGE_VERSION@.@PACKAGE_LEVEL@-@host_cpu@-install.exe"
  6 +XPStyle on
  7 +
  8 +# define the directory to install to
  9 +installDir $PROGRAMFILES\@PACKAGE@
  10 +
  11 +#define the installer icon
  12 +!define MUI_ICON "src\pw3270\@PACKAGE@.ico"
  13 +!define MUI_UNICON "src\pw3270\@PACKAGE@.ico"
  14 +icon "src\pw3270\@PACKAGE@.ico"
  15 +
  16 +# Get installation folder from registry if available
  17 +InstallDirRegKey HKCU "Software\@PACKAGE@" "datadir"
  18 +
  19 +RequestExecutionLevel admin
  20 +
  21 +# Properties
  22 +VIProductVersion "@PACKAGE_VERSION@.@PACKAGE_LEVEL@.0"
  23 +VIAddVersionKey "ProductName" "@PACKAGE@"
  24 +VIAddVersionKey "FileDescription" "3270 Emulator for windows/gtk"
  25 +VIAddVersionKey "FileVersion" "@PACKAGE_REVISION@"
  26 +VIAddVersionKey "LegalCopyright" "GPL"
  27 +
  28 +# Interface
  29 +
  30 +!define MUI_ABORTWARNING
  31 +# !insertmacro MUI_PAGE_WELCOME
  32 +!insertmacro MUI_PAGE_LICENSE "LICENSE"
  33 +!insertmacro MUI_PAGE_COMPONENTS
  34 +!insertmacro MUI_PAGE_DIRECTORY
  35 +!insertmacro MUI_PAGE_INSTFILES
  36 +
  37 +# !insertmacro MUI_UNPAGE_WELCOME
  38 +!insertmacro MUI_UNPAGE_CONFIRM
  39 +!insertmacro MUI_UNPAGE_INSTFILES
  40 +# !insertmacro MUI_UNPAGE_FINISH
  41 +
  42 +# Languages
  43 +!insertmacro MUI_LANGUAGE "English"
  44 +
  45 +# Section scripts
  46 +!include Sections.nsh
  47 +
  48 +# default section
  49 +SubSection "@PACKAGE@" SecMain
  50 +
  51 + Section "Core" SecCore
  52 +
  53 + # define the output path for this file
  54 + setOutPath $INSTDIR
  55 + SetShellVarContext all
  56 +
  57 + createShortCut "$SMPROGRAMS\@PACKAGE@.lnk" "$INSTDIR\@PACKAGE@.exe"
  58 + createShortCut "$DESKTOP\@PACKAGE@.lnk" "$INSTDIR\@PACKAGE@.exe"
  59 +
  60 + # Binary files
  61 + file "/oname=$INSTDIR\@PACKAGE@.exe" ".bin\Release\@PACKAGE@.exe"
  62 + file "/oname=$INSTDIR\@PACKAGE@.ico" "src\pw3270\@PACKAGE@.ico"
  63 +
  64 + # Configuration files
  65 + file "/oname=$INSTDIR\@PACKAGE@.png" "src/pw3270/@PACKAGE@.png"
  66 + file "/oname=$INSTDIR\colors.conf" "colors.conf"
  67 +
  68 + # Documentation files
  69 + file "/oname=$INSTDIR\ChangeLog" "ChangeLog"
  70 + file "/oname=$INSTDIR\AUTHORS" "AUTHORS"
  71 + file "/oname=$INSTDIR\LICENSE" "LICENSE"
  72 +
  73 + # UI definition files
  74 + CreateDirectory "$INSTDIR\ui"
  75 +
  76 + file "/oname=$INSTDIR\ui\00default.xml" "ui\00default.xml"
  77 +
  78 + # Locale files
  79 + CreateDirectory "$INSTDIR\@localedir@\pt_BR\LC_MESSAGES"
  80 + file "/oname=$INSTDIR\@localedir@\pt_BR\LC_MESSAGES\@PACKAGE@.mo" ".bin\Release\usr\local\share\locale\pt_BR\LC_MESSAGES\@PACKAGE@.mo"
  81 +
  82 + # define uninstaller name
  83 + writeUninstaller $INSTDIR\uninstall.exe
  84 +
  85 + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \
  86 + "DisplayName" "@PACKAGE@ - 3270 emulator for windows/gtk"
  87 + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \
  88 + "DisplayIcon" "$INSTDIR\@PACKAGE@.ico"
  89 + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \
  90 + "DisplayVersion" "@PACKAGE_VERSION@ (Rev: @PACKAGE_REVISION@)"
  91 +
  92 +
  93 + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \
  94 + "UninstallString" "$INSTDIR\uninstall.exe"
  95 + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \
  96 + "InstallLocation" "$INSTDIR"
  97 + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \
  98 + "NoModify" "1"
  99 + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \
  100 + "NoRepair" "1"
  101 +
  102 + # Save instalation dir
  103 + WriteRegStr HKCU "Software\@PACKAGE@" "" $INSTDIR
  104 +
  105 + # Main library
  106 + file "/oname=$SYSDIR\lib3270.dll" ".bin\Release\lib\lib3270.dll"
  107 + file "/oname=$SYSDIR\libpw3270.dll" ".bin\Release\lib\libpw3270.dll"
  108 +
  109 + sectionEnd
  110 +
  111 +#
  112 +# SubSection "Plugins" SecPLugin
  113 +#
  114 +# Section /o "Rexx" RexxPlugin
  115 +# setOutPath $INSTDIR
  116 +#
  117 +# CreateDirectory "$INSTDIR"
  118 +# file src\plugins\rexx\rx3270.cls
  119 +#
  120 +# CreateDirectory "$INSTDIR\plugins"
  121 +# file "/oname=$INSTDIR\plugins\rx3270.dll" ".bin\Release\plugins\rx3270.dll"
  122 +# file "/oname=$INSTDIR\ui\rexx.xml" ui\rexx.xml
  123 +#
  124 +# sectionEnd
  125 +#
  126 +SubSectionEnd
  127 +
  128 +#
  129 +#Section /o "GTK+ Runtime" SecGTK
  130 +#
  131 +# setOutPath $INSTDIR
  132 +# file /r ".bin\gtkruntime\*.*"
  133 +#
  134 +#SectionEnd
  135 +#
  136 +
  137 +Section /o "Software Development Kit" SecSDK
  138 +
  139 + CreateDirectory "$INSTDIR\sdk"
  140 + CreateDirectory "$INSTDIR\sdk\include"
  141 + CreateDirectory "$INSTDIR\sdk\include\lib3270"
  142 +
  143 + file "/oname=$INSTDIR\sdk\include\lib3270.h" "src\include\lib3270.h"
  144 + file "/oname=$INSTDIR\sdk\include\lib3270\config.h" "src\include\lib3270\config.h"
  145 + file "/oname=$INSTDIR\sdk\include\lib3270\rules.mak" "src\include\rules.mak"
  146 +
  147 + file "/oname=$INSTDIR\sdk\include\lib3270\config.h" "src\include\lib3270\config.h"
  148 + file "/oname=$INSTDIR\sdk\include\lib3270\macros.h" "src\include\lib3270\macros.h"
  149 + file "/oname=$INSTDIR\sdk\include\lib3270\selection.h" "src\include\lib3270\selection.h"
  150 + file "/oname=$INSTDIR\sdk\include\lib3270\v3270.h" "src\include\lib3270\v3270.h"
  151 + file "/oname=$INSTDIR\sdk\include\lib3270\actions.h" "src\include\lib3270\actions.h"
  152 + file "/oname=$INSTDIR\sdk\include\lib3270\html.h" "src\include\lib3270\html.h"
  153 + file "/oname=$INSTDIR\sdk\include\lib3270\log.h" "src\include\lib3270\log.h"
  154 + file "/oname=$INSTDIR\sdk\include\lib3270\popup.h" "src\include\lib3270\popup.h"
  155 + file "/oname=$INSTDIR\sdk\include\lib3270\session.h" "src\include\lib3270\session.h"
  156 + file "/oname=$INSTDIR\sdk\include\lib3270\trace.h" "src\include\lib3270\trace.h"
  157 +
  158 +SectionEnd
  159 +
  160 +# create a section to define what the uninstaller does.
  161 +# the section will always be named "Uninstall"
  162 +section "Uninstall"
  163 +
  164 + # Always delete uninstaller first
  165 + delete $INSTDIR\uninstaller.exe
  166 +
  167 + # Set SMPROGRAMS and DESKTOP path
  168 + SetShellVarContext all
  169 +
  170 + # now delete installed files
  171 + delete $INSTDIR\@PACKAGE@.exe
  172 +
  173 + delete $SMPROGRAMS\@PACKAGE@.lnk
  174 + delete $DESKTOP\@PACKAGE@.lnk
  175 +
  176 + RMDir /r "$INSTDIR\locale"
  177 + RMDir /r "$INSTDIR\share"
  178 + RMDir /r "$INSTDIR\etc"
  179 + RMDir /r "$INSTDIR\plugins"
  180 + RMDir /r "$INSTDIR\sdk"
  181 + RMDir /r "$INSTDIR\gtk2-runtime"
  182 +
  183 + # Delete all files
  184 + delete "$INSTDIR\*.dll"
  185 +
  186 + # Remove registry
  187 + DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@"
  188 +
  189 + # Delete System libraries
  190 + delete $SYSDIR\lib3270.dll
  191 + delete $SYSDIR\libpw3270.dll
  192 +
  193 + # Delete extension libraries
  194 +# delete $PROGRAMFILES\ooRexx\rx3270.dll
  195 +
  196 + RMDir /r "$INSTDIR"
  197 +
  198 +sectionEnd
  199 +
  200 +Function .onInit
  201 +
  202 +#FindProcDLL::FindProc "@PACKAGE@.exe"
  203 +#IntCmp $R0 1 0 notRunning
  204 +#
  205 +# MessageBox MB_OK|MB_ICONEXCLAMATION "@PACKAGE@ is running. Please close it first" /SD IDOK
  206 +# Abort
  207 +#
  208 +#notRunning:
  209 +
  210 +IfFileExists $PROGRAMFILES\ooRexx\rexx.exe RexxOK RexxNOK
  211 +
  212 +RexxOK:
  213 + SectionGetFlags "${RexxPlugin}" $0
  214 + IntOp $0 $0 | ${SF_SELECTED}
  215 + SectionSetFlags "${RexxPlugin}" $0
  216 +
  217 + SectionGetFlags "${SecRexxLib}" $0
  218 + IntOp $0 $0 | ${SF_SELECTED}
  219 + SectionSetFlags "${SecRexxLib}" $0
  220 +
  221 +goto PastRexxCheck
  222 +
  223 +RexxNOK:
  224 + SectionGetFlags "${RexxPlugin}" $0
  225 + IntOp $0 $0 | ${SF_RO}
  226 + SectionSetFlags "${RexxPlugin}" $0
  227 +
  228 + SectionGetFlags "${SecRexxLib}" $0
  229 + IntOp $0 $0 | ${SF_RO}
  230 + SectionSetFlags "${SecRexxLib}" $0
  231 +
  232 +PastRexxCheck:
  233 +
  234 + ReadRegStr $4 HKLM "Software\GTK2-Runtime" "DllPath"
  235 +
  236 + # remove trailing back slash
  237 + Push $4
  238 + Exch $EXEDIR
  239 + Exch $EXEDIR
  240 + Pop $4
  241 +
  242 + # if Gtk runtime DLL path exists gtk runtime is already installed.
  243 + IfFileExists $4 gtkOK gtkNOK
  244 +
  245 +gtkOK:
  246 +
  247 + SectionGetFlags "${SecGTK}" $0
  248 + IntOp $0 $0 & ${SECTION_OFF}
  249 + SectionSetFlags "${SecGTK}" $0
  250 +
  251 +goto PastGTKCheck
  252 +
  253 +gtkNOK:
  254 +
  255 + SectionGetFlags "${SecGTK}" $0
  256 + IntOp $0 $0 | ${SF_SELECTED}
  257 + SectionSetFlags "${SecGTK}" $0
  258 +
  259 +goto PastGTKCheck
  260 +
  261 +
  262 +
  263 +PastGTKCheck:
  264 +
  265 +
  266 +FunctionEnd
  267 +
  268 +
pw3270.spec.in
  Diff comments   View file @64fb143
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 29
30 #---[ Check for distro ]---------------------------------------------------------------------------------------------- 30 #---[ Check for distro ]----------------------------------------------------------------------------------------------
31 31
32 -%define _rel 0 32 +%define _rel @PACKAGE_LEVEL@
33 33
34 %define _release %{_rel} 34 %define _release %{_rel}
35 %define _distro Linux 35 %define _distro Linux
src/pw3270/pw3270.ico 0 → 100644
View file @64fb143
No preview for this file type
src/tools/Makefile.in
  Diff comments   View file @64fb143
@@ -50,7 +50,7 @@ all: xml2pot$(EXEEXT) @@ -50,7 +50,7 @@ all: xml2pot$(EXEEXT)
50 50
51 xml2pot$(EXEEXT): xml2pot.c Makefile 51 xml2pot$(EXEEXT): xml2pot.c Makefile
52 @echo " CCLD `basename $@`" 52 @echo " CCLD `basename $@`"
53 - @$(HOST_CC) $(GTK_CFLAGS) -g -o $@ xml2pot.c $(GTK_LIBS) 53 + @$(HOST_CC) `pkg-config --cflags gtk+-2.0` -g -o $@ xml2pot.c `pkg-config --libs gtk+-2.0`
54 54
55 clean: 55 clean:
56 @rm -f *.$(OBJEXT) 56 @rm -f *.$(OBJEXT)