Download as
Browse Code »

Commit 95e3d7e761602ad9f0c8ffdefe77185daf0d7368

Authored by Perry Werneck
1 parent 3202116c
Exists in master and in 1 other branch develop

Updating plugin path.

Showing 6 changed files with 157 additions and 112 deletions   Show diff stats
Makefile.in
  Diff comments   View file @95e3d7e
... ... @@ -288,7 +288,7 @@ install-application: \
288 288 install-icons
289 289  
290 290 @$(MKDIR) \
291   - $(DESTDIR)$(libdir)/$(PRODUCT_NAME)-plugins
  291 + $(DESTDIR)@PLUGIN_DIR@
292 292  
293 293 @$(INSTALL_DATA) \
294 294 $(srcdir)/ui/@OSNAME@.ui.xml \
... ... @@ -300,7 +300,7 @@ install-application: \
300 300 install-linux-application: \
301 301 $(BINRLS)/$(PACKAGE_NAME)@EXEEXT@
302 302  
303   - @$(MKDIR) \
  303 + @$(MKDIR) \
304 304 $(DESTDIR)$(bindir)
305 305  
306 306 @$(INSTALL_PROGRAM) \
... ...
autogen.sh
  Diff comments   View file @95e3d7e
1 1 #!/bin/bash
2   -# SPDX-License-Identifier: LGPL-3.0-or-later
3   -#
4   -# Copyright (C) 2008 Banco do Brasil S.A.
5   -#
6   -# This program is free software: you can redistribute it and/or modify
7   -# it under the terms of the GNU Lesser General Public License as published
8   -# by the Free Software Foundation, either version 3 of the License, or
9   -# (at your option) any later version.
10   -#
11   -# This program is distributed in the hope that it will be useful,
12   -# but WITHOUT ANY WARRANTY; without even the implied warranty of
13   -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14   -# GNU General Public License for more details.
15   -#
16   -# You should have received a copy of the GNU Lesser General Public License
17   -# along with this program. If not, see <https://www.gnu.org/licenses/>.
18   -#
19 2  
20 3 builddir=${PWD}
21 4  
22   -test -n "$srcdir" || srcdir=`dirname "$0"`
23   -test -n "$srcdir" || srcdir=.
  5 +test -n "$srcdir" || srcdir=$(readlink -f $(dirname "$0"))
  6 +test -n "$srcdir" || srcdir=$(readlink -f .)
24 7  
25   -cd "$srcdir"
  8 +cd ${srcdir}
26 9  
27   -mkdir -p scripts
  10 +mkdir -p ./scripts
28 11 mkdir -p m4
29 12  
30   -LIBTOOLIZE=$(which libtoolize)
31   -if [ -z ${LIBTOOLIZE} ]; then
32   - LIBTOOLIZE=$(which glibtoolize)
33   -fi
34   -if [ -z ${LIBTOOLIZE} ]; then
35   - echo "Can't find libtoolize"
36   - exit -1
37   -fi
38   -
39   -${LIBTOOLIZE} --force
  13 +libtoolize --force
40 14 if test $? != 0 ; then
41   - echo "libtoolize failed."
42   - exit -1
  15 + echo "libtoolize failed."
  16 + exit -1
43 17 fi
44 18  
45 19 aclocal
... ... @@ -48,11 +22,11 @@ if test $? != 0 ; then
48 22 exit -1
49 23 fi
50 24  
51   -#autoheader --force
52   -#if test $? != 0 ; then
53   -# echo "autoheader failed."
54   -# exit -1
55   -#fi
  25 +autoheader --force
  26 +if test $? != 0 ; then
  27 + echo "autoheader failed."
  28 + exit -1
  29 +fi
56 30  
57 31 autoconf --force
58 32 if test $? != 0 ; then
... ... @@ -64,10 +38,9 @@ automake --add-missing 2&gt; /dev/null | true
64 38  
65 39 autopoint
66 40  
67   -cd "${builddir}"
68   -
69   -test -n "$NOCONFIGURE" || "$srcdir/configure" --srcdir=${srcdir} $@
  41 +cd ${builddir}
70 42  
  43 +test -n "$NOCONFIGURE" || "./configure" "$@"
71 44  
72 45  
73 46  
... ...
configure.ac
  Diff comments   View file @95e3d7e
