Download as
Browse Code »

Commit f7628d333988f5818a911c39f4265b69f9ff34ea

Authored by Perry Werneck
1 parent a99c3a7f
Exists in master

Ajustando novo módulo ooRexx para empacotamento.

Showing 5 changed files with 317 additions and 11 deletions   Show diff stats
@@ -170,11 +170,21 @@ dnl --------------------------------------------------------------------------- @@ -170,11 +170,21 @@ dnl ---------------------------------------------------------------------------
170 dnl Check for ooRexx 170 dnl Check for ooRexx
171 dnl --------------------------------------------------------------------------- 171 dnl ---------------------------------------------------------------------------
172 172
  173 +PKG_CHECK_MODULES( [GTK], [gtk+-3.0], AC_DEFINE(HAVE_GTK))
  174 +
  175 +AC_SUBST(GTK_LIBS)
  176 +AC_SUBST(GTK_CFLAGS)
  177 +AC_SUBST(GTK_VERSION,`$PKG_CONFIG --modversion gtk+-3.0`)
  178 +
  179 +dnl ---------------------------------------------------------------------------
  180 +dnl Check for GTK
  181 +dnl ---------------------------------------------------------------------------
  182 +
173 PKG_CHECK_MODULES( [REXX], [ooRexx], AC_DEFINE(HAVE_OOREXX)) 183 PKG_CHECK_MODULES( [REXX], [ooRexx], AC_DEFINE(HAVE_OOREXX))
174 184
175 AC_SUBST(REXX_LIBS) 185 AC_SUBST(REXX_LIBS)
176 AC_SUBST(REXX_CFLAGS) 186 AC_SUBST(REXX_CFLAGS)
177 -AC_SUBST(REXX_VERSION,`$PKG_CONFIG --modversion ooRexx`) 187 +
178 188
179 dnl --------------------------------------------------------------------------- 189 dnl ---------------------------------------------------------------------------
180 dnl Check for integer types & library functions 190 dnl Check for integer types & library functions
@@ -336,8 +346,8 @@ dnl Configure which files to generate. @@ -336,8 +346,8 @@ dnl Configure which files to generate.
336 dnl --------------------------------------------------------------------------- 346 dnl ---------------------------------------------------------------------------
337 347
338 dnl AC_CONFIG_FILES(Makefile) 348 dnl AC_CONFIG_FILES(Makefile)
339 -dnl AC_CONFIG_FILES(src/extension/Makefile)  
340 -dnl AC_CONFIG_FILES(src/plugin/Makefile) 349 +AC_CONFIG_FILES(src/extension/Makefile)
  350 +AC_CONFIG_FILES(src/plugin/Makefile)
341 351
342 dnl --------------------------------------------------------------------------- 352 dnl ---------------------------------------------------------------------------
343 dnl Output the generated config.status script. 353 dnl Output the generated config.status script.
src/extension/Makefile.in 0 → 100644
  Diff comments   View file @f7628d3
