Download as
Browse Code »

Commit d953dd42c1d0a7f3b673c60f759bd5e44bd86257

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

Merge pull request #39 from PerryWerneck/develop 

Publishing mingw build artifact.
Showing 7 changed files with 58 additions and 44 deletions   Show diff stats
.github/workflows/msys2.yml
  Diff comments   View file @d953dd4
@@ -23,15 +23,14 @@ jobs: @@ -23,15 +23,14 @@ jobs:
23 update: true 23 update: true
24 install: xz mingw-w64-x86_64-gcc automake autoconf make git pkgconf mingw-w64-x86_64-gettext gettext-devel mingw-w64-x86_64-openssl libtool 24 install: xz mingw-w64-x86_64-gcc automake autoconf make git pkgconf mingw-w64-x86_64-gettext gettext-devel mingw-w64-x86_64-openssl libtool
25 - name: CI-Build 25 - name: CI-Build
26 - run: |  
27 - ./win/ci-build.sh 26 + run: ./win/ci-build.sh
28 - uses: ncipollo/release-action@v1 27 - uses: ncipollo/release-action@v1
29 with: 28 with:
  29 + tag: 5.4
30 artifacts: "*.tar.xz" 30 artifacts: "*.tar.xz"
31 allowUpdates: true 31 allowUpdates: true
32 draft: true 32 draft: true
33 makeLatest: true 33 makeLatest: true
34 - name: mingw-binary  
35 omitBody: true 34 omitBody: true
36 omitPrereleaseDuringUpdate: true 35 omitPrereleaseDuringUpdate: true
37 replacesArtifacts: true 36 replacesArtifacts: true
@@ -67,3 +67,4 @@ mstest.* @@ -67,3 +67,4 @@ mstest.*
67 ABOUT-NLS 67 ABOUT-NLS
68 intl 68 intl
69 po 69 po
  70 +*.tar.xz
@@ -430,7 +430,7 @@ install-windows-dev: \ @@ -430,7 +430,7 @@ install-windows-dev: \
430 $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/def 430 $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/def
431 431
432 @$(INSTALL_DATA) \ 432 @$(INSTALL_DATA) \
433 - CHANGELOG \ 433 + $(srcdir)/CHANGELOG \
434 $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PACKAGE_NAME).changes 434 $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PACKAGE_NAME).changes
435 435
436 @rm -f $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@ 436 @rm -f $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@
locale/pt_BR.po
  Diff comments   View file @d953dd4
@@ -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-11 08:59-0300\n" 8 +"POT-Creation-Date: 2023-03-10 10:23-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"
1 # Maintainer: Perry Werneck <perry.werneck@gmail.com> 1 # Maintainer: Perry Werneck <perry.werneck@gmail.com>
  2 +# References: https://www.msys2.org/wiki/Creating-Packages/
