diff --git a/README.md b/README.md index de7738d..7eb78bd 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,14 @@ +Java tn3270 protocol library +============================ -Java support for pw3270 +Created originally as part of PW3270 application. -Includes a plugin module for java plugins in pw3270 and a jar file allowing use of lib3270 or pw3270 directly from java applications. +See more details at https://softwarepublico.gov.br/social/pw3270/ +Installation repositories +========================= + + You can find instalation repositories in SuSE Build Service: + + * Linux (Many distributions): diff --git a/configure.ac b/configure.ac index 401b998..fbc6570 100644 --- a/configure.ac +++ b/configure.ac @@ -296,7 +296,7 @@ dnl --------------------------------------------------------------------------- dnl Check for PW3270 dnl --------------------------------------------------------------------------- -PKG_CHECK_MODULES( [PW3270], [pw3270], AC_DEFINE(HAVE_PW3270), AC_MSG_ERROR([Can't find lib3270 devel.])) +PKG_CHECK_MODULES( [PW3270], [pw3270], AC_DEFINE(HAVE_PW3270), AC_MSG_ERROR([Can't find pw3270 devel.])) AC_SUBST(PW3270_LIBS) AC_SUBST(PW3270_CFLAGS) diff --git a/pushtag.sh b/pushtag.sh new file mode 100755 index 0000000..11eaf15 --- /dev/null +++ b/pushtag.sh @@ -0,0 +1,34 @@ +#!/bin/bash +# +# https://help.github.com/articles/syncing-a-fork/ +# +# https://help.github.com/articles/configuring-a-remote-for-a-fork/ +# +# https://www.opentechguides.com/how-to/article/git/177/git-sync-repos.html +# +# Setup: +# +# git remote add github https://github.com/PerryWerneck/lib3270.git +# +# + +if [ -z ${1} ]; then + echo "Inform target tag" + exit -1 +fi + +git push + +git fetch origin +git checkout master +git merge origin/master + +git tag -f ${1} +git push -f --tags + +for repo in $(git remote -v | grep -v origin | grep "(push)" | awk '{print $1}') +do + echo "Updating ${repo} ..." + git push ${repo} -f --tags +done + diff --git a/src/plugin/call.cc b/src/plugin/call.cc index c5e2799..0920b0d 100644 --- a/src/plugin/call.cc +++ b/src/plugin/call.cc @@ -32,7 +32,7 @@ #include #include #include - #include + #include using PW3270_NAMESPACE::exception; @@ -51,7 +51,7 @@ void call(GtkWidget *widget, const char *classname) { if(jvm || load_jvm(widget)) { - v3270_set_script(widget,'J',TRUE); + v3270_set_script(widget,'J'); try { @@ -118,7 +118,7 @@ void call(GtkWidget *widget, const char *classname) { } - v3270_set_script(widget,'J',FALSE); + v3270_set_script(widget,0); } diff --git a/src/plugin/plugin.cc b/src/plugin/plugin.cc index b13df37..d879832 100644 --- a/src/plugin/plugin.cc +++ b/src/plugin/plugin.cc @@ -51,12 +51,12 @@ #include #include - #include + #include #include #include #include #include - #include + #include /*--[ Globals ]--------------------------------------------------------------------------------------*/ diff --git a/src/plugin/startstop.cc b/src/plugin/startstop.cc index d9c7d46..52db91b 100644 --- a/src/plugin/startstop.cc +++ b/src/plugin/startstop.cc @@ -50,26 +50,28 @@ #include #include - #include + #include #include #include #include #include #include - #include + #include /*---[ Implement ]----------------------------------------------------------------------------------*/ extern "C" { + /* static void trace_cleanup(GtkWidget *widget, GtkWidget **window) { *window = NULL; } + */ static jint JNICALL jni_vfprintf(FILE *fp, const char *fmt, va_list args) { char * msg = NULL; - static GtkWidget * trace = NULL; +// static GtkWidget * trace = NULL; if(vasprintf(&msg,fmt,args) < 1) { lib3270_write_log(lib3270_get_default_session_handle(),"java","vasprintf() error on \"%s\"",fmt); @@ -79,9 +81,10 @@ extern "C" { fprintf(fp,"%s",msg); lib3270_write_log(lib3270_get_default_session_handle(),"java","%s",msg); + /* if(!trace) { // Cria janela de trace. - trace = pw3270_trace_new(); + trace = v3270_trace_new(); g_signal_connect(G_OBJECT(trace), "destroy",G_CALLBACK(trace_cleanup), &trace); pw3270_trace_set_destroy_on_close(trace,TRUE); @@ -96,6 +99,7 @@ extern "C" { free(msg); } + */ return 0; } -- libgit2 0.21.2