diff --git a/Makefile.in b/Makefile.in index d562db8..a798c4c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -24,243 +24,234 @@ # erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça) # -#---[ Configuration values ]--------------------------------------------------- +#---[ Configuration ]-------------------------------------------------------------------- PACKAGE_NAME=@PACKAGE_NAME@ -PACKAGE_VERSION=@PACKAGE_VERSION@ -PACKAGE_LEVEL=@PACKAGE_LEVEL@ -PACKAGE_TARNAME=@PACKAGE_TARNAME@ -PACKAGE_DESCRIPTION=@PACKAGE_DESCRIPTION@ PRODUCT_NAME=@PRODUCT_NAME@ +INSTALL_PACKAGES=@INSTALL_PACKAGES@ -#---[ Paths ]------------------------------------------------------------------ +SOURCES= \ + $(wildcard src/objects/actions/*.c) \ + $(wildcard src/objects/actions/lib3270/*.c) \ + $(wildcard src/objects/window/*.c) \ + $(wildcard src/objects/terminal/*.c) \ + $(wildcard src/objects/toolbar/*.c) \ + $(wildcard src/main/*.c) \ + $(wildcard src/main/@OSNAME@/*.c) \ + $(wildcard src/main/@OSNAME@/*.rc) + +#---[ Tools ]---------------------------------------------------------------------------- + +CC=@CC@ +LD=@CC@ +LN_S=@LN_S@ +MKDIR=@MKDIR_P@ +INSTALL=@INSTALL@ +INSTALL_DATA=@INSTALL_DATA@ +INSTALL_PROGRAM=@INSTALL_PROGRAM@ +XGETTEXT=@XGETTEXT@ +MSGCAT=@MSGCAT@ +WINDRES=@WINDRES@ +AR=@AR@ +VALGRIND=@VALGRIND@ + +#---[ Paths ]---------------------------------------------------------------------------- prefix=@prefix@ exec_prefix=@exec_prefix@ bindir=@bindir@ sbindir=@sbindir@ libdir=@libdir@ +includedir=@includedir@ datarootdir=@datarootdir@ -localedir=${datarootdir}/locale +localedir=@localedir@ docdir=@docdir@ sysconfdir=@sysconfdir@ -mandir=@mandir@ BASEDIR=@BASEDIR@ POTDIR=$(BASEDIR)/.pot + +OBJDIR=$(BASEDIR)/.obj/$(PACKAGE_NAME) +OBJDBG=$(OBJDIR)/Debug +OBJRLS=$(OBJDIR)/Release + BINDIR=$(BASEDIR)/.bin BINDBG=$(BINDIR)/Debug BINRLS=$(BINDIR)/Release -#---[ Tools ]------------------------------------------------------------------ +#---[ Rules ]---------------------------------------------------------------------------- -CC=@CC@ -LD=@CC@ -LN_S=@LN_S@ -MKDIR=@MKDIR_P@ -MSGCAT=@MSGCAT@ -INSTALL=@INSTALL@ -INSTALL_DATA=@INSTALL_DATA@ -INSTALL_PROGRAM=@INSTALL_PROGRAM@ -HELP2MAN=@HELP2MAN@ -VALGRIND=@VALGRIND@ - -#---[ Release Targets ]------------------------------------------------------------------ - -all: \ - $(foreach MODULE, $(MODULES), $(BINRLS)/@DLLPREFIX@$(MODULE)@DLLEXT@) \ - $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \ - $(BINRLS)/libpw3270cpp.a \ - locale/$(PACKAGE_TARNAME).pot - -Release: \ - application \ - $(BINRLS)/libpw3270cpp.a +DEPENDS= \ + Makefile \ + src/include/*.h \ + src/objects/toolbar/private.h \ + src/objects/window/private.h \ + src/objects/actions/private.h \ + src/main/private.h -application: \ - $(foreach MODULE, $(MODULES), $(BINRLS)/@DLLPREFIX@$(MODULE)@DLLEXT@) \ - $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \ +CFLAGS= \ + @CFLAGS@ \ + -g \ + -Isrc/include \ + -DBUILD_DATE=`date +%Y%m%d` \ + @LIBV3270_CFLAGS@ \ + @GTK_CFLAGS@ -$(BINRLS)/libpw3270cpp.a: \ - src/libpw3270cpp/* +LIBS= \ + @LIBS@ \ + @GTK_LIBS@ \ + @LIBV3270_LIBS@ - @$(MAKE) -C src/libpw3270cpp Release +LDFLAGS= \ + @LDFLAGS@ #---[ Debug Rules ]---------------------------------------------------------------------- -$(BINDBG)/%@EXEEXT@: \ - $(foreach MODULE, $(MODULES), $(BINDBG)/@DLLPREFIX@$(MODULE)@DLLEXT@) \ - src/% \ - src/%/* +$(OBJDBG)/%.o: \ + %.c \ + $(DEPENDS) - @make -C src/$(notdir $(basename $@)) $@ + @echo $< ... + @$(MKDIR) $(@D) -#---[ Release Rules ]-------------------------------------------------------------------- + @$(CC) \ + $(CFLAGS) \ + -Wall -Wextra -fstack-check \ + -DDEBUG=1 \ + -o $@ -c $< -$(BINRLS)/%@EXEEXT@: \ - $(foreach MODULE, $(MODULES), $(BINDBG)/@DLLPREFIX@$(MODULE)@DLLEXT@) \ - src/% \ - src/%/* +$(OBJDBG)/%.o: \ + %.rc - @$(MAKE) -C src/$(notdir $(basename $@)) $@ + @echo $< ... + @$(MKDIR) $(@D) + @$(WINDRES) $< -O coff -o $@ -publish-release: \ - $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ +#---[ Release Rules ]-------------------------------------------------------------------- - @rm -f ~/public-html/release-$(PACKAGE_TARNAME)-@host_cpu@.zip - @zip \ - -9 -D \ - ~/public_html/release-$(PACKAGE_TARNAME)-@host_cpu@.zip \ - $(BINRLS)/* +$(OBJRLS)/%.o: \ + %.c \ + $(DEPENDS) -#---[ Install Rules ]-------------------------------------------------------------------- + @echo $< ... + @$(MKDIR) $(dir $@) + @$(CC) \ + $(CFLAGS) \ + -DNDEBUG=1 \ + -o $@ -c $< -install: \ - install-application \ - install-devel - -install-devel: \ - $(foreach MODULE, $(MODULES), install-$(MODULE)) \ - locale/$(PACKAGE_TARNAME).pot \ - install-sdk - - @$(MAKE) \ - -C src/libpw3270cpp \ - DESTDIR=$(DESTDIR) \ - install - -install-application: \ - install-pw3270 \ - install-branding \ - install-ui \ - install-locale - -ifneq ($(HELP2MAN),no) - @$(MKDIR) $(DESTDIR)/$(mandir)/man1 - @LD_LIBRARY_PATH=$(BINRLS) \ - $(HELP2MAN) \ - --version-string="$(PACKAGE_TARNAME) - $(PACKAGE_DESCRIPTION) Vrs. $(PACKAGE_VERSION)" \ - $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ | gzip --best --stdout - > $(DESTDIR)/$(mandir)/man1/$(PACKAGE_NAME).1.gz -endif +$(OBJRLS)/%.o: \ + %.rc - @$(MKDIR) $(DESTDIR)$(libdir)/@PRODUCT_NAME@-plugins + @echo $< ... + @$(MKDIR) $(@D) + @$(WINDRES) $< -O coff -o $@ -install-%: \ - modules/%/Makefile +#---[ Misc Rules ]----------------------------------------------------------------------- - @$(MAKE) -C `dirname $<` DESTDIR=$(DESTDIR) install +$(POTDIR)/$(PACKAGE_NAME)/%.pot: \ + %.c -install-%: \ - src/%/Makefile + @echo $(notdir $@) ... + @$(MKDIR) $(@D) + @$(XGETTEXT) \ + --language=C \ + --keyword=_ \ + --keyword=N_ \ + --keyword=MSG_:2 \ + --output=$@ \ + $< + @touch $@ - @$(MAKE) -C `dirname $<` DESTDIR=$(DESTDIR) install +$(POTDIR)/$(PACKAGE_NAME)/%.pot: \ + %.rc -install-%: \ - %/Makefile + @echo $< ... + @$(MKDIR) $(dir $@) + @touch $@ - @$(MAKE) -C `dirname $<` DESTDIR=$(DESTDIR) install +#---[ Release Targets ]------------------------------------------------------------------ -#---[ Misc Rules ]----------------------------------------------------------------------- +all: \ + $(BINRLS)/$(PACKAGE_NAME)@EXEEXT@ \ + $(POTDIR)/$(PACKAGE_NAME).pot -$(POTDIR)/%.pot: \ - $(DEPENDS) \ - ./src/%/* - - @echo $(notdir $@) ... - @mkdir -p `dirname $@` - @$(MAKE) -C src/$(basename $(notdir $@)) $@ +Release: \ + $(BINRLS)/$(PACKAGE_NAME)@EXEEXT@ \ + $(BINRLS)/static/$(PACKAGE_NAME).a -$(POTDIR)/%.pot: \ - $(datarootdir)/$(PRODUCT_NAME)/pot/%.pot - - @echo $(notdir $@) ... - @mkdir -p `dirname $@` - @cp "$^" "$@" +$(BINRLS)/$(PACKAGE_NAME)@EXEEXT@: \ + $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) -$(POTDIR)/%.pot: \ - ./modules/%/* \ - ./modules/%/src/* \ - ./modules/%/Makefile - - @echo $(notdir $@) ... - @mkdir -p `dirname $@` - @$(MAKE) -C modules/$(basename $(notdir $@)) $@ + @$(MKDIR) $(@D) + @echo $< ... + @$(LD) \ + -o $@ \ + $(LDFLAGS) \ + $^ \ + $(LIBS) -$(POTDIR)/%.pot: \ - ./modules/%/%.pot - - @echo $(notdir $@) ... - @mkdir -p `dirname $@` - @echo cp $^ $@ - @false +#---[ Install Targets ]------------------------------------------------------------------ -$(POTDIR)/%.pot: \ - ./%/* - - @echo $(notdir $@) ... - @mkdir -p `dirname $@` - @$(MAKE) -C $(basename $(notdir $@)) $@ +install: \ + $(foreach PKG, $(INSTALL_PACKAGES), install-$(PKG)) -#---[ Debug Targets ]-------------------------------------------------------------------- +#---[ Misc Targets ]--------------------------------------------------------------------- -Debug: \ - $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ +$(POTDIR)/$(PACKAGE_NAME).pot: \ + $(foreach SRC, $(basename $(SOURCES)), $(POTDIR)/$(PACKAGE_NAME)/$(SRC).pot) -publish-debug: \ - $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ + @rm -f $@ + @$(MKDIR) $(@D) + @$(MSGCAT) --sort-output $^ > $@ - @rm -f ~/public-html/debug-$(PACKAGE_TARNAME)-@host_cpu@.zip - @zip \ - -9 -D \ - ~/public_html/debug-$(PACKAGE_TARNAME)-@host_cpu@.zip \ - $(BINDBG)/* +locale: \ + $(POTDIR)/$(PACKAGE_NAME).pot -$(BINDBG)/libpw3270cpp.a: \ - src/libpw3270cpp/* - @$(MAKE) -C src/libpw3270cpp Debug +#---[ Debug Targets ]-------------------------------------------------------------------- +Debug: \ + $(BINDBG)/$(PACKAGE_NAME)@EXEEXT@ + +$(BINDBG)/$(PACKAGE_NAME)@EXEEXT@: \ + $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o) + + @$(MKDIR) $(@D) + @echo $< ... + @$(LD) \ + -o $@ \ + $^ \ + $(LDFLAGS) \ + $(LIBS) + run: \ - $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ + $(BINDBG)/$(PACKAGE_NAME)@EXEEXT@ - @LD_LIBRARY_PATH=$(BINDBG) $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ + @LD_LIBRARY_PATH=$(BINDBG) \ + $(BINDBG)/$(PACKAGE_NAME)@EXEEXT@ mem-check: \ - $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ + $(BINDBG)/$(PACKAGE_NAME)@EXEEXT@ ifeq ($(VALGRIND),no) @LD_LIBRARY_PATH=$(BINDBG) \ - $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ + $(BINDBG)/$(PACKAGE_NAME)@EXEEXT@ else @touch valgrind.suppression @LD_LIBRARY_PATH=$(BINDBG) \ $(VALGRIND) --leak-check=full --track-origins=yes --gen-suppressions=all --suppressions=valgrind.suppression \ - $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ + $(BINDBG)/$(PACKAGE_NAME)@EXEEXT@ endif -#---[ Misc Targets ]--------------------------------------------------------------------- - -locale: \ - locale/$(PACKAGE_TARNAME).pot - - $(MAKE) -C locale all -locale/$(PACKAGE_TARNAME).pot: \ - $(POTDIR)/pw3270.pot \ - $(POTDIR)/lib3270.pot \ - $(POTDIR)/libv3270.pot \ - $(POTDIR)/ui.pot - - @rm -f $@ - @mkdir -p `dirname $@` - @$(MSGCAT) --sort-output $^ > $@ #---[ Clean Targets ]-------------------------------------------------------------------- @@ -268,21 +259,23 @@ clean: \ cleanDebug \ cleanRelease - @rm -fr $(POTDIR) - @rm -fr $(BINDIR)92 + @rm -fr $(BASEDIR)/.tmp/$(PACKAGE_NAME) + @rm -fr $(POTDIR)/$(PACKAGE_NAME) + @rm -fr src/include/marshal cleanDebug: @rm -fr $(OBJDBG) @rm -fr $(BINDBG) - @$(MAKE) -C src/pw3270 $@ cleanRelease: @rm -fr $(OBJRLS) @rm -fr $(BINRLS) - @$(MAKE) -C src/pw3270 $@ - + @rm -fr $(POTDIR) +clean: \ + cleanDebug \ + cleanRelease diff --git a/configure.ac b/configure.ac index db3d3d1..00ea01e 100644 --- a/configure.ac +++ b/configure.ac @@ -16,15 +16,13 @@ dnl obter mais detalhes. dnl dnl Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este dnl programa; se não, escreva para a Free Software Foundation, Inc., 59 Temple + dnl Place, Suite 330, Boston, MA, 02111-1307, USA dnl dnl Contatos: dnl dnl perry.werneck@gmail.com (Alexandre Perry de Souza Werneck) dnl erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça) -dnl licinio@bb.com.br (Licínio Luis Branco) -dnl kraucer@bb.com.br (Kraucer Fernandes Mazuco) -dnl macmiranda@bb.com.br (Marco Aurélio Caldas Miranda) dnl dnl Process this file with autoconf to produce a configure script. @@ -39,6 +37,9 @@ AC_INIT([pw3270], [5.2], [perry.werneck@gmail.com]) dnl Place auxilliary scripts here. AC_CONFIG_AUX_DIR([scripts]) +dnl Recommended for gtk-doc (https://developer.gnome.org/gtk-doc-manual/stable/settingup_autoconf.html.en) +AC_CONFIG_MACRO_DIR(m4) + dnl Compute the canonical host-system type AC_CANONICAL_HOST @@ -48,284 +49,120 @@ AC_CONFIG_HEADER([src/include/config.h]) dnl Initialise automake stuff. AM_INIT_AUTOMAKE -dnl Check for iconv -AM_ICONV - dnl Checks for programs. -AC_PROG_CXX AC_PROG_CC AC_PROG_SED AC_PROG_LN_S -AC_PATH_TOOL([AR], [ar], [ar]) -AC_PATH_TOOL([GENMARSHAL], [glib-genmarshal], [glib-genmarshal]) -AC_PATH_TOOL([HELP2MAN], [help2man], [no]) -AC_PATH_TOOL([DESKTOP_INSTALL],[desktop-file-install],[no]) AC_LANG([C]) dnl --------------------------------------------------------------------------- -dnl Initialize defaults -dnl --------------------------------------------------------------------------- - -DBG_CFLAGS="-g -fstack-check -DDEBUG=1" -RLS_CFLAGS="-DNDEBUG=1" -APP_RESOURCES="" -APP_LDFLAGS="" -DLL_LDFLAGS="-shared" -STATIC_LDFLAGS="" - -dnl --------------------------------------------------------------------------- -dnl Version & customization -dnl --------------------------------------------------------------------------- - -AC_ARG_WITH([description], [AS_HELP_STRING([--with-description], [Application description])], [ app_cv_description="$withval" ],[ app_cv_description="IBM 3270 Terminal emulator" ]) -AC_DEFINE_UNQUOTED(PACKAGE_DESCRIPTION,"$app_cv_description") -AC_SUBST(PACKAGE_DESCRIPTION,"$app_cv_description") - -app_vrs_major=$(echo $VERSION | cut -d. -f1) -app_vrs_minor=$(echo $VERSION | cut -d. -f2) - -AC_DEFINE_UNQUOTED(PACKAGE_MAJOR_VERSION, $app_vrs_major) -AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor) - -AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major) -AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor) - -AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_cv_release="$withval" ],[ app_cv_release="`date +%-y`.`date +%-m`.`date +%-d`" ]) -AC_ARG_WITH([session-name], [AS_HELP_STRING([--with-session-name], [Set default session name])], [ AC_DEFINE_UNQUOTED(DEFAULT_SESSION_NAME, $withval) ],[ AC_MSG_NOTICE([No default session name.]) ]) - -app_rls_major=$(echo $app_cv_release.0.0 | cut -d. -f1) -app_rls_minor=$(echo $app_cv_release.0.0 | cut -d. -f2) - -AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, $app_cv_release) -AC_DEFINE_UNQUOTED(PACKAGE_MAJOR_RELEASE, $app_rls_major) -AC_DEFINE_UNQUOTED(PACKAGE_MINOR_RELEASE, $app_rls_minor) - -AC_SUBST(PACKAGE_RELEASE,$app_cv_release) -AC_SUBST(PACKAGE_MAJOR_RELEASE,$app_rls_major) -AC_SUBST(PACKAGE_MINOR_RELEASE,$app_rls_minor) - -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` ]) -AC_DEFINE_UNQUOTED(PRODUCT_NAME, $app_cv_product) -AC_SUBST(PRODUCT_NAME,$app_cv_product) - -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` ]) -AC_DEFINE_UNQUOTED(LIBRARY_NAME, $app_cv_library) -AC_SUBST(LIBRARY_NAME,$app_cv_library) - -dnl --------------------------------------------------------------------------- dnl Check for OS specifics dnl --------------------------------------------------------------------------- -if test $host != $build; then - AC_CHECK_PROGS(HOST_CC, gcc cc) -else - HOST_CC=$CC -fi +INSTALL_PACKAGES="" case "$host" in *-mingw32|*-pc-msys) - app_cv_osname="windows" - EXEEXT=".exe" - DLLPREFIX="" - DLLEXT=".dll" - APP_RESOURCES="resources.rc" - APP_LDFLAGS="-mwindows" - - DBG_CFLAGS="-DDEBUG=1" - RLS_CFLAGS="-DNDEBUG=1" CFLAGS="$CFLAGS -pthread -D_WIN32_WINNT=0x0600" + LDFLAGS="$LDFLAGS -pthread" LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32" + INSTALL_PACKAGES="windows-lib ${INSTALL_PACKAGES}" + app_win32_revision=$(date +%-y.%-m.%-d.%-H) AC_SUBST(WIN32_VERSION,$app_win32_revision) app_win32_file_version=$(date +%-y,%-m,%-d,%-H) AC_SUBST(WIN32_FILE_VERSION,$app_win32_file_version) - dnl https://stackoverflow.com/questions/13768515/how-to-do-static-linking-of-libwinpthread-1-dll-in-mingw - STATIC_LDFLAGS="-static-libstdc++ -static-libgcc -static" - DLL_LDFLAGS="-shared -Wl,--add-stdcall-alias" - - AC_DEFINE(ENABLE_WINDOWS_REGISTRY) - - AC_CONFIG_FILES(win/makeruntime.sh) - AC_CONFIG_FILES(win/copydeps.sh) - AC_CONFIG_FILES(win/$PACKAGE_TARNAME.nsi) - AC_CONFIG_FILES(src/pw3270/windows/resources.rc) - - if test "$host_cpu" = "x86_64"; then - app_cv_programfiles="PROGRAMFILES64" - app_cv_winarch="64" - else - app_cv_programfiles="PROGRAMFILES" - app_cv_winarch="32" - fi - - AC_SUBST(PROGRAMFILES,$app_cv_programfiles) - AC_SUBST(WINARCH,$app_cv_winarch) - AC_SUBST(LIBEXT,.dll) - ;; - - *-apple-*) - EXEEXT="" - DLLPREFIX="lib" - DLLEXT=".so" - - DBG_CFLAGS="$DBG_CFLAGS -DDATADIR=\$(BASEDIR)" - - CFLAGS="$CFLAGS -Wall -Werror" - - LIBS="-pthread $LIBS" - - AC_SUBST(LIBEXT,.so.$app_vrs_major.$app_vrs_minor) + AC_CONFIG_FILES(src/main/windows/resources.rc) ;; *) app_cv_osname="linux" - EXEEXT="" - DLLPREFIX="lib" - DLLEXT=".so" - DBG_CFLAGS="$DBG_CFLAGS -DDATADIR=\$(BASEDIR)" - RLS_CFLAGS="$RLS_CFLAGS -DDATADIR=\$(datarootdir)/\$(PACKAGE_NAME)" + CFLAGS="$CFLAGS -pthread" + LDFLAGS="$LDFLAGS -pthread" - # LIBS="-Wl,--no-allow-shlib-undefined,--as-needed,--no-undefined -pthread $LIBS" - LIBS="-pthread $LIBS" + INSTALL_PACKAGES="linux-lib ${INSTALL_PACKAGES}" - AC_SUBST(LIBEXT,.so.$app_vrs_major.$app_vrs_minor) + app_cv_static='no' esac AC_SUBST(OSNAME,$app_cv_osname) -AC_SUBST(DBG_CFLAGS) -AC_SUBST(RLS_CFLAGS) -AC_SUBST(EXEEXT) -AC_SUBST(DLLPREFIX) +AC_SUBST(LIBS) +AC_SUBST(LOGDIR) AC_SUBST(DLLEXT) -AC_SUBST(APP_RESOURCES) -AC_SUBST(APP_LDFLAGS) +AC_SUBST(DLLPREFIX) AC_SUBST(DLL_LDFLAGS) -AC_SUBST(STATIC_LDFLAGS) dnl --------------------------------------------------------------------------- dnl Check for other programs dnl --------------------------------------------------------------------------- -AC_PATH_TOOL([RPMBUILD], [rpmbuild], [no]) -AC_PATH_TOOL([MAKENSIS], [makensis], [no]) AC_PATH_TOOL([AR], [ar], [ar]) +AC_PATH_TOOL([CONVERT], [convert], [no]) +AC_PATH_TOOL([OPTIPNG],[optipng],[no]) +AC_PATH_TOOL([ZIP],[zip],[no]) +AC_PATH_TOOL([DLLTOOL],[dlltool],[no]) AC_PATH_TOOL([WINDRES], [windres], [no]) -AC_PATH_TOOL([DBUSBINDINGTOOL],[dbus-binding-tool],[no]) PKG_CHECK_EXISTS dnl --------------------------------------------------------------------------- -dnl Check for libintl +dnl Version info dnl --------------------------------------------------------------------------- -INTL_LIBS="" +AC_SUBST(PACKAGE_DESCRIPTION,"IBM 3270 Terminal emulator") -AC_PATH_TOOL([XGETTEXT], [xgettext], [no]) -AC_PATH_TOOL([MSGCAT], [msgcat], [no]) -AC_PATH_TOOL([MSGINIT], [msginit], [no]) -AC_PATH_TOOL([MSGMERGE], [msgmerge], [no]) -AC_PATH_TOOL([MSGFMT], [msgfmt], [no]) -AC_PATH_TOOL([VALGRIND], [valgrind], [no]) -AC_PATH_TOOL([SVG2PNG],[rsvg-convert],[no]) -AC_PATH_TOOL([CONVERT], [convert], [no]) -AC_PATH_TOOL([OPTIPNG],[optipng],[no]) +app_vrs_major=$(echo $VERSION | cut -d. -f1) +app_vrs_minor=$(echo $VERSION | cut -d. -f2) -AC_CHECK_HEADER(libintl.h, [ - AC_DEFINE(HAVE_LIBINTL, 1) +AC_DEFINE_UNQUOTED(PACKAGE_MAJOR_VERSION, $app_vrs_major) +AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor) - case "$host" in - *-mingw32|*-pc-msys) - INTL_LIBS="-lintl" - ;; +AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major) +AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor) - *) - INTL_LIBS="" +AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_cv_release="$withval" ],[ app_cv_release="`date +%-y`.`date +%-m`.`date +%-d`" ]) - esac +app_rls_major=$(echo $app_cv_release.0.0 | cut -d. -f1) +app_rls_minor=$(echo $app_cv_release.0.0 | cut -d. -f2) -]) +AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, $app_cv_release) +AC_DEFINE_UNQUOTED(PACKAGE_MAJOR_RELEASE, $app_rls_major) +AC_DEFINE_UNQUOTED(PACKAGE_MINOR_RELEASE, $app_rls_minor) -AC_SUBST(INTL_LIBS) +AC_SUBST(PACKAGE_RELEASE,$app_cv_release) +AC_SUBST(PACKAGE_MAJOR_RELEASE,$app_rls_major) +AC_SUBST(PACKAGE_MINOR_RELEASE,$app_rls_minor) dnl --------------------------------------------------------------------------- -dnl Check for ELF symbol visibility support +dnl Check for LIBV3270 dnl --------------------------------------------------------------------------- -m4_define([GLIB_CHECK_COMPILE_WARNINGS], -[m4_ifvaln([$1], [AC_LANG_CONFTEST([$1])])dnl -rm -f conftest.$ac_objext -glib_ac_compile_save="$ac_compile" -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext' -AS_IF([_AC_EVAL_STDERR($ac_compile) && - AC_TRY_COMMAND([(if test -s conftest.err; then false ; else true; fi)])], - [$2], - [echo "$as_me: failed program was:" >&AS_MESSAGE_LOG_FD -cat conftest.$ac_ext >&AS_MESSAGE_LOG_FD -m4_ifvaln([$3],[$3])dnl]) -ac_compile="$glib_ac_compile_save" -rm -f conftest.$ac_objext conftest.err m4_ifval([$1], [conftest.$ac_ext])[]dnl -])# GLIB_CHECK_COMPILE_WARNINGS - -AC_MSG_CHECKING(for GNUC visibility attribute) -GLIB_CHECK_COMPILE_WARNINGS([ -void -__attribute__ ((visibility ("hidden"))) - f_hidden (void) -{ -} -void -__attribute__ ((visibility ("internal"))) - f_internal (void) -{ -} -void -__attribute__ ((visibility ("protected"))) - f_protected (void) -{ -} -void -__attribute__ ((visibility ("default"))) - f_default (void) -{ -} -int main (int argc, char **argv) -{ - f_hidden(); - f_internal(); - f_protected(); - f_default(); - return 0; -} -],g_have_gnuc_visibility=yes,g_have_gnuc_visibility=no) -AC_MSG_RESULT($g_have_gnuc_visibility) -if test x$g_have_gnuc_visibility = xyes; then - AC_DEFINE(HAVE_GNUC_VISIBILITY, 1, [supports GCC visibility attributes]) -fi + +PKG_CHECK_MODULES( [LIBV3270], [libv3270], AC_DEFINE(HAVE_LIBV3270), AC_MSG_ERROR([LIBV3270 not present.])) + +AC_SUBST(LIBV3270_LIBS) +AC_SUBST(LIBV3270_CFLAGS) + +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` ]) +AC_DEFINE_UNQUOTED(PRODUCT_NAME, $app_cv_product) +AC_SUBST(PRODUCT_NAME,$app_cv_product) dnl --------------------------------------------------------------------------- -dnl Check for compiler visibility flag +dnl Check for GTK dnl --------------------------------------------------------------------------- -AC_MSG_CHECKING(whether $CC accepts -fvisibility=hidden) -AC_CACHE_VAL(app_cv_fvisibility_ok, -[ac_save_cc="$CC" -CC="$CC -fvisibility=hidden" -AC_TRY_RUN([int main() { return 0; }], - app_cv_fvisibility_ok=yes, - app_cv_fvisibility_ok=no, - app_cv_fvisibility_ok=no) -CC="$ac_save_cc"]) -AC_MSG_RESULT($app_cv_fvisibility_ok) -if test $app_cv_fvisibility_ok = yes; then - CFLAGS="$CFLAGS -fvisibility=hidden" - CXXFLAGS="$CXXFLAGS -fvisibility=hidden" -fi + +PKG_CHECK_MODULES( [GTK], [gtk+-3.0 glib-2.0 gmodule-2.0], AC_DEFINE(HAVE_GTK), AC_MSG_ERROR([GTK not present.])) + +AC_SUBST(GTK_LIBS) +AC_SUBST(GTK_CFLAGS) +AC_SUBST(GTK_MODVERSION,`$PKG_CONFIG --modversion gtk+-3.0`) dnl --------------------------------------------------------------------------- dnl Check for pic @@ -335,138 +172,15 @@ AC_ARG_ENABLE([pic], [ app_cv_pic="$enableval" ],[ - - case "$host_cpu" in - x86_64) - app_cv_pic="yes" - ;; - - aarch64) - app_cv_pic="yes" - ;; - - *) - app_cv_pic="no" - esac - -dnl case "$host" in -dnl *-mingw32|*-pc-msys) -dnl app_cv_pic="no" -dnl ;; -dnl -dnl *) -dnl if test "$host_cpu" = "x86_64"; then -dnl app_cv_pic="yes" -dnl else -dnl app_cv_pic="no" -dnl fi -dnl esac + app_cv_pic="yes" ]) if test "$app_cv_pic" == "yes"; then CFLAGS="$CFLAGS -fPIC" - CXXFLAGS="$CXXFLAGS -fPIC" -fi - -dnl --------------------------------------------------------------------------- -dnl Check for D-Bus -dnl --------------------------------------------------------------------------- - -PKG_CHECK_MODULES( [DBUS], [dbus-1], app_cv_libdbus=yes, AC_MSG_NOTICE([ No DBUS support.]) ) -AC_SUBST(DBUS_LIBS) -AC_SUBST(DBUS_CFLAGS) - -PKG_CHECK_MODULES( [GDBUS], [dbus-glib-1], app_cv_dbus=yes, AC_MSG_NOTICE([No GDBUS support.]) ) -AC_SUBST(GDBUS_LIBS) -AC_SUBST(GDBUS_CFLAGS) - -if test "$app_cv_dbus" == "yes"; then - AC_DEFINE(HAVE_DBUS) + LDFLAGS="$LDFLAGS -fPIC" fi dnl --------------------------------------------------------------------------- -dnl Lib3270 flags -dnl --------------------------------------------------------------------------- - -PKG_CHECK_MODULES( [LIB3270], [lib3270], AC_DEFINE(HAVE_LIB3270), AC_MSG_ERROR([ No LIB3270 devel.]) ) -AC_SUBST(LIB3270_CFLAGS) -AC_SUBST(LIB3270_LIBS) - -PKG_CHECK_MODULES( [LIBV3270], [libv3270], AC_DEFINE(HAVE_LIBV3270), AC_MSG_ERROR([ No V3270 devel.]) ) -AC_SUBST(LIBV3270_CFLAGS) -AC_SUBST(LIBV3270_LIBS) - -AC_ARG_WITH([application-name], [AS_HELP_STRING([--with-application-name], [Set application name])], [ app_cv_appname="$withval" ],[ app_cv_appname=`pkg-config --variable=product_name lib3270` ]) - -AC_DEFINE_UNQUOTED(APPLICATION_NAME,$app_cv_appname) -AC_SUBST(APPLICATION_NAME,$app_cv_appname) - -AC_SUBST(PW3270_CFLAGS,-I$ac_pwd/src/include) -AC_SUBST(PW3270_LIBS,-l$PACKAGE_TARNAME) - -dnl --------------------------------------------------------------------------- -dnl Check for headers -dnl --------------------------------------------------------------------------- - -AC_CHECK_HEADER(malloc.h, AC_DEFINE(HAVE_MALLOC_H,,[do we have malloc.h?])) - -AC_CHECK_FUNCS(getaddrinfo, AC_DEFINE(HAVE_GETADDRINFO) ) -AC_CHECK_FUNC(vasprintf, AC_DEFINE(HAVE_VASPRINTF) ) -AC_CHECK_FUNC(strtok_r, AC_DEFINE(HAVE_STRTOK_R) ) - -AC_ARG_WITH([inet-ntop], [AS_HELP_STRING([--with-inet-ntop], [Assume that inet_nto() is available])], [ app_cv_inet_ntop="$withval" ],[ app_cv_inet_ntop="auto" ]) - -if test "$app_cv_inet_ntop" == "auto"; then - - case "$host" in - *-mingw32|*-pc-msys) - app_cv_inet_ntop="yes" - ;; - - *) - AC_CHECK_FUNC(inet_ntop, app_cv_inet_ntop="yes" ) - - esac - -fi - -if test "$app_cv_inet_ntop" == "yes"; then - AC_DEFINE(HAVE_INET_NTOP) -fi - -PKG_CHECK_EXISTS - -dnl --------------------------------------------------------------------------- -dnl Check for GTK -dnl --------------------------------------------------------------------------- - -PKG_CHECK_MODULES( [GTK], [gtk+-3.0 gmodule-2.0], [ GTK_VERSION="3.0" ], [ PKG_CHECK_MODULES( [GTK], [gtk+-2.0 >= 2.14 gthread-2.0 gmodule-2.0], [ GTK_VERSION="2.0" ] ) ], [ ] ) - -AC_SUBST(GTK_LIBS) -AC_SUBST(GTK_CFLAGS) -AC_SUBST(GTK_VERSION) -AC_SUBST(GTK_MODVERSION,`$PKG_CONFIG --modversion gtk+-$GTK_VERSION`) - -dnl --------------------------------------------------------------------------- -dnl Check for GLIB -dnl --------------------------------------------------------------------------- - -PKG_CHECK_MODULES( [GLIB], [glib-2.0], AC_DEFINE(HAVE_GLIB) ) -AC_SUBST(GLIB_LIBS) -AC_SUBST(GLIB_CFLAGS) - -dnl --------------------------------------------------------------------------- -dnl Check for Libraries -dnl --------------------------------------------------------------------------- - -PKG_CHECK_MODULES( [LIBSSL], [libssl libcrypto], AC_DEFINE(HAVE_LIBSSL), AC_MSG_NOTICE([libssl not present.]) ) - -AC_SUBST(LIBSSL_LIBS) -AC_SUBST(LIBSSL_CFLAGS) - -AC_SEARCH_LIBS([dlopen], [dl], AC_DEFINE(HAVE_LIBDL), AC_MSG_NOTICE([libdl not present.])) - -dnl --------------------------------------------------------------------------- dnl Directory config dnl --------------------------------------------------------------------------- @@ -474,30 +188,12 @@ AC_ARG_WITH([build-dir], [AS_HELP_STRING([--with-build-dir], [Setup build path]) AC_SUBST(BASEDIR,$app_cv_buildir) dnl --------------------------------------------------------------------------- -dnl Output config -dnl --------------------------------------------------------------------------- - -dnl --------------------------------------------------------------------------- dnl Configure which files to generate. dnl --------------------------------------------------------------------------- -AC_CONFIG_FILES(src/pw3270/Makefile) -AC_CONFIG_FILES(src/pw3270/uiparser/Makefile) -AC_CONFIG_FILES(src/pw3270/common/Makefile) - -AC_CONFIG_FILES(src/libpw3270cpp/Makefile) - -AC_CONFIG_FILES(ui/Makefile) -AC_CONFIG_FILES(locale/Makefile) - -AC_CONFIG_FILES(branding/Makefile) -AC_CONFIG_FILES(branding/launcher.desktop) - -AC_CONFIG_FILES(sdk/pw3270.pc) -AC_CONFIG_FILES(sdk/Makefile) +AC_SUBST(INSTALL_PACKAGES) AC_CONFIG_FILES(Makefile) -AC_CONFIG_FILES(versions) dnl --------------------------------------------------------------------------- dnl Output the generated config.status script. diff --git a/mac/Info.plist b/mac/Info.plist deleted file mode 100644 index bea4d01..0000000 --- a/mac/Info.plist +++ /dev/null @@ -1,38 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - pw3270 - CFBundleGetInfoString - pw3270 - 5.0-0 - CFBundleIconFile - pw3270.icns - CFBundleIdentifier - pw3270 - CFBundleInfoDictionaryVersion - 6.0 - CFBundleLongVersionString - pw3270-pw3270 © Banco do Brasil S.A. - CFBundleName - pw3270 - CFBundlePackageType - APPL - CFBundleShortVersionString - 5.0 - CFBundleSignature - ???? - CFBundleVersion - 5.0 - CSResourcesFileMapped - - LSRequiresCarbon - - NSHumanReadableCopyright - Copyright (C) 2008 Banco do Brasil S.A., GNU General Public License. - LSMinimumSystemVersion - 10.6 - - diff --git a/mac/launcher.sh b/mac/launcher.sh deleted file mode 100755 index 008e6ba..0000000 --- a/mac/launcher.sh +++ /dev/null @@ -1,168 +0,0 @@ -#!/bin/sh - -if test "x$IGE_DEBUG_LAUNCHER" != x; then - set -x -fi - -if test "x$IGE_DEBUG_GDB" != x; then - EXEC="gdb --args" -else - EXEC=exec -fi - -name="`basename $0`" -tmp="`pwd`/$0" -tmp=`dirname "$tmp"` -tmp=`dirname "$tmp"` -bundle=`dirname "$tmp"` -bundle_contents="$bundle"/Contents -bundle_res="$bundle_contents"/Resources -bundle_lib="$bundle_res"/lib -bundle_bin="$bundle_res"/bin -bundle_data="$bundle_res"/share -bundle_etc="$bundle_res"/etc - -export DYLD_LIBRARY_PATH="$bundle_lib" -export XDG_CONFIG_DIRS="$bundle_etc"/xdg -export XDG_DATA_DIRS="$bundle_data" -export GTK_DATA_PREFIX="$bundle_res" -export GTK_EXE_PREFIX="$bundle_res" -export GTK_PATH="$bundle_res" - -export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc" -export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules" -export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders" -export PANGO_RC_FILE="$bundle_etc/pango/pangorc" - -APP=name -I18NDIR="$bundle_data/locale" -# Set the locale-related variables appropriately: -unset LANG LC_MESSAGES LC_MONETARY LC_COLLATE - -# Has a language ordering been set? -# If so, set LC_MESSAGES and LANG accordingly; otherwise skip it. -# First step uses sed to clean off the quotes and commas, to change - to _, and change the names for the chinese scripts from "Hans" to CN and "Hant" to TW. -APPLELANGUAGES=`defaults read .GlobalPreferences AppleLanguages | sed -En -e 's/\-/_/' -e 's/Hant/TW/' -e 's/Hans/CN/' -e 's/[[:space:]]*\"?([[:alnum:]_]+)\"?,?/\1/p' ` -if test "$APPLELANGUAGES"; then - # A language ordering exists. - # Test, item per item, to see whether there is an corresponding locale. - for L in $APPLELANGUAGES; do - #test for exact matches: - if test -f "$I18NDIR/${L}/LC_MESSAGES/$APP.mo"; then - export LANG=$L - break - fi - #This is a special case, because often the original strings are in US - #English and there is no translation file. - if test "x$L" == "xen_US"; then - export LANG=$L - break - fi - #OK, now test for just the first two letters: - if test -f "$I18NDIR/${L:0:2}/LC_MESSAGES/$APP.mo"; then - export LANG=${L:0:2} - break - fi - #Same thing, but checking for any english variant. - if test "x${L:0:2}" == "xen"; then - export LANG=$L - break - fi; - done -fi -unset APPLELANGUAGES L - -# If we didn't get a language from the language list, try the Collation preference, in case it's the only setting that exists. -APPLECOLLATION=`defaults read .GlobalPreferences AppleCollationOrder` -if test -z ${LANG} -a -n $APPLECOLLATION; then - if test -f "$I18NDIR/${APPLECOLLATION:0:2}/LC_MESSAGES/$APP.mo"; then - export LANG=${APPLECOLLATION:0:2} - fi -fi -if test ! -z $APPLECOLLATION; then - export LC_COLLATE=$APPLECOLLATION -fi -unset APPLECOLLATION - -# Continue by attempting to find the Locale preference. -APPLELOCALE=`defaults read .GlobalPreferences AppleLocale` - -if test -f "$I18NDIR/${APPLELOCALE:0:5}/LC_MESSAGES/$APP.mo"; then - if test -z $LANG; then - export LANG="${APPLELOCALE:0:5}" - fi - -elif test -z $LANG -a -f "$I18NDIR/${APPLELOCALE:0:2}/LC_MESSAGES/$APP.mo"; then - export LANG="${APPLELOCALE:0:2}" -fi - -#Next we need to set LC_MESSAGES. If at all possilbe, we want a full -#5-character locale to avoid the "Locale not supported by C library" -#warning from Gtk -- even though Gtk will translate with a -#two-character code. -if test -n $LANG; then -#If the language code matches the applelocale, then that's the message -#locale; otherwise, if it's longer than two characters, then it's -#probably a good message locale and we'll go with it. - if test $LANG == ${APPLELOCALE:0:5} -o $LANG != ${LANG:0:2}; then - export LC_MESSAGES=$LANG -#Next try if the Applelocale is longer than 2 chars and the language -#bit matches $LANG - elif test $LANG == ${APPLELOCALE:0:2} -a $APPLELOCALE > ${APPLELOCALE:0:2}; then - export LC_MESSAGES=${APPLELOCALE:0:5} -#Fail. Get a list of the locales in $PREFIX/share/locale that match -#our two letter language code and pick the first one, special casing -#english to set en_US - elif test $LANG == "en"; then - export LC_MESSAGES="en_US" - else - LOC=`find $PREFIX/share/locale -name $LANG???` - for L in $LOC; do - export LC_MESSAGES=$L - done - fi -else -#All efforts have failed, so default to US english - export LANG="en_US" - export LC_MESSAGES="en_US" -fi -CURRENCY=`echo $APPLELOCALE | sed -En 's/.*currency=([[:alpha:]]+).*/\1/p'` -if test "x$CURRENCY" != "x"; then -#The user has set a special currency. Gtk doesn't install LC_MONETARY files, but Apple does in /usr/share/locale, so we're going to look there for a locale to set LC_CURRENCY to. - if test -f /usr/local/share/$LC_MESSAGES/LC_MONETARY; then - if test -a `cat /usr/local/share/$LC_MESSAGES/LC_MONETARY` == $CURRENCY; then - export LC_MONETARY=$LC_MESSAGES - fi - fi - if test -z "$LC_MONETARY"; then - FILES=`find /usr/share/locale -name LC_MONETARY -exec grep -H $CURRENCY {} \;` - if test -n "$FILES"; then - export LC_MONETARY=`echo $FILES | sed -En 's%/usr/share/locale/([[:alpha:]_]+)/LC_MONETARY.*%\1%p'` - fi - fi -fi -#No currency value means that the AppleLocale governs: -if test -z "$LC_MONETARY"; then - LC_MONETARY=${APPLELOCALE:0:5} -fi -#For Gtk, which only looks at LC_ALL: -export LC_ALL=$LC_MESSAGES - -unset APPLELOCALE FILES LOC - -if test -f "$bundle_lib/charset.alias"; then - export CHARSETALIASDIR="$bundle_lib" -fi - -# Extra arguments can be added in environment.sh. -EXTRA_ARGS= -if test -f "$bundle_res/environment.sh"; then - source "$bundle_res/environment.sh" -fi - -# Strip out the argument added by the OS. -if [ x`echo "x$1" | sed -e "s/^x-psn_.*//"` == x ]; then - shift 1 -fi - -$EXEC "$bundle_contents/MacOS/$name-bin" $* $EXTRA_ARGS diff --git a/mac/pw3270.bundle.in b/mac/pw3270.bundle.in deleted file mode 100644 index 9513092..0000000 --- a/mac/pw3270.bundle.in +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - ${env:JHBUILD_PREFIX} - ${project}/../.bin/Release - - - ${env:HOME}/Desktop - - - - - - - - - - ${project}/launcher.sh - - - - - gtk+-3.0 - - - - ${project}/Info.plist - - ${prefix:bin}/pw3270 - - ${prefix:bin}/lib/*.so.@VERSION@ - - - - - ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/immodules/*.so - - - - - ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/printbackends/*.so - - - - - ${prefix}/lib/gdk-pixbuf-2.0/${pkg:gdk-pixbuf-2.0:gdk_pixbuf_binary_version}/loaders/*.so - - - - ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/ - - - - ${prefix}/etc/pango/ - - - - - ${prefix}/share/locale - - - - ${project}/../.bin/Release/usr/local/share/locale/pt_BR/LC_MESSAGES/pw3270.mo - - - - - - ${project}/../ui/00default.xml - - - - ${project}/../colors.conf - - - - ${project}/../LICENCA - - - - ${project}/../LICENSE - - - - ${project}/../AUTHORS - - - - - ${prefix}/share/themes - - - - - ${project}/pw3270.icns - - - - - - - - - Tango - - - diff --git a/mac/pw3270.icns b/mac/pw3270.icns deleted file mode 100644 index e68e4a0..0000000 Binary files a/mac/pw3270.icns and /dev/null differ diff --git a/pw3270.cbp b/pw3270.cbp index e5c7b1f..55e52f7 100644 --- a/pw3270.cbp +++ b/pw3270.cbp @@ -42,212 +42,54 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - + + - + - + - + - - - - - + - + + - + - - - - - - - - - - - - - + + - + - + + - - + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/include/config.h.in b/src/include/config.h.in index 228c745..39fdcb9 100644 --- a/src/include/config.h.in +++ b/src/include/config.h.in @@ -24,40 +24,17 @@ * * perry.werneck@gmail.com (Alexandre Perry de Souza Werneck) * erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça) - * licinio@bb.com.br (Licínio Luis Branco) - * kraucer@bb.com.br (Kraucer Fernandes Mazuco) * */ -#ifndef PW3270_CONFIG_INCLUDED +#ifndef PW3270_CONFIG_H_INCLUDED - #define PW3270_CONFIG_INCLUDED 1 + #define PW3270_CONFIG_H_INCLUDED 1 #undef PACKAGE_NAME #undef PACKAGE_VERSION #undef PACKAGE_RELEASE #undef PRODUCT_NAME - #undef PACKAGE_DESCRIPTION - #undef DEFAULT_SESSION_NAME - #undef APPLICATION_NAME - - #undef HAVE_GNUC_VISIBILITY - #undef HAVE_LIBM - #undef HAVE_LIBINTL - #undef HAVE_GETADDRINFO - #undef HAVE_SYSLOG - #undef HAVE_DBUS - #undef HAVE_VASPRINTF - #undef HAVE_INET_NTOP - - #undef HAVE_ICONV - #undef ICONV_CONST - - #undef ENABLE_WINDOWS_REGISTRY - - #undef HAVE_GNOME - #undef HAVE_GTKMAC - -#endif /* PW3270_CONFIG_INCLUDED */ +#endif /* PW3270_CONFIG_H_INCLUDED */ diff --git a/src/main/windows/resources.rc.in b/src/main/windows/resources.rc.in new file mode 100644 index 0000000..307d0d1 --- /dev/null +++ b/src/main/windows/resources.rc.in @@ -0,0 +1,31 @@ +#include + +1 ICON @PACKAGE_TARNAME@.ico + +VS_VERSION_INFO VERSIONINFO +FILEVERSION @WIN32_FILE_VERSION@ +PRODUCTVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@,@PACKAGE_MINOR_RELEASE@ + +BEGIN + + BLOCK "StringFileInfo" + BEGIN + BLOCK "080904E4" + BEGIN + VALUE "FileDescription", "@PACKAGE_DESCRIPTION@\0" + VALUE "CompanyName", "Banco do Brasil S/A.\0" + VALUE "FileVersion", "@WIN32_VERSION@\0" + VALUE "LegalCopyright", "(C) 2017 Banco do Brasil S/A. All Rights Reserved\0" + VALUE "OriginalFilename", "@APPLICATION_NAME@.exe\0" + VALUE "ProductName", "@PRODUCT_NAME@\0" + VALUE "ProductVersion", "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@\0" + END + END + + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x809, 0x04E4 + END + +END + diff --git a/src/objects/actions/window.c b/src/objects/actions/window.c index 8d642d3..14dd3f3 100644 --- a/src/objects/actions/window.c +++ b/src/objects/actions/window.c @@ -38,39 +38,15 @@ void pw3270_window_add_actions(GtkWidget * appwindow) { - GActionMap * map = G_ACTION_MAP(appwindow); - GtkWidget * terminal = pw3270_window_get_terminal_widget(appwindow); + GActionMap * map = G_ACTION_MAP(appwindow); size_t ix; - /* - GAction *action = pw3270_action_new_from_lib3270(lib3270_action_get_by_name("testpattern")); - pw3270_action_set_terminal_widget(action,terminal); - - debug("--> \"%s\"",pw3270_action_get_name(action)); - - g_action_map_add_action(map,action); - - debug("--> \"%s\"",pw3270_action_get_name(action)); - */ - - /* - GAction *action = pw3270_toggle_action_new_from_lib3270(lib3270_get_toggles() + LIB3270_TOGGLE_INSERT); - pw3270_action_set_terminal_widget(action,terminal); - - debug("--> \"%s\"",pw3270_action_get_name(action)); - - g_action_map_add_action(map,action); - - debug("--> \"%s\"",pw3270_action_get_name(action)); - */ - // Map lib3270 actions { const LIB3270_ACTION * actions = lib3270_get_actions(); for(ix = 0; actions[ix].name; ix++) { GAction *action = pw3270_action_new_from_lib3270(&actions[ix]); - pw3270_action_set_terminal_widget(action,terminal); g_action_map_add_action(map,action); } @@ -82,7 +58,6 @@ for(ix = 0; toggles[ix].name; ix++) { GAction *action = pw3270_toggle_action_new_from_lib3270(&toggles[ix]); - pw3270_action_set_terminal_widget(action,terminal); g_action_map_add_action(map,action); } @@ -96,7 +71,6 @@ }; for(ix = 0; ix < G_N_ELEMENTS(actions); ix++) { - pw3270_action_set_terminal_widget(actions[ix],terminal); g_action_map_add_action(map,actions[ix]); } } diff --git a/src/pw3270/windows/resources.rc.in b/src/pw3270/windows/resources.rc.in deleted file mode 100644 index 307d0d1..0000000 --- a/src/pw3270/windows/resources.rc.in +++ /dev/null @@ -1,31 +0,0 @@ -#include - -1 ICON @PACKAGE_TARNAME@.ico - -VS_VERSION_INFO VERSIONINFO -FILEVERSION @WIN32_FILE_VERSION@ -PRODUCTVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@,@PACKAGE_MINOR_RELEASE@ - -BEGIN - - BLOCK "StringFileInfo" - BEGIN - BLOCK "080904E4" - BEGIN - VALUE "FileDescription", "@PACKAGE_DESCRIPTION@\0" - VALUE "CompanyName", "Banco do Brasil S/A.\0" - VALUE "FileVersion", "@WIN32_VERSION@\0" - VALUE "LegalCopyright", "(C) 2017 Banco do Brasil S/A. All Rights Reserved\0" - VALUE "OriginalFilename", "@APPLICATION_NAME@.exe\0" - VALUE "ProductName", "@PRODUCT_NAME@\0" - VALUE "ProductVersion", "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@\0" - END - END - - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x809, 0x04E4 - END - -END - diff --git a/ui/00default.xml b/ui/00default.xml deleted file mode 100644 index 4c9e339..0000000 --- a/ui/00default.xml +++ /dev/null @@ -1,267 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ui/10functions.xml b/ui/10functions.xml deleted file mode 100644 index 892beba..0000000 --- a/ui/10functions.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - -