Download as
Browse Code »

Commit 9c9c9a2e5be84e30fcd701550a97c091262f1376

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

Iniciando empacotamento do módulo jni

Showing 4 changed files with 61 additions and 31 deletions   Show diff stats
Makefile.in
  Diff comments   View file @9c9c9a2
... ... @@ -157,13 +157,21 @@ $(BINDIR)/Release/$(PACKAGE_NAME).oxt:
157 157 @$(MKDIR) `dirname $@`
158 158 @cp src/loffice/.bin/Release/$(PACKAGE_NAME).oxt $@
159 159  
160   -php: $(BINDIR)/Release/tn3270.so
  160 +php: $(BINDIR)/Release/tn3270@DLLEXT@
161 161  
162   -$(BINDIR)/Release/tn3270.so:
  162 +$(BINDIR)/Release/tn3270.so: src/php/*
163 163 @$(MAKE) -C src/php Release
164 164 @$(MKDIR) `dirname $@`
165 165 @cp src/php/.bin/Release/php3270.so $@
166 166  
  167 +java: $(BINDIR)/Release/@DLLPREFIX@jni3270@DLLEXT@
  168 +
  169 +$(BINDIR)/Release/@DLLPREFIX@jni3270@DLLEXT@: src/java/*
  170 + @$(MAKE) -C src/java Release
  171 + @$(MKDIR) `dirname $@`
  172 + @cp src/java/.bin/Release/*@DLLEXT@ $(BINDIR)/Release
  173 + @cp src/java/.bin/Release/*.jar $(BINDIR)/Release
  174 +
167 175 #---[ Debug targets ]----------------------------------------------------------
168 176  
169 177 Debug: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) \
... ...
configure.ac
  Diff comments   View file @9c9c9a2
... ... @@ -312,6 +312,9 @@ fi
312 312 AC_ARG_VAR([JDK_HOME], [JDK home directory])
313 313 AC_ARG_VAR([JRE_HOME], [JRE home directory])
314 314  
  315 +AC_ARG_WITH([jnidir], [AS_HELP_STRING([--with-jnidir], [Directory for JNI libraries])], [ jnidir="$withval" ],[ jnidir=\$"{libdir}/java" ])
  316 +AC_ARG_WITH([jvmjardir], [AS_HELP_STRING([--with-jvmjardir], [Directory for JAR files])], [ jvmjardir="$withval" ],[ jvmjardir=\$"{libdir}/jvm-exports" ])
  317 +
315 318 AC_ARG_ENABLE([java],[AS_HELP_STRING([--disable-java], [Disable java integration])],[ app_cv_java="$enableval" ],[ app_cv_java="yes" ])
316 319  
317 320 if test "$app_cv_java" = "yes" ; then
... ... @@ -337,10 +340,15 @@ if test "$app_cv_java" = "yes" ; then
337 340 AC_PATH_TOOL([JAVAC], [javac], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH])
338 341 AC_PATH_TOOL([JAVAH], [javah], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH])
339 342 AC_PATH_TOOL([JAR], [jar], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH])
  343 +
  344 + EXTENSIONS="$EXTENSIONS java"
  345 +
340 346 fi
341 347  
342 348 AC_SUBST(JAVAC)
343 349 AC_SUBST(JAVAH)
  350 +AC_SUBST(jnidir)
  351 +AC_SUBST(jvmjardir)
344 352 AC_SUBST(JAR)
345 353 AC_SUBST(JDK_HOME)
346 354 AC_SUBST(JRE_HOME)
... ...
po/pt_BR.po
  Diff comments   View file @9c9c9a2
... ... @@ -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: 2015-03-24 16:27-0300\n"
  8 +"POT-Creation-Date: 2015-06-12 11:42-0300\n"
9 9 "PO-Revision-Date: 2014-02-17 08:05-0300\n"
10 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 11 "Language-Team: Portugues <>\n"
... ... @@ -19,8 +19,8 @@ msgstr &quot;&quot;
19 19 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
20 20 "X-Generator: Gtranslator 2.91.6\n"
21 21  
22   -#: telnet.c:1057 ssl.c:262 ssl.c:315 connect.c:99 connect.c:115 connect.c:117
23   -#: connect.c:570 connect.c:587
  22 +#: telnet.c:1057 ssl.c:262 ssl.c:315 connect.c:101 connect.c:117 connect.c:119
  23 +#: connect.c:572 connect.c:589
24 24 #, c-format
25 25 msgid "%s"
26 26 msgstr "%s"
... ... @@ -286,7 +286,7 @@ msgstr &quot;Aguardando para enviar pedido de cancelamento&quot;
286 286 msgid "Background"
287 287 msgstr "Fundo"
288 288  
289   -#: connect.c:174
  289 +#: connect.c:176
290 290 msgid "Bad winsock version"
291 291 msgstr "Versão winsock inválida"
292 292  
... ... @@ -364,7 +364,7 @@ msgstr &quot;Tema de c_ores:&quot;
364 364 msgid "C_onnect"
365 365 msgstr "_Conectar"
366 366  
367   -#: toggles.c:313 connect.c:361 connect.c:456
  367 +#: toggles.c:313 connect.c:363 connect.c:458
368 368 #, c-format
369 369 msgid "Can't %s network keep-alive"
370 370 msgstr "Não foi possível %s opção \"keep-alive\""
... ... @@ -374,12 +374,12 @@ msgstr &quot;Não foi possível %s opção \&quot;keep-alive\&quot;&quot;
374 374 msgid "Can't accept unnamed %s"
375 375 msgstr "Não posso aceitar elemento %s sem nome"
376 376  
377   -#: connect.c:107 connect.c:392
  377 +#: connect.c:109 connect.c:394
378 378 #, c-format
379 379 msgid "Can't connect to %s"
380 380 msgstr "Não foi possível conectar a %s"
381 381  
382   -#: connect.c:273 connect.c:426
  382 +#: connect.c:275 connect.c:428
383 383 #, c-format
384 384 msgid "Can't connect to %s:%s"
385 385 msgstr "Não foi possível conectar a %s:%s"
... ... @@ -393,7 +393,7 @@ msgstr &quot;Não foi possível converter a linha %d de %s para %s&quot;
393 393 msgid "Can't cut rectangular regions"
394 394 msgstr "Recortar não permitido em seleção retangular"
395 395  
396   -#: connect.c:200
  396 +#: connect.c:202
397 397 #, c-format
398 398 msgid "Can't determine value for environment variable \"%s\" "
399 399 msgstr "Can't determine value for environment variable \"%s\" "
... ... @@ -481,11 +481,11 @@ msgstr &quot;Não foi possível definir o charset do host&quot;
481 481 msgid "Can't set lib3270 I/O handlers"
482 482 msgstr "Não foi possível registrar manipuladores de I/O 3270"
483 483  
484   -#: connect.c:586
  484 +#: connect.c:588
485 485 msgid "Can't set socket to blocking mode."
486 486 msgstr "Não foi possível mudar o socket para o modo blocante."
487 487  
488   -#: connect.c:586
  488 +#: connect.c:588
489 489 msgid "Can't set socket to non blocking mode"
490 490 msgstr "Não foi possível setar o socket para o modo não blocante."
491 491  
... ... @@ -501,7 +501,7 @@ msgstr &quot;Não foi possível iniciar transferência de arquivo.&quot;
501 501 msgid "Can't start upload."
502 502 msgstr "Não foi possível iniciar upload."
503 503  
504   -#: connect.c:175
  504 +#: connect.c:177
505 505 #, c-format
506 506 msgid "Can't use winsock version %d.%d"
507 507 msgstr "Não é possível usar a Winsock versão %d.%d"
... ... @@ -608,13 +608,13 @@ msgstr &quot;Configurar host&quot;
608 608 msgid "Connect on startup"
609 609 msgstr "Conectar ao iniciar"
610 610  
611   -#: connect.c:198 connect.c:294 connect.c:303 connect.c:365 connect.c:380
612   -#: connect.c:396 connect.c:410 connect.c:430 connect.c:444 connect.c:460
613   -#: connect.c:555
  611 +#: connect.c:200 connect.c:296 connect.c:305 connect.c:367 connect.c:382
  612 +#: connect.c:398 connect.c:412 connect.c:432 connect.c:446 connect.c:462
  613 +#: connect.c:557
614 614 msgid "Connection error"
615 615 msgstr "Erro de conexão"
616 616  
617   -#: connect.c:112
  617 +#: connect.c:114
618 618 msgid "Connection failed"
619 619 msgstr "Conexão falhou"
620 620  
... ... @@ -1036,7 +1036,7 @@ msgstr &quot;Nome do arquivo origem.&quot;
1036 1036 msgid "Name of the target file."
1037 1037 msgstr "Nome do arquivo destino."
1038 1038  
1039   -#: telnet.c:347 iocalls.c:410 iocalls.c:517 connect.c:94
  1039 +#: telnet.c:347 iocalls.c:410 iocalls.c:517 connect.c:96
1040 1040 msgid "Network error"
1041 1041 msgstr "Erro de rede"
1042 1042  
... ... @@ -1044,7 +1044,7 @@ msgstr &quot;Erro de rede&quot;
1044 1044 msgid "Network keep alive"
1045 1045 msgstr "Network keep alive"
1046 1046  
1047   -#: connect.c:162 connect.c:173
  1047 +#: connect.c:164 connect.c:175
1048 1048 msgid "Network startup error"
1049 1049 msgstr "Erro ao iniciar a rede"
1050 1050  
... ... @@ -1495,7 +1495,7 @@ msgstr &quot;Erro SSL&quot;
1495 1495 msgid "SSL Read error"
1496 1496 msgstr "Erro de leitura SSL"
1497 1497  
1498   -#: connect.c:331
  1498 +#: connect.c:333
1499 1499 msgid "SSL error"
1500 1500 msgstr "Erro SSL"
1501 1501  
... ... @@ -1692,7 +1692,7 @@ msgstr &quot;Show timer when processing&quot;
1692 1692 msgid "Smart paste"
1693 1693 msgstr "Colar inteligente"
1694 1694  
1695   -#: connect.c:568 connect.c:585
  1695 +#: connect.c:570 connect.c:587
1696 1696 msgid "Socket error"
1697 1697 msgstr "Erro no socket"
1698 1698  
... ... @@ -2012,7 +2012,7 @@ msgstr &quot;&quot;
2012 2012 msgid "This program requires GTK version %d.%d.%d"
2013 2013 msgstr "Este programa precisa do GTK versão %d.%d.%d"
2014 2014  
2015   -#: connect.c:333
  2015 +#: connect.c:335
2016 2016 #, c-format
2017 2017 msgid ""
2018 2018 "This version of %s was built without support for secure sockets layer (SSL)."
... ... @@ -2094,7 +2094,7 @@ msgstr &quot;UTF-8&quot;
2094 2094 msgid "Uknown DFT Open type from host"
2095 2095 msgstr "Host enviou código de abertura DFT desconhecido"
2096 2096  
2097   -#: connect.c:332
  2097 +#: connect.c:334
2098 2098 msgid "Unable to connect to secure hosts"
2099 2099 msgstr "Não é possível conectar em servidores seguros"
2100 2100  
... ... @@ -2111,7 +2111,7 @@ msgstr &quot;&quot;
2111 2111 msgid "Unable to decrypt certificate's signature"
2112 2112 msgstr "Incapaz de decifrar a assinatura do certificado"
2113 2113  
2114   -#: connect.c:199
  2114 +#: connect.c:201
2115 2115 msgid "Unable to find selected hostname."
2116 2116 msgstr "Não consegui encontrar o host selecionado."
2117 2117  
... ... @@ -2119,7 +2119,7 @@ msgstr &quot;Não consegui encontrar o host selecionado.&quot;
2119 2119 msgid "Unable to get certificate CRL"
2120 2120 msgstr "Unable to get certificate CRL"
2121 2121  
2122   -#: connect.c:95
  2122 +#: connect.c:97
2123 2123 msgid "Unable to get connection state."
2124 2124 msgstr "Não foi possível obter o estado da conexão."
2125 2125  
... ... @@ -2273,7 +2273,7 @@ msgstr &quot;Variável&quot;
2273 2273 msgid "Version %s - Revision %s"
2274 2274 msgstr "Versão %s - Revisão %s"
2275 2275  
2276   -#: connect.c:163
  2276 +#: connect.c:165
2277 2277 msgid "WSAStartup failed"
2278 2278 msgstr "WSAStartup falhou"
2279 2279  
... ... @@ -2472,23 +2472,23 @@ msgstr &quot;um atributo \&quot;action\&quot;&quot;
2472 2472 msgid "bracket"
2473 2473 msgstr "bracket"
2474 2474  
2475   -#: toggles.c:313 connect.c:361 connect.c:456
  2475 +#: toggles.c:313 connect.c:363 connect.c:458
2476 2476 msgid "disable"
2477 2477 msgstr "desabilitar"
2478 2478  
2479   -#: toggles.c:313 connect.c:361 connect.c:456
  2479 +#: toggles.c:313 connect.c:363 connect.c:458
2480 2480 msgid "enable"
2481 2481 msgstr "enable"
2482 2482  
2483   -#: connect.c:569
  2483 +#: connect.c:571
2484 2484 msgid "fcntl() error when getting socket state."
2485 2485 msgstr "fcntl() error when getting socket state."
2486 2486  
2487   -#: connect.c:381 connect.c:556
  2487 +#: connect.c:383 connect.c:558
2488 2488 msgid "ioctlsocket(FIONBIO) failed."
2489 2489 msgstr "ioctlsocket(FIONBIO) failed."
2490 2490  
2491   -#: connect.c:411 connect.c:445
  2491 +#: connect.c:413 connect.c:447
2492 2492 msgid "setsockopt(SO_OOBINLINE) has failed"
2493 2493 msgstr "setsockopt(SO_OOBINLINE) has failed"
2494 2494  
... ...
src/java/Makefile.in
  Diff comments   View file @9c9c9a2
... ... @@ -36,6 +36,8 @@ sbindir=@sbindir@
36 36 libdir=@libdir@
37 37 includedir=@includedir@
38 38 sysconfdir=@sysconfdir@
  39 +jnidir=@jnidir@
  40 +jvmjardir=@jvmjardir@
39 41  
40 42 #---[ Tools ]------------------------------------------------------------------
41 43  
... ... @@ -94,6 +96,11 @@ $(BINDIR)/java/$(PACKAGE_NAME)/%.class: %.java
94 96 @mkdir -p `dirname $@`
95 97 @$(JAVAC) -encoding utf-8 -d $(BINDIR)/java $^
96 98  
  99 +$(BINRLS)/$(PACKAGE_NAME).jar: $(BINDIR)/java/$(PACKAGE_NAME)/terminal.class Makefile
  100 + @echo $@ ...
  101 + @mkdir -p `dirname $@`
  102 + @$(JAR) -cvf "$@" -C "$(BINDIR)/java" "$(PACKAGE_NAME)"
  103 +
97 104 #---[ Release targets ]--------------------------------------------------------
98 105  
99 106 all: $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@
... ... @@ -123,6 +130,13 @@ run: $(BINDBG)/@DLLPREFIX@jni3270@DLLEXT@ $(BINDIR)/java/testprogram.class
123 130  
124 131 #---[ Misc targets ]-----------------------------------------------------------
125 132  
  133 +install: $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@
  134 + @$(MKDIR) $(DESTDIR)/$(jnidir)
  135 + @$(INSTALL_PROGRAM) $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@ $(DESTDIR)/$(jnidir)
  136 +
  137 + @mkdir -p $(DESTDIR)/$(jvmjardir)
  138 + @$(INSTALL_DATA) $(BINRLS)/$(PACKAGE_NAME).jar $(DESTDIR)/$(jvmjardir)
  139 +
126 140 jni3270.h: $(BINDIR)/java/$(PACKAGE_NAME)/terminal.class
127 141 @echo $< ...
128 142 @mkdir -p `dirname $@`
... ...