@@ -0,0 +1,164 @@ @@ -0,0 +1,164 @@
  1 +#
  2 +# "Software pw3270, desenvolvido com base nos códigos fontes do WC3270 e X3270
  3 +# (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
  4 +# aplicativos mainframe. Registro no INPI sob o nome G3270.
  5 +#
  6 +# Copyright (C) <2008> <Banco do Brasil S.A.>
  7 +#
  8 +# Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
  9 +# os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela
  10 +# Free Software Foundation.
  11 +#
  12 +# Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER
  13 +# GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO
  14 +# A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
  15 +# obter mais detalhes.
  16 +#
  17 +# Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
  18 +# programa; se não, escreva para a Free Software Foundation, Inc., 59 Temple
  19 +# Place, Suite 330, Boston, MA, 02111-1307, USA
  20 +#
  21 +# Contatos:
  22 +#
  23 +# perry.werneck@gmail.com (Alexandre Perry de Souza Werneck)
  24 +# erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça)
  25 +#
  26 +
  27 +SOURCES=rexx_methods.cc rx3270.cc typed_routines.cc
  28 +LIBNAME=librx3270@DLLEXT@
  29 +
  30 +#---[ Configuration values ]-------------------------------------------------------------
  31 +
  32 +PACKAGE_NAME=@PACKAGE_NAME@
  33 +PACKAGE_VERSION=@PACKAGE_VERSION@
  34 +PACKAGE_TARNAME=@PACKAGE_TARNAME@
  35 +
  36 +prefix=@prefix@
  37 +exec_prefix=@exec_prefix@
  38 +bindir=@bindir@
  39 +sbindir=@sbindir@
  40 +libdir=@libdir@
  41 +
  42 +BASEDIR=@BASEDIR@
  43 +SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
  44 +
  45 +OBJDIR=$(BASEDIR)/.obj
  46 +OBJDBG=$(OBJDIR)/Debug
  47 +OBJRLS=$(OBJDIR)/Release
  48 +
  49 +BINDIR=$(BASEDIR)/.bin
  50 +BINDBG=$(BINDIR)/Debug
  51 +BINRLS=$(BINDIR)/Release
  52 +
  53 +INSTALL=@INSTALL@
  54 +INSTALL_DATA=@INSTALL_DATA@
  55 +INSTALL_PROGRAM=@INSTALL_PROGRAM@
  56 +
  57 +LN_S=@LN_S@
  58 +
  59 +VALGRIND=@VALGRIND@
  60 +AMTAR=@AMTAR@
  61 +SHELL=@SHELL@
  62 +STRIP=@STRIP@
  63 +MKDIR=@MKDIR_P@
  64 +
  65 +CXX=@CXX@
  66 +CC=@CC@
  67 +LD=@CXX@
  68 +
  69 +LIBS=-lpw3270cpp @LIBS@ @REXX_LIBS@
  70 +CFLAGS=-I$(BASEDIR)/src/include @CFLAGS@ @REXX_CFLAGS@
  71 +LDFLAGS=@LDFLAGS@
  72 +
  73 +#---[ Rules ]----------------------------------------------------------------------------
  74 +
  75 +DEPENDS=../include/*.h Makefile
  76 +
  77 +$(OBJDBG)/%.o: \
  78 + %.cc \
  79 + $(DEPENDS)
  80 +
  81 + @echo $< ...
  82 + @$(MKDIR) `dirname $@`
  83 + @$(CXX) $(CFLAGS) -fstack-check -DDEBUG=1 \
  84 + -DBUILD_DATE=`date +"0x%Y%m%d"`\
  85 + -g -o $@ -c $<
  86 +
  87 +$(OBJRLS)/%.o: \
  88 + %.cc \
  89 + $(DEPENDS)
  90 +
  91 + @echo $< ...
  92 + @$(MKDIR) `dirname $@`
  93 + @$(CXX) $(CFLAGS) -DNDEBUG=1 \
  94 + -DBUILD_DATE=`date +"0x%Y%m%d"` \
  95 + -o $@ -c $<
  96 +
  97 +#---[ Release Targets ]------------------------------------------------------------------
  98 +
  99 +all: \
  100 + $(BINRLS)/$(LIBNAME)
  101 +
  102 +Release: \
  103 + $(BINRLS)/$(LIBNAME)
  104 +
  105 +install: \
  106 + $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
  107 +
  108 + @$(MKDIR) $(DESTDIR)/$(libdir)
  109 + @$(INSTALL_PROGRAM) $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ $(DESTDIR)/$(libdir)
  110 +
  111 + @rm -f $(DESTDIR)/$(libdir)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@
  112 + @rm -f $(DESTDIR)/$(libdir)/$(LIBNAME)
  113 +
  114 + @$(LN_S) $(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ $(DESTDIR)/$(libdir)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@
  115 + @$(LN_S) $(LIBNAME).@PACKAGE_MAJOR_VERSION@ $(DESTDIR)/$(libdir)/$(LIBNAME)
  116 +
  117 +$(BINRLS)/$(LIBNAME): \
  118 + $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@
  119 +
  120 + @rm -f $@
  121 + @$(LN_S) $(LIBNAME).@PACKAGE_MAJOR_VERSION@ $@
  122 +
  123 +
  124 +$(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@: \
  125 + $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
  126 +
  127 + @rm -f $@
  128 + @$(LN_S) $(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ $@
  129 +
  130 +
  131 +$(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
  132 + $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o)
  133 +
  134 + @echo $(basename $@) ...
  135 + @$(MKDIR) `dirname $@`
  136 + @$(LD) -shared -Wl,-soname,$(LIBNAME) $(LDFLAGS) -o $@ $^ $(LIBS)
  137 +
  138 +#---[ Debug Targets ]--------------------------------------------------------------------
  139 +
  140 +Debug: \
  141 + $(BINDBG)/$(LIBNAME)
  142 +
  143 +$(BINDBG)/$(LIBNAME): \
  144 + $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@
  145 +
  146 + @rm -f $@
  147 + @$(LN_S) $(LIBNAME).@PACKAGE_MAJOR_VERSION@ $@
  148 +
  149 +
  150 +$(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@: \
  151 + $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
  152 +
  153 + @rm -f $@
  154 + @$(LN_S) $(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ $@
  155 +
  156 +
  157 +$(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
  158 + $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o)
  159 +
  160 + @echo $(basename $@) ...
  161 + @$(MKDIR) `dirname $@`
  162 + @$(LD) -shared -Wl,-soname,$(LIBNAME) $(LDFLAGS) -o $@ $^ $(LIBS)
  163 +
  164 +
src/include/rx3270.h
  Diff comments   View file @f7628d3
@@ -31,13 +31,6 @@ @@ -31,13 +31,6 @@
31 31
32 #define RX3270_H_INCLUDED 1 32 #define RX3270_H_INCLUDED 1
33 33
34 - #define ENABLE_NLS  
35 - #define GETTEXT_PACKAGE "pw3270"  
36 -  
37 - #include <libintl.h>  
38 - #include <glib/gi18n.h>  
39 - #include <gtk/gtk.h>  
40 -  
41 #include <stdint.h> 34 #include <stdint.h>
42 #include <errno.h> 35 #include <errno.h>
43 #include <stdio.h> 36 #include <stdio.h>
src/plugin/Makefile.in 0 → 100644
  Diff comments   View file @f7628d3
@@ -0,0 +1,127 @@ @@ -0,0 +1,127 @@
  1 +#
  2 +# "Software pw3270, desenvolvido com base nos códigos fontes do WC3270 e X3270
  3 +# (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
  4 +# aplicativos mainframe. Registro no INPI sob o nome G3270.
  5 +#
  6 +# Copyright (C) <2008> <Banco do Brasil S.A.>
  7 +#
  8 +# Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
  9 +# os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela
  10 +# Free Software Foundation.
  11 +#
  12 +# Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER
  13 +# GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO
  14 +# A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
  15 +# obter mais detalhes.
  16 +#
  17 +# Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
  18 +# programa; se não, escreva para a Free Software Foundation, Inc., 59 Temple
  19 +# Place, Suite 330, Boston, MA, 02111-1307, USA
  20 +#
  21 +# Contatos:
  22 +#
  23 +# perry.werneck@gmail.com (Alexandre Perry de Souza Werneck)
  24 +# erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça)
  25 +#
  26 +
  27 +SOURCES=plugin.cc
  28 +LIBNAME=prx3270@DLLEXT@
  29 +
  30 +#---[ Configuration values ]-------------------------------------------------------------
  31 +
  32 +PACKAGE_NAME=@PACKAGE_NAME@
  33 +PACKAGE_VERSION=@PACKAGE_VERSION@
  34 +PACKAGE_TARNAME=@PACKAGE_TARNAME@
  35 +
  36 +prefix=@prefix@
  37 +exec_prefix=@exec_prefix@
  38 +bindir=@bindir@
  39 +sbindir=@sbindir@
  40 +libdir=@libdir@
  41 +
  42 +BASEDIR=@BASEDIR@
  43 +SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
  44 +
  45 +OBJDIR=$(BASEDIR)/.obj
  46 +OBJDBG=$(OBJDIR)/Debug
  47 +OBJRLS=$(OBJDIR)/Release
  48 +
  49 +BINDIR=$(BASEDIR)/.bin
  50 +BINDBG=$(BINDIR)/Debug
  51 +BINRLS=$(BINDIR)/Release
  52 +
  53 +INSTALL=@INSTALL@
  54 +INSTALL_DATA=@INSTALL_DATA@
  55 +INSTALL_PROGRAM=@INSTALL_PROGRAM@
  56 +
  57 +LN_S=@LN_S@
  58 +
  59 +VALGRIND=@VALGRIND@
  60 +AMTAR=@AMTAR@
  61 +SHELL=@SHELL@
  62 +STRIP=@STRIP@
  63 +MKDIR=@MKDIR_P@
  64 +
  65 +CXX=@CXX@
  66 +CC=@CC@
  67 +LD=@CXX@
  68 +
  69 +LIBS=-lpw3270cpp @LIBS@ @GTK_LIBS@ @REXX_LIBS@
  70 +CFLAGS=-I$(BASEDIR)/src/include @CFLAGS@ @GTK_CFLAGS@ @REXX_CFLAGS@
  71 +LDFLAGS=@LDFLAGS@
  72 +
  73 +#---[ Rules ]----------------------------------------------------------------------------
  74 +
  75 +DEPENDS=../include/*.h Makefile
  76 +
  77 +$(OBJDBG)/%.o: \
  78 + %.cc \
  79 + $(DEPENDS)
  80 +
  81 + @echo $< ...
  82 + @$(MKDIR) `dirname $@`
  83 + @$(CXX) $(CFLAGS) -fstack-check -DDEBUG=1 \
  84 + -DBUILD_DATE=`date +"0x%Y%m%d"`\
  85 + -g -o $@ -c $<
  86 +
  87 +$(OBJRLS)/%.o: \
  88 + %.cc \
  89 + $(DEPENDS)
  90 +
  91 + @echo $< ...
  92 + @$(MKDIR) `dirname $@`
  93 + @$(CXX) $(CFLAGS) -DNDEBUG=1 \
  94 + -DBUILD_DATE=`date +"0x%Y%m%d"` \
  95 + -o $@ -c $<
  96 +
  97 +#---[ Release Targets ]------------------------------------------------------------------
  98 +
  99 +all: \
  100 + $(BINRLS)/$(LIBNAME)
  101 +
  102 +Release: \
  103 + $(BINRLS)/$(LIBNAME)
  104 +
  105 +install: \
  106 + $(BINRLS)/$(LIBNAME)
  107 +
  108 +$(BINRLS)/$(LIBNAME): \
  109 + $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o)
  110 +
  111 + @echo $(basename $@) ...
  112 + @$(MKDIR) `dirname $@`
  113 + @$(LD) -shared -Wl,-soname,$(LIBNAME) $(LDFLAGS) -o $@ $^ $(LIBS)
  114 +
  115 +#---[ Debug Targets ]--------------------------------------------------------------------
  116 +
  117 +Debug: \
  118 + $(BINDBG)/$(LIBNAME)
  119 +
  120 +$(BINDBG)/$(LIBNAME): \
  121 + $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o)
  122 +
  123 + @echo $(basename $@) ...
  124 + @$(MKDIR) `dirname $@`
  125 + @$(LD) -shared -Wl,-soname,$(LIBNAME) -L$(BINDBG) $(LDFLAGS) -o $@ $^ -lrx3270 $(LIBS)
  126 +
  127 +
src/plugin/plugin.cc
  Diff comments   View file @f7628d3
@@ -32,11 +32,23 @@ @@ -32,11 +32,23 @@
32 * 32 *
33 */ 33 */
34 34
35 - #include "private.h" 35 + #define ENABLE_NLS
  36 + #define GETTEXT_PACKAGE "pw3270"
  37 +
  38 + #include <libintl.h>
  39 + #include <glib/gi18n.h>
  40 + #include <gtk/gtk.h>
  41 +
  42 + #include <rx3270.h>
  43 + #include <pw3270.h>
  44 + #include <pw3270/v3270.h>
36 #include <pw3270/plugin.h> 45 #include <pw3270/plugin.h>
37 #include <pw3270/trace.h> 46 #include <pw3270/trace.h>
  47 + #include <lib3270/trace.h>
38 #include <lib3270/log.h> 48 #include <lib3270/log.h>
39 49
  50 + #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
  51 +
40 /*--[ Globals ]--------------------------------------------------------------------------------------*/ 52 /*--[ Globals ]--------------------------------------------------------------------------------------*/
41 53
42 #if GTK_CHECK_VERSION(2,32,0) 54 #if GTK_CHECK_VERSION(2,32,0)