2 3
3 -pkgname=${MINGW_PACKAGE_PREFIX}-lib3270 4 +_realname=lib3270
  5 +pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
  6 +source=(git+https://github.com/PerryWerneck/lib3270#branch=develop)
4 7
5 -pkgver=5.2 8 +#pkgver() {
  9 +# cd ${srcdir}/${_realname}
  10 +# git describe --long --tags --abbrev=7 | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
  11 +#}
  12 +
  13 +pkgver=5.4
6 pkgrel=1 14 pkgrel=1
7 pkgdesc="TN3270 Access library" 15 pkgdesc="TN3270 Access library"
8 -url="https://portal.softwarepublico.gov.br/social/pw3270/" 16 +url="https://github.com/PerryWerneck/lib3270"
9 arch=(i686 x86_64) 17 arch=(i686 x86_64)
10 license=(GPL) 18 license=(GPL)
11 -depends=()  
12 -makedepends=(autoconf automake make openssl-devel) 19 +depends=(openssl)
  20 +makedepends=(autoconf automake make libtool gzip ${MINGW_PACKAGE_PREFIX}-openssl)
13 checkdepends=() 21 checkdepends=()
14 22
15 -#groups=(gnome)  
16 -  
17 -source=(lib3270-$pkgver.tar.xz)  
18 sha256sums=('SKIP') 23 sha256sums=('SKIP')
19 24
20 -provides=($pkgname) 25 +provides=($pkgname)
21 conflicts=($pkgname) 26 conflicts=($pkgname)
22 27
23 prepare() { 28 prepare() {
24 - cd lib3270-$pkgver  
25 - NOCONFIGURE=1 ./autogen.sh  
26 - ./configure --prefix=$MINGW_PREFIX 29 + cd ${srcdir}/${_realname}
27 } 30 }
28 31
29 build() { 32 build() {
30 - cd lib3270-$pkgver 33 + rm -fr "${srcdir}/build-${CARCH}"
  34 + mkdir -p "${srcdir}/build-${CARCH}"
  35 + cd "${srcdir}/build-${CARCH}"
  36 + ${srcdir}/${_realname}/autogen.sh \
  37 + --prefix=${MINGW_PREFIX} \
  38 + --build=${MINGW_CHOST} \
  39 + --host=${MINGW_CHOST} \
  40 + --target=${MINGW_CHOST}
  41 +
31 make all 42 make all
32 } 43 }
33 44
34 package() { 45 package() {
35 - cd lib3270-$pkgver  
36 - DESTDIR="$pkgdir" make install-dev  
37 - install .bin/Release/lib3270.dll $MINGW_PREFIX/bin  
38 - dlltool --dllname lib3270.dll --input-def .bin/Release/lib3270.def --output-lib $MINGW_PREFIX/lib/lib3270.a 46 + cd "${srcdir}/build-${CARCH}"
  47 + make DESTDIR="${pkgdir}" install
  48 + install -Dm644 "${srcdir}/${_realname}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
39 } 49 }
40 50
  51 +
win/ci-build.sh
  Diff comments   View file @d953dd4
@@ -26,6 +26,8 @@ echo &quot;Building lib3270&quot; @@ -26,6 +26,8 @@ echo &quot;Building lib3270&quot;
26 ./configure > $LOGFILE 2>&1 || die "Configure failure" 26 ./configure > $LOGFILE 2>&1 || die "Configure failure"
27 make clean > $LOGFILE 2>&1 || die "Make clean failure" 27 make clean > $LOGFILE 2>&1 || die "Make clean failure"
28 make all > $LOGFILE 2>&1 || die "Make failure" 28 make all > $LOGFILE 2>&1 || die "Make failure"
  29 +make DESTDIR=.bin/package install
  30 +tar --create --xz --file=mingw-lib3270.tar.xz --directory=.bin/package --verbose .
  31 +
29 32
30 -echo "Build complete"  
31 33
win/lib3270.def
  Diff comments   View file @d953dd4
@@ -329,24 +329,25 @@ EXPORTS @@ -329,24 +329,25 @@ EXPORTS
329 lib3270_update_poll_fd @328 329 lib3270_update_poll_fd @328
330 lib3270_vsprintf @329 330 lib3270_vsprintf @329
331 lib3270_wait @330 331 lib3270_wait @330
332 - lib3270_wait_for_cstate @331  
333 - lib3270_wait_for_keyboard_unlock @332  
334 - lib3270_wait_for_ready @333  
335 - lib3270_wait_for_string @334  
336 - lib3270_wait_for_string_at @335  
337 - lib3270_wait_for_string_at_address @336  
338 - lib3270_wait_for_update @337  
339 - lib3270_win32_create_regkey @338  
340 - lib3270_win32_get_dword @339  
341 - lib3270_win32_local_charset @340  
342 - lib3270_win32_set_string @341  
343 - lib3270_win32_strerror @342  
344 - lib3270_win32_translate_error_code @343  
345 - lib3270_write_dstrace @344  
346 - lib3270_write_event_trace @345  
347 - lib3270_write_log @346  
348 - lib3270_write_nettrace @347  
349 - lib3270_write_rc @348  
350 - lib3270_write_screen_trace @349  
351 - lib3270_write_trace @350  
352 - lib3270_write_va_log @351 332 + lib3270_wait_for_connected @331
  333 + lib3270_wait_for_cstate @332
  334 + lib3270_wait_for_keyboard_unlock @333
  335 + lib3270_wait_for_ready @334
  336 + lib3270_wait_for_string @335
  337 + lib3270_wait_for_string_at @336
  338 + lib3270_wait_for_string_at_address @337
  339 + lib3270_wait_for_update @338
  340 + lib3270_win32_create_regkey @339
  341 + lib3270_win32_get_dword @340
  342 + lib3270_win32_local_charset @341
  343 + lib3270_win32_set_string @342
  344 + lib3270_win32_strerror @343
  345 + lib3270_win32_translate_error_code @344
  346 + lib3270_write_dstrace @345
  347 + lib3270_write_event_trace @346
  348 + lib3270_write_log @347
  349 + lib3270_write_nettrace @348
  350 + lib3270_write_rc @349
  351 + lib3270_write_screen_trace @350
  352 + lib3270_write_trace @351
  353 + lib3270_write_va_log @352