... ... @@ -23,7 +23,7 @@ AC_PREREQ(2.61)
23 23  
24 24 dnl Initialise automake with the package name, version and
25 25 dnl bug-reporting address.
26   -AC_INIT([pw3270], [5.4], [perry.werneck@gmail.com])
  26 +AC_INIT([pw3270], [5.5], [perry.werneck@gmail.com])
27 27  
28 28 dnl Place auxilliary scripts here.
29 29 AC_CONFIG_AUX_DIR([scripts])
... ... @@ -40,6 +40,8 @@ AC_CONFIG_HEADER([src/include/config.h])
40 40 dnl Initialise automake stuff.
41 41 AM_INIT_AUTOMAKE
42 42  
  43 +LT_INIT
  44 +
43 45 dnl Set gettext version
44 46 AM_GNU_GETTEXT_VERSION([0.14])
45 47  
... ... @@ -171,8 +173,8 @@ AC_SUBST(PACKAGE_DESCRIPTION,&quot;IBM 3270 Terminal emulator&quot;)
171 173 app_vrs_major=$(echo $VERSION | cut -d. -f1)
172 174 app_vrs_minor=$(echo $VERSION | cut -d. -f2)
173 175  
174   -AC_DEFINE_UNQUOTED(PACKAGE_MAJOR_VERSION, $app_vrs_major)
175   -AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor)
  176 +AC_DEFINE_UNQUOTED(PACKAGE_MAJOR_VERSION, $app_vrs_major, [The package major version])
  177 +AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor, [The package minor version])
176 178  
177 179 AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major)
178 180 AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor)
... ... @@ -182,9 +184,9 @@ AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_
182 184 app_rls_major=$(echo $app_cv_release.0.0 | cut -d. -f1)
183 185 app_rls_minor=$(echo $app_cv_release.0.0 | cut -d. -f2)
184 186  
185   -AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, "$app_cv_release")
186   -AC_DEFINE_UNQUOTED(PACKAGE_MAJOR_RELEASE, $app_rls_major)
187   -AC_DEFINE_UNQUOTED(PACKAGE_MINOR_RELEASE, $app_rls_minor)
  187 +AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, "$app_cv_release",[The package release])
  188 +AC_DEFINE_UNQUOTED(PACKAGE_MAJOR_RELEASE, $app_rls_major,[The package major release])
  189 +AC_DEFINE_UNQUOTED(PACKAGE_MINOR_RELEASE, $app_rls_minor,[The package minor release])
188 190  
189 191 AC_SUBST(PACKAGE_RELEASE,$app_cv_release)
190 192 AC_SUBST(PACKAGE_MAJOR_RELEASE,$app_rls_major)
... ... @@ -195,14 +197,18 @@ dnl Set application id &amp; product name
195 197 dnl ---------------------------------------------------------------------------
196 198  
197 199 AC_ARG_WITH([product-name], [AS_HELP_STRING([--with-product-name], [Set product name])], [ app_cv_product="$withval" ],[ app_cv_product=`pkg-config --variable=product_name lib3270` ])
198   -AC_DEFINE_UNQUOTED(PRODUCT_NAME, $app_cv_product)
  200 +AC_DEFINE_UNQUOTED(PRODUCT_NAME, $app_cv_product,[The product name])
199 201 AC_SUBST(PRODUCT_NAME,$app_cv_product)
200 202  
201 203 AC_ARG_WITH([application-id], [AS_HELP_STRING([--application-id], [Set the application ID])], [ app_cv_application_id="$withval" ],[ app_cv_application_id=`pkg-config --variable=product_id lib3270`.terminal ])
202 204  
203   -AC_DEFINE_UNQUOTED(APPLICATION_ID, $app_cv_application_id)
  205 +AC_DEFINE_UNQUOTED(APPLICATION_ID, $app_cv_application_id,[The application ID])
204 206 AC_SUBST(APPLICATION_ID,$app_cv_application_id)
205 207  
  208 +AC_ARG_WITH([plugin-dir], [AS_HELP_STRING([--with-plugin-dir], [The application plugin dir])], [ app_cv_plugin_path="$withval" ],[ app_cv_plugin_path=`pkg-config --variable=plugin_path lib3270` ])
  209 +AC_DEFINE_UNQUOTED(PLUGIN_DIR, "$app_cv_plugin_path", [The product name])
  210 +AC_SUBST(PLUGIN_DIR,$app_cv_plugin_path)
  211 +
