Skip to content

Commit

Permalink
Merge pull request #66 from PerryWerneck/win
Browse files Browse the repository at this point in the history
Fixing win32 action
  • Loading branch information
PerryWerneck committed Mar 6, 2024
2 parents 3da0a1c + 78fb2d9 commit 18d4592
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/msys2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
13 changes: 7 additions & 6 deletions PKGBUILD.mingw
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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} \
Expand All @@ -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"
}

2 changes: 1 addition & 1 deletion autogen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ autopoint

cd ${builddir}

test -n "$NOCONFIGURE" || "./configure" "$@"
test -n "$NOCONFIGURE" || "$srcdir/configure" --srcdir=${srcdir} $@



4 changes: 0 additions & 4 deletions win/ci-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,7 @@

echo "Running ${0}"

LOGFILE=build.log
rm -f ${LOGFILE}

die ( ) {
[ -s $LOGFILE ] && tail $LOGFILE
[ "$1" ] && echo "$*"
exit -1
}
Expand Down

0 comments on commit 18d4592

Please sign in to comment.