Commit f0e2fc8690c950de5726633fbc8a9de6db6a813d
1 parent
afcb5ed7
Exists in
master
Ajustes para empacotamento.
Showing
5 changed files
with
246 additions
and
3 deletions
Show diff stats
.gitignore
@@ -0,0 +1,237 @@ | @@ -0,0 +1,237 @@ | ||
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=gobject.c iocallback.c main.c session.c status.c tn3270glue.c | ||
28 | + | ||
29 | +#---[ Configuration values ]------------------------------------------------------------- | ||
30 | + | ||
31 | +PACKAGE_NAME=@PACKAGE_NAME@ | ||
32 | +PACKAGE_VERSION=@PACKAGE_VERSION@ | ||
33 | +PACKAGE_TARNAME=@PACKAGE_TARNAME@ | ||
34 | + | ||
35 | +prefix=@prefix@ | ||
36 | +exec_prefix=@exec_prefix@ | ||
37 | +bindir=@bindir@ | ||
38 | +sbindir=@sbindir@ | ||
39 | +libdir=@libdir@ | ||
40 | + | ||
41 | +BASEDIR=@BASEDIR@ | ||
42 | +SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) | ||
43 | + | ||
44 | +OBJDIR=$(BASEDIR)/.obj | ||
45 | +OBJDBG=$(OBJDIR)/Debug | ||
46 | +OBJRLS=$(OBJDIR)/Release | ||
47 | + | ||
48 | +BINDIR=$(BASEDIR)/.bin | ||
49 | +BINDBG=$(BINDIR)/Debug | ||
50 | +BINRLS=$(BINDIR)/Release | ||
51 | + | ||
52 | +INSTALL=@INSTALL@ | ||
53 | +INSTALL_DATA=@INSTALL_DATA@ | ||
54 | +INSTALL_PROGRAM=@INSTALL_PROGRAM@ | ||
55 | + | ||
56 | +LN_S=@LN_S@ | ||
57 | +DBUSBINDING=@DBUSBINDING@ | ||
58 | +VALGRIND=@VALGRIND@ | ||
59 | +AMTAR=@AMTAR@ | ||
60 | +SHELL=@SHELL@ | ||
61 | +STRIP=@STRIP@ | ||
62 | +MKDIR=@MKDIR_P@ | ||
63 | +RPMBUILD=@RPMBUILD@ | ||
64 | + | ||
65 | +CC=@CC@ | ||
66 | +LD=@CC@ | ||
67 | + | ||
68 | +LIBS=@LIBS@ @LIBICONV@ @DBUS_LIBS@ @GLIB_LIBS@ @LIB3270_LIBS@ | ||
69 | +CFLAGS=@CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @LIB3270_CFLAGS@ | ||
70 | +LDFLAGS=@LDFLAGS@ | ||
71 | + | ||
72 | +#---[ Rules ]---------------------------------------------------------------------------- | ||
73 | + | ||
74 | +DEPENDS=Makefile src/config.h src/private.h src/service.h src/dbus-glue.h | ||
75 | + | ||
76 | +$(OBJDBG)/%.o: \ | ||
77 | + src/%.c \ | ||
78 | + $(DEPENDS) | ||
79 | + | ||
80 | + @echo $< ... | ||
81 | + @$(MKDIR) `dirname $@` | ||
82 | + @$(CC) $(CFLAGS) -fstack-check -DDEBUG=1 \ | ||
83 | + -DBUILD_DATE=`date +"0x%Y%m%d"`\ | ||
84 | + -g -o $@ -c $< | ||
85 | + | ||
86 | +$(OBJRLS)/%.o: \ | ||
87 | + src/%.c \ | ||
88 | + $(DEPENDS) | ||
89 | + | ||
90 | + @echo $< ... | ||
91 | + @$(MKDIR) `dirname $@` | ||
92 | + @$(CCC) $(CFLAGS) -DNDEBUG=1 \ | ||
93 | + -DBUILD_DATE=`date +"0x%Y%m%d"` \ | ||
94 | + -o $@ -c $< | ||
95 | + | ||
96 | +src/dbus-glue.h: \ | ||
97 | + src/pw3270service.xml | ||
98 | + | ||
99 | + @$(DBUSBINDING) --mode=glib-server --output=src/dbus-glue.h --prefix=pw3270_dbus src/pw3270service.xml | ||
100 | + | ||
101 | + | ||
102 | +%.tar.bz2: \ | ||
103 | + %.tar | ||
104 | + | ||
105 | + @echo $< ... | ||
106 | + @bzip2 --compress -9 --stdout $< > $@ | ||
107 | + @chmod 0644 $@ | ||
108 | + | ||
109 | +%.tar.gz: \ | ||
110 | + %.tar | ||
111 | + | ||
112 | + @echo $< ... | ||
113 | + @gzip -9 --stdout $< > $@ | ||
114 | + @chmod 0644 $@ | ||
115 | + | ||
116 | +#---[ Release Targets ]------------------------------------------------------------------ | ||
117 | + | ||
118 | +all: \ | ||
119 | + $(BINRLS)/$(PACKAGE_NAME) | ||
120 | + | ||
121 | +Release: \ | ||
122 | + $(BINRLS)/$(PACKAGE_NAME) | ||
123 | + | ||
124 | +install: \ | ||
125 | + $(BINRLS)/$(PACKAGE_NAME) | ||
126 | + | ||
127 | +bz2: \ | ||
128 | + $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2 | ||
129 | + | ||
130 | +rpm: \ | ||
131 | + $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2 \ | ||
132 | + rpm/$(PACKAGE_NAME).spec \ | ||
133 | + Makefile | ||
134 | + | ||
135 | + $(MKDIR) $(BASEDIR)/rpm | ||
136 | + $(MKDIR) $(BASEDIR)/rpm/SPECS | ||
137 | + $(MKDIR) $(BASEDIR)/rpm/SOURCES | ||
138 | + $(MKDIR) $(BASEDIR)/rpm/SRPMS | ||
139 | + $(MKDIR) $(BASEDIR)/rpm/RPMS | ||
140 | + $(MKDIR) $(BASEDIR)/rpm/BUILD | ||
141 | + $(MKDIR) $(BASEDIR)/rpm/BUILDROOT | ||
142 | + umask 002 ; $(RPMBUILD) \ | ||
143 | + --define="_topdir $(BASEDIR)/rpm" \ | ||
144 | + --define="_packager $(USER)@$(HOSTNAME)" \ | ||
145 | + --clean \ | ||
146 | + -ta $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2 | ||
147 | + | ||
148 | +srpm: \ | ||
149 | + $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2 \ | ||
150 | + rpm/$(PACKAGE_NAME).spec \ | ||
151 | + Makefile | ||
152 | + | ||
153 | + @$(MKDIR) $(BASEDIR)/rpm | ||
154 | + @$(MKDIR) $(BASEDIR)/rpm/SPECS | ||
155 | + @$(MKDIR) $(BASEDIR)/rpm/SOURCES | ||
156 | + @$(MKDIR) $(BASEDIR)/rpm/SRPMS | ||
157 | + @$(MKDIR) $(BASEDIR)/rpm/RPMS | ||
158 | + @$(MKDIR) $(BASEDIR)/rpm/BUILD | ||
159 | + @$(MKDIR) $(BASEDIR)/rpm/BUILDROOT | ||
160 | + @umask 002 ; $(RPMBUILD) \ | ||
161 | + --define="_topdir $(PWD)/rpm" \ | ||
162 | + --define="_packager $(USER)@$(HOSTNAME)" \ | ||
163 | + --clean \ | ||
164 | + -ts $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2 | ||
165 | + | ||
166 | +$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar: \ | ||
167 | + $(SRCDIR) \ | ||
168 | + Makefile | ||
169 | + | ||
170 | + @$(AMTAR) \ | ||
171 | + --verbose \ | ||
172 | + --format=ustar \ | ||
173 | + --create \ | ||
174 | + --exclude-vcs \ | ||
175 | + --directory $(BASEDIR)/.src \ | ||
176 | + --owner=root \ | ||
177 | + --group=root \ | ||
178 | + --file=$@ \ | ||
179 | + $(PACKAGE_TARNAME)-@PACKAGE_VERSION@ | ||
180 | + | ||
181 | + | ||
182 | +$(SRCDIR): \ | ||
183 | + clean \ | ||
184 | + Makefile | ||
185 | + | ||
186 | + # Copia fontes | ||
187 | + @$(MKDIR) $(SRCDIR)/src | ||
188 | + @cp src/*.c $(SRCDIR)/src | ||
189 | + @cp src/*.h $(SRCDIR)/src | ||
190 | + @cp src/*.xml $(SRCDIR)/src | ||
191 | + | ||
192 | + # Copia extras | ||
193 | + @cp -r scripts $(SRCDIR) | ||
194 | + @cp -r testprograms $(SRCDIR) | ||
195 | + | ||
196 | + # Copia documentos | ||
197 | + @cp AUTHORS $(SRCDIR) | ||
198 | + @cp LICENCA $(SRCDIR) | ||
199 | + @cp LICENSE $(SRCDIR) | ||
200 | + @cp README.md $(SRCDIR) | ||
201 | + | ||
202 | + # Copia configuradores | ||
203 | + @cp configure.ac $(SRCDIR) | ||
204 | + @cp *.in $(SRCDIR) | ||
205 | + @cp *.cbp $(SRCDIR) | ||
206 | + @cp rpm/*.spec $(SRCDIR) | ||
207 | + | ||
208 | + | ||
209 | +$(BINRLS)/$(PACKAGE_NAME): \ | ||
210 | + $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) | ||
211 | + | ||
212 | + @echo $(basename $@) ... | ||
213 | + @$(MKDIR) `dirname $@` | ||
214 | + @$(LD) $(LDFLAGS) -o $@ $^ $(LIBS) | ||
215 | + | ||
216 | +Debug: \ | ||
217 | + $(BINDBG)/$(PACKAGE_NAME) | ||
218 | + | ||
219 | +$(BINDBG)/$(PACKAGE_NAME): \ | ||
220 | + $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o) | ||
221 | + | ||
222 | + @echo $(basename $@) ... | ||
223 | + @$(MKDIR) `dirname $@` | ||
224 | + @$(LD) $(LDFLAGS) -o $@ $^ $(LIBS) | ||
225 | + | ||
226 | +run: \ | ||
227 | + $(BINDBG)/$(PACKAGE_NAME) | ||
228 | + | ||
229 | + $(BINDBG)/$(PACKAGE_NAME) | ||
230 | + | ||
231 | +clean: | ||
232 | + | ||
233 | + @rm -fr $(BINDIR) | ||
234 | + @rm -fr $(OBJDIR) | ||
235 | + @rm -f src/dbus-glue.h | ||
236 | + | ||
237 | + |
configure.ac
@@ -198,6 +198,7 @@ AC_PATH_TOOL([MSGCAT], [msgcat], [no]) | @@ -198,6 +198,7 @@ AC_PATH_TOOL([MSGCAT], [msgcat], [no]) | ||
198 | AC_PATH_TOOL([MSGINIT], [msginit], [no]) | 198 | AC_PATH_TOOL([MSGINIT], [msginit], [no]) |
199 | AC_PATH_TOOL([MSGMERGE], [msgmerge], [no]) | 199 | AC_PATH_TOOL([MSGMERGE], [msgmerge], [no]) |
200 | AC_PATH_TOOL([MSGFMT], [msgfmt], [no]) | 200 | AC_PATH_TOOL([MSGFMT], [msgfmt], [no]) |
201 | +AC_PATH_TOOL([DBUSBINDING], [dbus-binding-tool], [dbus-binding-tool]) | ||
201 | 202 | ||
202 | AC_CHECK_HEADER(libintl.h, [ | 203 | AC_CHECK_HEADER(libintl.h, [ |
203 | AC_DEFINE(HAVE_LIBINTL, 1) | 204 | AC_DEFINE(HAVE_LIBINTL, 1) |
@@ -334,7 +335,7 @@ dnl --------------------------------------------------------------------------- | @@ -334,7 +335,7 @@ dnl --------------------------------------------------------------------------- | ||
334 | dnl Configure which files to generate. | 335 | dnl Configure which files to generate. |
335 | dnl --------------------------------------------------------------------------- | 336 | dnl --------------------------------------------------------------------------- |
336 | 337 | ||
337 | -dnl AC_CONFIG_FILES(Makefile) | 338 | +AC_CONFIG_FILES(Makefile) |
338 | 339 | ||
339 | dnl --------------------------------------------------------------------------- | 340 | dnl --------------------------------------------------------------------------- |
340 | dnl Output the generated config.status script. | 341 | dnl Output the generated config.status script. |
src/main.c
@@ -34,9 +34,10 @@ | @@ -34,9 +34,10 @@ | ||
34 | #include <glib-object.h> | 34 | #include <glib-object.h> |
35 | #include <dbus/dbus.h> | 35 | #include <dbus/dbus.h> |
36 | #include <dbus/dbus-glib.h> | 36 | #include <dbus/dbus-glib.h> |
37 | -#include <dbus/dbus-glib-bindings.h> | ||
38 | - | ||
39 | #include "service.h" | 37 | #include "service.h" |
38 | + | ||
39 | +#pragma GCC diagnostic ignored "-Wunused-function" | ||
40 | +#include <dbus/dbus-glib-bindings.h> | ||
40 | #include "dbus-glue.h" | 41 | #include "dbus-glue.h" |
41 | 42 | ||
42 | #include "private.h" | 43 | #include "private.h" |
src/session.c
@@ -27,6 +27,7 @@ | @@ -27,6 +27,7 @@ | ||
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include "private.h" | 29 | #include "private.h" |
30 | + #include <stdio.h> | ||
30 | 31 | ||
31 | /*---[ Implement ]----------------------------------------------------------------------------------*/ | 32 | /*---[ Implement ]----------------------------------------------------------------------------------*/ |
32 | 33 |