Skip to content

Commit

Permalink
Debugging bundle action.
Browse files Browse the repository at this point in the history
  • Loading branch information
PerryWerneck committed Dec 13, 2023
1 parent ac4015a commit 71ead4d
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 3 deletions.
6 changes: 6 additions & 0 deletions PKGBUILD.mingw
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@ build() {
package() {
cd $srcdir/$pkgname-$pkgver
make DESTDIR="${pkgdir}" install

install \
-Dm644 \
"$srcdir/$pkgname-$pkgver/win/pw3270.nsi" \
"${pkgdir}${MINGW_PREFIX}/share/${pkgname}"

install \
-Dm644 \
"$startdir/LICENSE" \
Expand Down
18 changes: 15 additions & 3 deletions win/bundle.common
Original file line number Diff line number Diff line change
Expand Up @@ -340,16 +340,28 @@ make_txz() {
}

make_nsis() {

if [ ! -e "${buildroot}${MINGW_PREFIX}/${PACKAGE_NAME}.nsi" ]; then
cp -v \
"${buildroot}${MINGW_PREFIX}/share/${PACKAGE_NAME}/${PACKAGE_NAME}.nsi" \
"${buildroot}${MINGW_PREFIX}/${PACKAGE_NAME}.nsi"
if [ "$?" != "0" ]; then
echo "Cant copy nsis script"
exit -1
fi
fi

makensis \
-INPUTCHARSET UTF8 \
-DWITHIPC \
-DWITHPLUGINS \
-DWITHSDK \
-DPKGDIR=${buildroot}${MINGW_PREFIX} \
${buildroot}${MINGW_PREFIX}/${PACKAGE_NAME}.nsi
if [ "$?" != "0" ]; then
echo "Cant build nsis package"
fi
if [ "$?" != "0" ]; then
echo "Cant build nsis package"
exit -1
fi

if [ ! -z $(which gh) ]; then
argument "upload" > /dev/null
Expand Down
35 changes: 35 additions & 0 deletions win/bundle.msys
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@
# Load bundle functions
. "$(dirname $(readlink -f "${0}"))/bundle.gtk3"

argument "help" > /dev/null
if [ "$?" == "0" ]; then
echo " --install-requires Install required packages"
echo " --build Build application from source"
echo " --configure Run configure"
fi

argument "install-requires" > /dev/null
if [ "$?" == "0" ]; then
pacman -S --needed \
Expand Down Expand Up @@ -55,6 +62,34 @@ do
fi
done

argument "build" > /dev/null
if [ "$?" == "0" ]; then

NOCONFIGURE=1 ./autogen.sh
if [ "$?" != "0" ]; then
echo "Autogen failed"
exit -1
fi

${MINGW_PACKAGE_PREFIX}-configure
if [ "$?" != "0" ]; then
echo "Configure failed"
exit -1
fi

build_package

else

argument "configure" > /dev/null
./autogen.sh
if [ "$?" != "0" ]; then
echo "Configure failed"
exit -1
fi

fi

install_gtk3_runtime
install_license
make_packages
Expand Down

0 comments on commit 71ead4d

Please sign in to comment.