206 212 dnl ---------------------------------------------------------------------------
207 213 dnl Check for unstable version
208 214 dnl ---------------------------------------------------------------------------
... ... @@ -217,7 +223,7 @@ AC_ARG_ENABLE([unstable],
217 223 ])
218 224  
219 225 if test "$app_cv_unstable" == "yes"; then
220   - AC_DEFINE(ENABLE_UNSTABLE_FEATURES)
  226 + AC_DEFINE(ENABLE_UNSTABLE_FEATURES,,[Are we using the unstable features?])
221 227 AC_MSG_NOTICE([Enabling unstable features])
222 228 else
223 229 AC_MSG_NOTICE([Using only stable features])
... ... @@ -228,13 +234,13 @@ dnl ---------------------------------------------------------------------------
228 234 dnl Check for LIBV3270
229 235 dnl ---------------------------------------------------------------------------
230 236  
231   -PKG_CHECK_MODULES( [LIBV3270], [libv3270], AC_DEFINE(HAVE_LIBV3270), AC_MSG_ERROR([LIBV3270 not present.]))
  237 +PKG_CHECK_MODULES( [LIBV3270], [libv3270], AC_DEFINE(HAVE_LIBV3270,,[Do we have libv3270?]), AC_MSG_ERROR([LIBV3270 not present.]))
232 238  
233 239 AC_SUBST(LIBV3270_LIBS)
234 240 AC_SUBST(LIBV3270_CFLAGS)
235 241  
236 242 AC_ARG_WITH([library-name], [AS_HELP_STRING([--with-library-name], [Set protocol library name])], [ app_cv_library="$withval" ],[ app_cv_library=`pkg-config --variable=library_name lib3270` ])
237   -AC_DEFINE_UNQUOTED(LIBRARY_NAME, $app_cv_library)
  243 +AC_DEFINE_UNQUOTED(LIBRARY_NAME, $app_cv_library,[The tn3270 library name])
238 244 AC_SUBST(LIBRARY_NAME,$app_cv_library)
239 245  
240 246 dnl ---------------------------------------------------------------------------
... ... @@ -243,19 +249,7 @@ dnl ---------------------------------------------------------------------------
243 249  
244 250 GLIB_GSETTINGS
245 251  
246   -case "$host" in
247   - *-mingw32|*-pc-msys)
248   - PKG_CHECK_MODULES( [GTK], [gtk+-3.0 glib-2.0 gmodule-2.0], AC_DEFINE(HAVE_GTK), AC_MSG_ERROR([GTK not present.]))
249   - ;;
250   -
251   - *-apple-darwin*)
252   - PKG_CHECK_MODULES( [GTK], [gtk+-3.0 glib-2.0 gmodule-2.0], AC_DEFINE(HAVE_GTK), AC_MSG_ERROR([GTK not present.]))
253   - ;;
254   -
255   - *)
256   - PKG_CHECK_MODULES( [GTK], [gtk+-3.0 glib-2.0 gmodule-2.0], AC_DEFINE(HAVE_GTK), AC_MSG_ERROR([GTK not present.]))
257   -
258   -esac
  252 +PKG_CHECK_MODULES( [GTK], [gtk+-3.0 glib-2.0 gmodule-2.0], AC_DEFINE(HAVE_GTK,1,[Do we have gtk?]), AC_MSG_ERROR([GTK not present.]))
259 253  
260 254 AC_SUBST(GTK_LIBS)
261 255 AC_SUBST(GTK_CFLAGS)
... ...
pw3270.cbp
  Diff comments   View file @95e3d7e
... ... @@ -46,6 +46,7 @@
46 46 <Unit filename="schemas/linux/window.gschema.xml.in" />
47 47 <Unit filename="schemas/windows/application.gschema.xml.in" />
48 48 <Unit filename="schemas/windows/window.gschema.xml.in" />
  49 + <Unit filename="src/include/config.h" />
49 50 <Unit filename="src/include/pw3270.h" />
50 51 <Unit filename="src/include/pw3270/actions.h" />
51 52 <Unit filename="src/include/pw3270/application.h" />
... ... @@ -67,6 +68,7 @@
67 68 <Unit filename="src/main/tools.c">
68 69 <Option compilerVar="CC" />
69 70 </Unit>
  71 + <Unit filename="src/main/windows/resources.rc" />
