Download as
Browse Code »

Commit e5ee7b9ab16795da2056e0788e0b293a43a21e71

Authored by Perry Werneck
1 parent 2a602151
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Updating windows package.

Showing 2 changed files with 22 additions and 6 deletions   Show diff stats
@@ -37,8 +37,9 @@ GIT_URL="https://github.com/PerryWerneck" @@ -37,8 +37,9 @@ GIT_URL="https://github.com/PerryWerneck"
37 PROJECTDIR=$(dirname $(dirname $(readlink -f ${0}))) 37 PROJECTDIR=$(dirname $(dirname $(readlink -f ${0})))
38 WORKDIR=$(mktemp -d) 38 WORKDIR=$(mktemp -d)
39 PUBLISH=0 39 PUBLISH=0
40 -GET_PREREQS=1 40 +GET_PREREQS=0
41 CERTS_DIR=${WORKDIR}/certs 41 CERTS_DIR=${WORKDIR}/certs
  42 +PAUSE_ON_ERROR=0
42 43
43 if [ -e /etc/os-release ]; then 44 if [ -e /etc/os-release ]; then
44 . /etc/os-release 45 . /etc/os-release
@@ -56,6 +57,12 @@ failed() @@ -56,6 +57,12 @@ failed()
56 { 57 {
57 echo "$@" 58 echo "$@"
58 cleanup 59 cleanup
  60 +
  61 + if [ "${PAUSE_ON_ERROR}" != "0" ]; then
  62 + echo "Type exit to end build script"
  63 + /bin/bash
  64 + fi
  65 +
59 exit -1 66 exit -1
60 } 67 }
61 68
@@ -657,11 +664,17 @@ do @@ -657,11 +664,17 @@ do
657 GET_PREREQS=0 664 GET_PREREQS=0
658 ;; 665 ;;
659 666
  667 + PRE-REQS)
  668 + GET_PREREQS=1
  669 + ;;
  670 +
660 PROJECT-PATH) 671 PROJECT-PATH)
661 PROJECTDIR=$(readlink -f ${value}) 672 PROJECTDIR=$(readlink -f ${value})
662 ;; 673 ;;
663 674
664 - 675 + SHELL-ON-ERROR)
  676 + PAUSE_ON_ERROR=1
  677 + ;;
665 HELP) 678 HELP)
666 echo "${0} [options]" 679 echo "${0} [options]"
667 echo "" 680 echo ""
@@ -672,6 +685,9 @@ do @@ -672,6 +685,9 @@ do
672 echo " --project-path Set the path for the customization data" 685 echo " --project-path Set the path for the customization data"
673 echo " --target-archs Set the target architectures (current are ${TARGET_ARCHS})" 686 echo " --target-archs Set the target architectures (current are ${TARGET_ARCHS})"
674 echo " --sources-from Base URL of the git server with the sources (current is ${GIT_URL})" 687 echo " --sources-from Base URL of the git server with the sources (current is ${GIT_URL})"
  688 + echo " --no-pre-reqs Don't try to install required packages"
  689 + echo " --pre-reqs Install required packages"
  690 + echo " --shell-on-error Open a shell when the build process failed"
675 691
676 if [ ! -z ${WIN_PACKAGE_SERVER} ]; then 692 if [ ! -z ${WIN_PACKAGE_SERVER} ]; then
677 echo " --no-publish Don't publish binaries in ${WIN_PACKAGE_SERVER}/${PRODUCT_NAME}" 693 echo " --no-publish Don't publish binaries in ${WIN_PACKAGE_SERVER}/${PRODUCT_NAME}"
win/pw3270.nsi.in
  Diff comments   View file @e5ee7b9
@@ -180,9 +180,9 @@ SubSection "@PRODUCT_NAME@" SecMain @@ -180,9 +180,9 @@ SubSection "@PRODUCT_NAME@" SecMain
180 ${DisableX64FSRedirection} 180 ${DisableX64FSRedirection}
181 CreateDirectory "$INSTDIR\dotnet" 181 CreateDirectory "$INSTDIR\dotnet"
182 182
183 - file "/oname=$INSTDIR\dotnet\tn3270-sharp.dll" "mono/lib/tn3270-sharp-5.2/tn3270-sharp.dll"  
184 - file "/oname=$INSTDIR\dotnet\pw3270-sharp.xml" "mono/gapi-2.0/tn3270-sharp/tn3270-sharp.xml"  
185 - file "/oname=$SYSDIR\lib3270-mono.dll" "lib3270-mono.dll" 183 + file "/oname=$INSTDIR\dotnet\tn3270.dll" "mono/lib/tn3270-5.2/tn3270.dll"
  184 + file "/oname=$INSTDIR\dotnet\tn3270.xml" "mono/gapi-2.0/tn3270/tn3270.xml"
  185 + file "/oname=$SYSDIR\mono-tn3270.dll" "mono-tn3270.dll"
186 186
187 sectionEnd 187 sectionEnd
188 !endif 188 !endif
@@ -261,7 +261,7 @@ Section "Uninstall" @@ -261,7 +261,7 @@ Section "Uninstall"
261 !endif 261 !endif
262 262
263 !ifdef WITHMONO 263 !ifdef WITHMONO
264 - delete $SYSDIR\lib3270-mono.dll 264 + delete $SYSDIR\mono-tn3270.dll
265 !endif 265 !endif
266 266
267 RMDir /r "$INSTDIR" 267 RMDir /r "$INSTDIR"