From cdb1d9df05f4f96285d9626bfdae95671da340ea Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Fri, 30 Aug 2019 14:22:05 -0300 Subject: [PATCH] Working on windows package. --- win/makeruntime.sh.in | 4 +--- win/pack.sh | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/win/makeruntime.sh.in b/win/makeruntime.sh.in index f5de409..ec0cff2 100755 --- a/win/makeruntime.sh.in +++ b/win/makeruntime.sh.in @@ -285,7 +285,7 @@ do value=${tmp##*=} case "$parameter" in - PATH) + OUTPUT-DIR) TARGET=$value ;; @@ -325,6 +325,4 @@ copy_theme "Adwaita" #echo "Optimizing..." #find ${TARGET} -iname *.png -exec optipng -o7 -quiet {} \; 2>&1 > /dev/null - - echo "Runtime ok" diff --git a/win/pack.sh b/win/pack.sh index 8f6b213..50dc067 100755 --- a/win/pack.sh +++ b/win/pack.sh @@ -304,7 +304,7 @@ makeRuntime() chmod +x ${SCRIPT} cd ${WORKDIR}/build/${ARCH} - ${SCRIPT} --output-dir="${WORKDIR}/build/${ARCH}/runtime" --bindir="${WORKDIR}/build/${ARCH}" + ${SCRIPT} --output-dir="${WORKDIR}/build/${ARCH}/runtime" --bindir="${WORKDIR}/build/${ARCH}" if [ "$?" != "0" ]; then failed "Error on ${SCRIPT}" fi @@ -319,6 +319,13 @@ makeRuntime() # makeInstaller() { + NSIS_ARGS="-DWITHGTK" + + for ARG in $(echo ${PACKAGE_PLUGINS} | tr "[:lower:]" "[:upper:]") $(echo ${PACKAGE_LANGUAGE_BINDINGS} | tr "[:lower:]" "[:upper:]") + do + NSIS_ARGS="${NSIS_ARGS} -DWITH${ARG}" + done + for ARCH in ${TARGET_ARCHS} do @@ -327,9 +334,16 @@ makeInstaller() echo "Creating installer for ${ARCH}" cd ${WORKDIR}/build/${ARCH} + + echo makensis ${NSIS_ARGS} ./pw3270.nsi /bin/bash + mv -f *.exe ${PROJECTDIR} + if [ "$?" != "0" ]; then + failed "Can't copy installer to ${PROJECTDIR}" + fi + done } @@ -360,6 +374,12 @@ do fi ;; + + CONFIG) + . ${value} + ;; + + HELP) echo "${0} [options]" echo "" -- libgit2 0.21.2