Merge pull request #66 from PerryWerneck/win

Fixing win32 action

Merge pull request #66 from PerryWerneck/win
Fixing win32 action
Perry Werneck · GitHub
2 parents 3da0a1c3 78fb2d96
Showing 4 changed files with 12 additions and 12 deletions Show diff stats
.github/workflows/msys2.yml
PKGBUILD.mingw
autogen.sh
win/ci-build.sh
@@ -29,6 +29,9 @@ jobs:
           latest: true
           fileName: "mingw-w64-x86_64-libv3270-5.4-0-x86_64.pkg.tar.zst"      
       - name: CI-Build
-        run: ./win/ci-build.sh
+        run: |
+          pacman -U --noconfirm *.pkg.tar.zst
+          dos2unix PKGBUILD.mingw
+          makepkg BUILDDIR=/tmp/pkg -p PKGBUILD.mingw
@@ -25,7 +25,7 @@ source=()
 pkgver=$(grep AC_INIT "${startdir}/configure.ac" | cut -d[ -f3 | cut -d] -f1)
 pkgrel=0
-pkgdesc="TN3270 Access library"
+pkgdesc="IBM 3270 Terminal emulator for GTK"
 url="https://github.com/PerryWerneck/${_realname}"
 arch=(i686 x86_64)
 license=(LGPL-3.0-or-later)
@@ -38,12 +38,12 @@ conflicts=($pkgname)
 prepare() {
   rm -fr "$srcdir/$pkgname"
-  ln -snf "$startdir" "$srcdir/$pkgname"
+  mkdir -p "$srcdir/$pkgname"
 }
 build() {
-  cd $pkgname
-  ./autogen.sh \
+  cd "$srcdir/$pkgname"
+  ${startdir}/autogen.sh \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
     --host=${MINGW_CHOST} \
@@ -53,10 +53,11 @@ build() {
 }
 package() {
-  cd $pkgname
+  cd "$srcdir/$pkgname"
   make DESTDIR="${pkgdir}" install
   install \
     -Dm644 \
-    "LICENSE" \
+    "${startdir}/LICENSE" \
     "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
 }
+
@@ -49,7 +49,7 @@ autopoint
 cd ${builddir}
-test -n "$NOCONFIGURE" || "./configure" "$@"
+test -n "$NOCONFIGURE" || "$srcdir/configure" --srcdir=${srcdir} $@
@@ -25,11 +25,7 @@
 echo "Running ${0}"
-LOGFILE=build.log
-rm -f ${LOGFILE}
-
 die ( ) {
-	[ -s $LOGFILE ] && tail $LOGFILE
 	[ "$1" ] && echo "$*"
 	exit -1
 }
	@@ -29,6 +29,9 @@ jobs:		@@ -29,6 +29,9 @@ jobs:
29	latest: true	29	latest: true
30	fileName: "mingw-w64-x86_64-libv3270-5.4-0-x86_64.pkg.tar.zst"	30	fileName: "mingw-w64-x86_64-libv3270-5.4-0-x86_64.pkg.tar.zst"
31	- name: CI-Build	31	- name: CI-Build
32	- run: ./win/ci-build.sh	32	+ run: \|
		33	+ pacman -U --noconfirm *.pkg.tar.zst
		34	+ dos2unix PKGBUILD.mingw
		35	+ makepkg BUILDDIR=/tmp/pkg -p PKGBUILD.mingw
33		36
34		37
	@@ -49,7 +49,7 @@ autopoint		@@ -49,7 +49,7 @@ autopoint
49		49
50	cd ${builddir}	50	cd ${builddir}
51		51
52	-test -n "$NOCONFIGURE" \|\| "./configure" "$@"	52	+test -n "$NOCONFIGURE" \|\| "$srcdir/configure" --srcdir=${srcdir} $@
53		53
54		54
55		55