70 72 <Unit filename="src/objects/actions/abstract.c">
71 73 <Option compilerVar="CC" />
72 74 </Unit>
... ... @@ -89,6 +91,9 @@
89 91 <Unit filename="src/objects/actions/simple.c">
90 92 <Option compilerVar="CC" />
91 93 </Unit>
  94 + <Unit filename="src/objects/actions/testprogram/testprogram.c">
  95 + <Option compilerVar="CC" />
  96 + </Unit>
92 97 <Unit filename="src/objects/actions/tools.c">
93 98 <Option compilerVar="CC" />
94 99 </Unit>
... ... @@ -116,6 +121,9 @@
116 121 <Unit filename="src/objects/application/open.c">
117 122 <Option compilerVar="CC" />
118 123 </Unit>
  124 + <Unit filename="src/objects/application/plugins.c">
  125 + <Option compilerVar="CC" />
  126 + </Unit>
119 127 <Unit filename="src/objects/application/private.h" />
120 128 <Unit filename="src/objects/keypad/attribute.c">
121 129 <Option compilerVar="CC" />
... ... @@ -130,6 +138,9 @@
130 138 <Option compilerVar="CC" />
131 139 </Unit>
132 140 <Unit filename="src/objects/keypad/private.h" />
  141 + <Unit filename="src/objects/keypad/testprogram/testprogram.c">
  142 + <Option compilerVar="CC" />
  143 + </Unit>
133 144 <Unit filename="src/objects/keypad/widget.c">
134 145 <Option compilerVar="CC" />
135 146 </Unit>
... ... @@ -173,6 +184,9 @@
173 184 <Unit filename="src/objects/toolbar/settings.c">
174 185 <Option compilerVar="CC" />
175 186 </Unit>
  187 + <Unit filename="src/objects/toolbar/testprogram/testprogram.c">
  188 + <Option compilerVar="CC" />
  189 + </Unit>
176 190 <Unit filename="src/objects/toolbar/toolbar.c">
177 191 <Option compilerVar="CC" />
178 192 </Unit>
... ... @@ -210,6 +224,9 @@
210 224 <Unit filename="src/objects/window/terminal.c">
211 225 <Option compilerVar="CC" />
212 226 </Unit>
  227 + <Unit filename="src/objects/window/testprogram/testprogram.c">
  228 + <Option compilerVar="CC" />
  229 + </Unit>
213 230 <Unit filename="src/objects/window/tools.c">
214 231 <Option compilerVar="CC" />
215 232 </Unit>
... ...
src/include/config.h.in
  Diff comments   View file @95e3d7e
1   -/*
2   - * "Software G3270, 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., 51 Franklin
19   - * St, Fifth Floor, Boston, MA 02110-1301 USA
20   - *
21   - * Este programa está nomeado como config.h e possui - linhas de código.
22   - *
23   - * Contatos:
24   - *
25   - * perry.werneck@gmail.com (Alexandre Perry de Souza Werneck)
26   - * erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça)
27   - *
28   - */
29   -
30   -#ifndef PW3270_CONFIG_H_INCLUDED
31   -
32   - #define PW3270_CONFIG_H_INCLUDED 1
33   -
34   - #undef PACKAGE_NAME
35   - #undef PACKAGE_VERSION
36   - #undef PACKAGE_RELEASE
37   - #undef PRODUCT_NAME
38   - #undef APPLICATION_ID
39   - #undef ENABLE_UNSTABLE_FEATURES
40   - #undef HAVE_MALLOC_H
41   - #undef HAVE_STRTOK_R
42   - #undef HAVE_LOCALTIME_R
43   -
44   -#endif /* PW3270_CONFIG_H_INCLUDED */
  1 +/* src/include/config.h.in. Generated from configure.ac by autoheader. */
