From ec31f2ddba8c215ae4a2e58231b05b4ece10e223 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Mon, 28 Dec 2020 17:33:00 -0300 Subject: [PATCH] Fixing windows build. --- win/pack.sh | 9 ++++++++- win/pw3270.nsi.in | 20 ++++++++++++-------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/win/pack.sh b/win/pack.sh index 6b848c2..3a8c8a4 100755 --- a/win/pack.sh +++ b/win/pack.sh @@ -422,6 +422,12 @@ buildApplication() fi done + if [ "${BUILD_UNSTABLE}" == "1" ]; then + APP_OPTIONS="--enable-unstable" + else + APP_OPTIONS="" + fi + if [ -x ${PROJECTDIR}/win/configure.${1} ]; then host="${host}" \ @@ -443,7 +449,8 @@ buildApplication() --includedir=${WORKDIR}/build/${ARCH}/include \ --sysconfdir=${WORKDIR}/build/${ARCH}/etc \ --datadir=${WORKDIR}/build/${ARCH}/share \ - --datarootdir=${WORKDIR}/build/${ARCH}/share + --datarootdir=${WORKDIR}/build/${ARCH}/share \ + ${APP_OPTIONS} fi diff --git a/win/pw3270.nsi.in b/win/pw3270.nsi.in index 26cdeb8..241ecf2 100644 --- a/win/pw3270.nsi.in +++ b/win/pw3270.nsi.in @@ -108,10 +108,19 @@ SubSection "@PRODUCT_NAME@" SecMain # Register file association + # icons & logos + CreateDirectory "$INSTDIR\icons" + file "/oname=$INSTDIR\icons\gtk-connect-symbolic.svg" "share\@PRODUCT_NAME@\icons\gtk-connect-symbolic.svg" + file "/oname=$INSTDIR\icons\gtk-disconnect-symbolic.svg" "share\@PRODUCT_NAME@\icons\gtk-disconnect-symbolic.svg" + file "/oname=$INSTDIR\icons\connect-symbolic.svg" "share\@PRODUCT_NAME@\icons\connect-symbolic.svg" + file "/oname=$INSTDIR\icons\disconnect-symbolic.svg" "share\@PRODUCT_NAME@\icons\disconnect-symbolic.svg" + file "/oname=$INSTDIR\icons\@PRODUCT_NAME@.svg" "share\@PRODUCT_NAME@\@PRODUCT_NAME@.svg" + + file "/oname=$INSTDIR\@PRODUCT_NAME@-logo.svg" "share\@PRODUCT_NAME@\@PRODUCT_NAME@-logo.svg" + file "/oname=$INSTDIR\@PRODUCT_NAME@.svg" "share\@PRODUCT_NAME@\@PRODUCT_NAME@.svg" + # Configuration files - file "/oname=$INSTDIR\@PRODUCT_NAME@-logo.png" "share\@PRODUCT_NAME@\@PRODUCT_NAME@-logo.png" - file "/oname=$INSTDIR\@PRODUCT_NAME@.png" "share\@PRODUCT_NAME@\@PRODUCT_NAME@.png" - file "/oname=$INSTDIR\colors.conf" "share\@PRODUCT_NAME@\colors.conf" + file "/oname=$INSTDIR\colors.conf" "share\@PRODUCT_NAME@\colors.conf" # Documentation files file "/oname=$INSTDIR\AUTHORS" "AUTHORS" @@ -137,11 +146,6 @@ SubSection "@PRODUCT_NAME@" SecMain file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\lib@LIBRARY_NAME@.mo" "share\locale\pt_BR\LC_MESSAGES\lib@LIBRARY_NAME@.mo" file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\libv3270.mo" "share\locale\pt_BR\LC_MESSAGES\libv3270.mo" - # Customized icons - CreateDirectory "$INSTDIR\icons" - file "/oname=$INSTDIR\icons\gtk-connect-symbolic.svg" "share\@PRODUCT_NAME@\icons\gtk-connect-symbolic.svg" - file "/oname=$INSTDIR\icons\gtk-disconnect-symbolic.svg" "share\@PRODUCT_NAME@\icons\gtk-disconnect-symbolic.svg" - # define uninstaller name SetRegView 32 -- libgit2 0.21.2