diff --git a/win/pack.sh b/win/pack.sh index 92aa226..d034200 100755 --- a/win/pack.sh +++ b/win/pack.sh @@ -37,8 +37,9 @@ GIT_URL="https://github.com/PerryWerneck" PROJECTDIR=$(dirname $(dirname $(readlink -f ${0}))) WORKDIR=$(mktemp -d) PUBLISH=0 -GET_PREREQS=1 +GET_PREREQS=0 CERTS_DIR=${WORKDIR}/certs +PAUSE_ON_ERROR=0 if [ -e /etc/os-release ]; then . /etc/os-release @@ -56,6 +57,12 @@ failed() { echo "$@" cleanup + + if [ "${PAUSE_ON_ERROR}" != "0" ]; then + echo "Type exit to end build script" + /bin/bash + fi + exit -1 } @@ -657,11 +664,17 @@ do GET_PREREQS=0 ;; + PRE-REQS) + GET_PREREQS=1 + ;; + PROJECT-PATH) PROJECTDIR=$(readlink -f ${value}) ;; - + SHELL-ON-ERROR) + PAUSE_ON_ERROR=1 + ;; HELP) echo "${0} [options]" echo "" @@ -672,6 +685,9 @@ do echo " --project-path Set the path for the customization data" echo " --target-archs Set the target architectures (current are ${TARGET_ARCHS})" echo " --sources-from Base URL of the git server with the sources (current is ${GIT_URL})" + echo " --no-pre-reqs Don't try to install required packages" + echo " --pre-reqs Install required packages" + echo " --shell-on-error Open a shell when the build process failed" if [ ! -z ${WIN_PACKAGE_SERVER} ]; then echo " --no-publish Don't publish binaries in ${WIN_PACKAGE_SERVER}/${PRODUCT_NAME}" diff --git a/win/pw3270.nsi.in b/win/pw3270.nsi.in index 2a4ebfd..f83d0c4 100644 --- a/win/pw3270.nsi.in +++ b/win/pw3270.nsi.in @@ -180,9 +180,9 @@ SubSection "@PRODUCT_NAME@" SecMain ${DisableX64FSRedirection} CreateDirectory "$INSTDIR\dotnet" - file "/oname=$INSTDIR\dotnet\tn3270-sharp.dll" "mono/lib/tn3270-sharp-5.2/tn3270-sharp.dll" - file "/oname=$INSTDIR\dotnet\pw3270-sharp.xml" "mono/gapi-2.0/tn3270-sharp/tn3270-sharp.xml" - file "/oname=$SYSDIR\lib3270-mono.dll" "lib3270-mono.dll" + file "/oname=$INSTDIR\dotnet\tn3270.dll" "mono/lib/tn3270-5.2/tn3270.dll" + file "/oname=$INSTDIR\dotnet\tn3270.xml" "mono/gapi-2.0/tn3270/tn3270.xml" + file "/oname=$SYSDIR\mono-tn3270.dll" "mono-tn3270.dll" sectionEnd !endif @@ -261,7 +261,7 @@ Section "Uninstall" !endif !ifdef WITHMONO - delete $SYSDIR\lib3270-mono.dll + delete $SYSDIR\mono-tn3270.dll !endif RMDir /r "$INSTDIR" -- libgit2 0.21.2