45 2  
  3 +/* The application ID */
  4 +#undef APPLICATION_ID
  5 +
  6 +/* Are we using the unstable features? */
  7 +#undef ENABLE_UNSTABLE_FEATURES
  8 +
  9 +/* Define to 1 if you have the <dlfcn.h> header file. */
  10 +#undef HAVE_DLFCN_H
  11 +
  12 +/* Do we have gtk? */
  13 +#undef HAVE_GTK
  14 +
  15 +/* Define to 1 if you have the <inttypes.h> header file. */
  16 +#undef HAVE_INTTYPES_H
  17 +
  18 +/* Do we have libv3270? */
  19 +#undef HAVE_LIBV3270
  20 +
  21 +/* Do we have localtime_r? */
  22 +#undef HAVE_LOCALTIME_R
  23 +
  24 +/* do we have malloc.h? */
  25 +#undef HAVE_MALLOC_H
  26 +
  27 +/* Define to 1 if you have the <memory.h> header file. */
  28 +#undef HAVE_MEMORY_H
  29 +
  30 +/* Define to 1 if you have the <stdint.h> header file. */
  31 +#undef HAVE_STDINT_H
  32 +
  33 +/* Define to 1 if you have the <stdlib.h> header file. */
  34 +#undef HAVE_STDLIB_H
  35 +
  36 +/* Define to 1 if you have the <strings.h> header file. */
  37 +#undef HAVE_STRINGS_H
  38 +
  39 +/* Define to 1 if you have the <string.h> header file. */
  40 +#undef HAVE_STRING_H
  41 +
  42 +/* Do we have strtok_r? */
  43 +#undef HAVE_STRTOK_R
  44 +
  45 +/* Define to 1 if you have the <sys/stat.h> header file. */
  46 +#undef HAVE_SYS_STAT_H
  47 +
  48 +/* Define to 1 if you have the <sys/types.h> header file. */
  49 +#undef HAVE_SYS_TYPES_H
  50 +
  51 +/* Define to 1 if you have the <unistd.h> header file. */
  52 +#undef HAVE_UNISTD_H
  53 +
  54 +/* The tn3270 library name */
  55 +#undef LIBRARY_NAME
  56 +
  57 +/* Define to the sub-directory where libtool stores uninstalled libraries. */
  58 +#undef LT_OBJDIR
  59 +
  60 +/* Name of package */
  61 +#undef PACKAGE
  62 +
  63 +/* Define to the address where bug reports for this package should be sent. */
  64 +#undef PACKAGE_BUGREPORT
  65 +
  66 +/* The package major release */
  67 +#undef PACKAGE_MAJOR_RELEASE
  68 +
  69 +/* The package major version */
  70 +#undef PACKAGE_MAJOR_VERSION
  71 +
  72 +/* The package minor release */
  73 +#undef PACKAGE_MINOR_RELEASE
  74 +
  75 +/* The package minor version */
  76 +#undef PACKAGE_MINOR_VERSION
  77 +
  78 +/* Define to the full name of this package. */
  79 +#undef PACKAGE_NAME
  80 +
  81 +/* The package release */
  82 +#undef PACKAGE_RELEASE
  83 +
  84 +/* Define to the full name and version of this package. */
  85 +#undef PACKAGE_STRING
  86 +
  87 +/* Define to the one symbol short name of this package. */
  88 +#undef PACKAGE_TARNAME
  89 +
  90 +/* Define to the home page for this package. */
  91 +#undef PACKAGE_URL
  92 +
  93 +/* Define to the version of this package. */
  94 +#undef PACKAGE_VERSION
  95 +
  96 +/* The product name */
  97 +#undef PLUGIN_DIR
  98 +
  99 +/* The product name */
  100 +#undef PRODUCT_NAME
  101 +
  102 +/* Define to 1 if you have the ANSI C header files. */
  103 +#undef STDC_HEADERS
  104 +
  105 +/* Version number of package */
  106 +#undef VERSION
... ...
src/objects/application/application.c
  Diff comments   View file @95e3d7e
... ... @@ -302,7 +302,7 @@ static void pw3270Application_init(pw3270Application *app) {
302 302 g_settings_bind(app->settings, "ui-style", app, "ui-style", G_SETTINGS_BIND_DEFAULT);
303 303 }
304 304  
305   - pw3270_load_plugins_from_path(app, G_STRINGIFY(LIBDIR) G_DIR_SEPARATOR_S G_STRINGIFY(PRODUCT_NAME) "-plugins");
  305 + pw3270_load_plugins_from_path(app, PLUGIN_DIR);
306 306  
307 307 #endif // _WIN32
308 308  
... ...