Download as
Browse Code »

Commit b6931fc2f8f7327ae4979eaaccd8679274611497

Authored by Perry Werneck
Committed by GitHub
2 parents e4475241 b56258db
Exists in master and in 1 other branch develop

Merge pull request #36 from PerryWerneck/develop 

Fixing build
Showing 9 changed files with 13 additions and 9 deletions   Show diff stats
@@ -212,7 +212,7 @@ AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor) @@ -212,7 +212,7 @@ AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor)
212 212
213 AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_cv_release="$withval" ],[ app_cv_release="`date +%-y`.`date +%-m`.`date +%-d`" ]) 213 AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_cv_release="$withval" ],[ app_cv_release="`date +%-y`.`date +%-m`.`date +%-d`" ])
214 214
215 -AC_ARG_WITH([product-id], [AS_HELP_STRING([--product-id], [Set the product ID])], [ app_cv_product_id="$withval" ],[ app_cv_product_id="br.app.pw3270" ]) 215 +AC_ARG_WITH([product-id], [AS_HELP_STRING([--with-product-id], [Set the product ID])], [ app_cv_product_id="$withval" ],[ app_cv_product_id="br.app.pw3270" ])
216 AC_SUBST(PRODUCT_ID,"$app_cv_product_id") 216 AC_SUBST(PRODUCT_ID,"$app_cv_product_id")
217 217
218 app_rls_major=$(echo $app_cv_release.0.0 | cut -d. -f1) 218 app_rls_major=$(echo $app_cv_release.0.0 | cut -d. -f1)
1 -9 1 +10
2 2
doxygen/doxyfile.in
  Diff comments   View file @b6931fc
@@ -52,7 +52,7 @@ PROJECT_LOGO = "@PACKAGE_NAME@.svg" @@ -52,7 +52,7 @@ PROJECT_LOGO = "@PACKAGE_NAME@.svg"
52 # If a relative path is entered, it will be relative to the location 52 # If a relative path is entered, it will be relative to the location
53 # where doxygen was started. If left blank the current directory will be used. 53 # where doxygen was started. If left blank the current directory will be used.
54 54
55 -OUTPUT_DIRECTORY = @BASEDIR@/doxygen 55 +OUTPUT_DIRECTORY = @BUILDDIR@/doxygen
56 56
57 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 57 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
58 # 4096 sub-directories (in 2 levels) under the output directory of each output 58 # 4096 sub-directories (in 2 levels) under the output directory of each output
@@ -140,7 +140,7 @@ FULL_PATH_NAMES = YES @@ -140,7 +140,7 @@ FULL_PATH_NAMES = YES
140 # relative paths, which will be relative from the directory where doxygen is 140 # relative paths, which will be relative from the directory where doxygen is
141 # started. 141 # started.
142 142
143 -STRIP_FROM_PATH = @BASEDIR@/src 143 +STRIP_FROM_PATH = @BUILDDIR@/src
144 144
145 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 145 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
146 # the path mentioned in the documentation of a class, which tells 146 # the path mentioned in the documentation of a class, which tells
@@ -648,7 +648,7 @@ WARN_FORMAT = "$file:$line: $text" @@ -648,7 +648,7 @@ WARN_FORMAT = "$file:$line: $text"
648 # and error messages should be written. If left blank the output is written 648 # and error messages should be written. If left blank the output is written
649 # to stderr. 649 # to stderr.
650 650
651 -WARN_LOGFILE = @BASEDIR@/doxygen/doxygen.log 651 +WARN_LOGFILE = @BUILDDIR@/doxygen/doxygen.log
652 652
653 #--------------------------------------------------------------------------- 653 #---------------------------------------------------------------------------
654 # configuration options related to the input files 654 # configuration options related to the input files
@@ -659,7 +659,7 @@ WARN_LOGFILE = @BASEDIR@/doxygen/doxygen.log @@ -659,7 +659,7 @@ WARN_LOGFILE = @BASEDIR@/doxygen/doxygen.log
659 # directories like "/usr/src/myproject". Separate the files or directories 659 # directories like "/usr/src/myproject". Separate the files or directories
660 # with spaces. 660 # with spaces.
661 661
662 -INPUT = @BASEDIR@/src 662 +INPUT = @BUILDDIR@/src
663 663
664 # This tag can be used to specify the character encoding of the source files 664 # This tag can be used to specify the character encoding of the source files
665 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 665 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
locale/Makefile.in
  Diff comments   View file @b6931fc
@@ -38,7 +38,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@ @@ -38,7 +38,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
38 PACKAGE_TARNAME=@PACKAGE_TARNAME@ 38 PACKAGE_TARNAME=@PACKAGE_TARNAME@
39 PRODUCT_NAME=@PRODUCT_NAME@ 39 PRODUCT_NAME=@PRODUCT_NAME@
40 40
41 -BASEDIR=@BASEDIR@ 41 +BASEDIR=@BUILDDIR@
42 BINDIR=$(BASEDIR)/.bin/locale 42 BINDIR=$(BASEDIR)/.bin/locale
43 43
44 MKDIR=@MKDIR_P@ 44 MKDIR=@MKDIR_P@
locale/pt_BR.po
  Diff comments   View file @b6931fc
@@ -5,7 +5,7 @@ msgid "" @@ -5,7 +5,7 @@ msgid ""
5 msgstr "" 5 msgstr ""
6 "Project-Id-Version: pw3270 5.0\n" 6 "Project-Id-Version: pw3270 5.0\n"
7 "Report-Msgid-Bugs-To: \n" 7 "Report-Msgid-Bugs-To: \n"
8 -"POT-Creation-Date: 2023-01-16 22:54-0300\n" 8 +"POT-Creation-Date: 2023-01-11 08:59-0300\n"
9 "PO-Revision-Date: 2021-09-01 23:53-0300\n" 9 "PO-Revision-Date: 2021-09-01 23:53-0300\n"
10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n" 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 "Language-Team: Português <perry.werneck@gmail.com>\n" 11 "Language-Team: Português <perry.werneck@gmail.com>\n"
sdk/lib3270-delayed.pc.in
  Diff comments   View file @b6931fc
@@ -9,6 +9,7 @@ sdk_version=@LIB3270_SDK_VERSION@ @@ -9,6 +9,7 @@ sdk_version=@LIB3270_SDK_VERSION@
9 library_name=@LIB3270_NAME@ 9 library_name=@LIB3270_NAME@
10 product_name=@PRODUCT_NAME@ 10 product_name=@PRODUCT_NAME@
11 product_id=@PRODUCT_ID@ 11 product_id=@PRODUCT_ID@
  12 +plugin_path=${libdir}/@PRODUCT_ID@/@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@/plugins
12 13
13 Name: @PACKAGE_NAME@-delayed 14 Name: @PACKAGE_NAME@-delayed
14 Description: @PACKAGE_DESCRIPTION@ 15 Description: @PACKAGE_DESCRIPTION@
sdk/lib3270-static.pc.in
  Diff comments   View file @b6931fc
@@ -10,6 +10,7 @@ library_name=@LIB3270_NAME@ @@ -10,6 +10,7 @@ library_name=@LIB3270_NAME@
10 product_name=@PRODUCT_NAME@ 10 product_name=@PRODUCT_NAME@
11 default_host=@LIB3270_DEFAULT_HOST@ 11 default_host=@LIB3270_DEFAULT_HOST@
12 product_id=@PRODUCT_ID@ 12 product_id=@PRODUCT_ID@
  13 +plugin_path=${libdir}/@PRODUCT_ID@/@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@/plugins
13 14
14 Name: @PACKAGE_NAME@-static 15 Name: @PACKAGE_NAME@-static
15 Description: @PACKAGE_DESCRIPTION@ (static library) 16 Description: @PACKAGE_DESCRIPTION@ (static library)
sdk/lib3270.pc.in
  Diff comments   View file @b6931fc
@@ -10,6 +10,7 @@ library_name=@LIB3270_NAME@ @@ -10,6 +10,7 @@ library_name=@LIB3270_NAME@
10 product_name=@PRODUCT_NAME@ 10 product_name=@PRODUCT_NAME@
11 default_host=@LIB3270_DEFAULT_HOST@ 11 default_host=@LIB3270_DEFAULT_HOST@
12 product_id=@PRODUCT_ID@ 12 product_id=@PRODUCT_ID@
  13 +plugin_path=${libdir}/@PRODUCT_NAME@/@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@/plugins
13 14
14 Name: @PACKAGE_NAME@ 15 Name: @PACKAGE_NAME@
15 Description: @PACKAGE_DESCRIPTION@ 16 Description: @PACKAGE_DESCRIPTION@
win/x86_64/mingw64-lib3270.spec
  Diff comments   View file @b6931fc
@@ -56,7 +56,8 @@ BuildRequires: mingw64-cross-pkg-config @@ -56,7 +56,8 @@ BuildRequires: mingw64-cross-pkg-config
56 BuildRequires: mingw64-filesystem 56 BuildRequires: mingw64-filesystem
57 BuildRequires: mingw64-libopenssl-devel 57 BuildRequires: mingw64-libopenssl-devel
58 BuildRequires: mingw64-zlib-devel 58 BuildRequires: mingw64-zlib-devel
59 -BuildRequires: mingw64(lib:iconv) 59 +#BuildRequires: mingw64(lib:iconv)
  60 +BuildRequires: mingw64-win_iconv-devel
60 BuildRequires: mingw64(lib:intl) 61 BuildRequires: mingw64(lib:intl)
61 BuildRequires: mingw64-gettext-tools 62 BuildRequires: mingw64-gettext-tools
62 63