Download as
Browse Code »

Commit f4f842072bee276013863ac2b45e47839222dae5

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

Updating windows package.

Showing 3 changed files with 69 additions and 18 deletions   Show diff stats
@@ -33,7 +33,8 @@ Cross-compiling on SuSE Linux (Native or WSL) @@ -33,7 +33,8 @@ Cross-compiling on SuSE Linux (Native or WSL)
33 33
34 1. First add the MinGW Repositories for your SuSE version from: 34 1. First add the MinGW Repositories for your SuSE version from:
35 35
36 - * https://build.opensuse.org/project/show/home:PerryWerneck:pw3270 36 + * https://build.opensuse.org/project/show/windows:mingw:win32
  37 + * https://build.opensuse.org/project/show/windows:mingw:win64
37 38
38 2. Get pw3270 sources from git 39 2. Get pw3270 sources from git
39 40
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 2
3 PROJECTDIR=$(dirname $(dirname $(readlink -f ${0}))) 3 PROJECTDIR=$(dirname $(dirname $(readlink -f ${0})))
4 WORKDIR=$(mktemp -d) 4 WORKDIR=$(mktemp -d)
  5 +PUBLISH=0
5 6
6 if [ -e /etc/os-release ]; then 7 if [ -e /etc/os-release ]; then
7 . /etc/os-release 8 . /etc/os-release
@@ -175,14 +176,7 @@ pack() @@ -175,14 +176,7 @@ pack()
175 ./configure \ 176 ./configure \
176 --host=${host} \ 177 --host=${host} \
177 --prefix=${prefix} \ 178 --prefix=${prefix} \
178 - --libdir=${prefix}/lib \  
179 - --enable-self-signed-cert-check \  
180 - --enable-ssl-crl-check \  
181 - --enable-crl-expiration-check \  
182 - --disable-ldap \  
183 - --enable-curl \  
184 - --with-default-crl-url="ldap://pkildap.bb.com.br:389/CN=CRL1,CN=AC%20Banco%20do%20Brasil%20-%20EI%20v1,OU=ICP-BB,O=Banco%20do%20Brasil%20S.A.,C=BR?certificaterevocationlist" \  
185 - --with-default-host="tn3270s://3270.df.bb:9023" 179 + --libdir=${prefix}/lib
186 180
187 if [ "$?" != "0" ]; then 181 if [ "$?" != "0" ]; then
188 cleanup 182 cleanup
@@ -384,17 +378,73 @@ pack() @@ -384,17 +378,73 @@ pack()
384 fi 378 fi
385 fi 379 fi
386 380
387 -# if [ ! -z ${WIN_PACKAGE_SERVER} ]; then  
388 -# scp *.exe ${WIN_PACKAGE_SERVER}/pw3270  
389 -# if [ "$?" != "0" ]; then  
390 -# cleanup  
391 -# exit -1  
392 -# fi  
393 -# fi 381 + if [ "${PUBLISH}" == "1" ] && [ ! -z ${WIN_PACKAGE_SERVER} ]; then
  382 + scp *.exe ${WIN_PACKAGE_SERVER}/pw3270
  383 + if [ "$?" != "0" ]; then
  384 + cleanup
  385 + exit -1
  386 + fi
  387 + fi
394 388
395 } 389 }
396 390
397 # 391 #
  392 +# Setup options
  393 +#
  394 +until [ -z "$1" ]
  395 +do
  396 + if [ ${1:0:2} = '--' ]; then
  397 + tmp=${1:2}
  398 + parameter=${tmp%%=*}
  399 + parameter=$(echo $parameter | tr "[:lower:]" "[:upper:]")
  400 + value=${tmp##*=}
  401 +
  402 + case "$parameter" in
  403 + NOPUBLISH)
  404 + PUBLISH=0
  405 + ;;
  406 +
  407 + PUBLISH)
  408 + PUBLISH=1
  409 + ;;
  410 +
  411 + CLEAR)
  412 + if [ -d ~/public_html/win/pw3270 ]; then
  413 + rm -fr ~/public_html/win/pw3270{x86_32,x86_64}
  414 + fi
  415 + ;;
  416 +
  417 + HELP)
  418 + echo "${0} [OPTIONS]"
  419 + echo ""
  420 + echo "Options:"
  421 + echo ""
  422 +
  423 + if [ ! -z ${WIN_PACKAGE_SERVER} ]; then
  424 + echo " --nopublish Don't send packages to ${WIN_PACKAGE_SERVER}/pw3270"
  425 + echo " --publish Send packages to ${WIN_PACKAGE_SERVER}/pw3270"
  426 + fi
  427 +
  428 +
  429 + if [ -d ~/public_html/win/sisbb ]; then
  430 + echo " --clear Remove directories ~/public_html/win/pw3270{x86_32,x86_64}"
  431 + fi
  432 +
  433 + echo ""
  434 + exit 0
  435 +
  436 + ;;
  437 +
  438 + esac
  439 + fi
  440 +
  441 + shift
  442 +
  443 +done
  444 +
  445 +
  446 +
  447 +#
398 # Get sources from GIT 448 # Get sources from GIT
399 # 449 #
400 mkdir -p ${WORKDIR}/sources 450 mkdir -p ${WORKDIR}/sources
win/pw3270.nsi.in
  Diff comments   View file @f4f8420
@@ -73,8 +73,8 @@ SubSection "@PACKAGE@" SecMain @@ -73,8 +73,8 @@ SubSection "@PACKAGE@" SecMain
73 # Binary files 73 # Binary files
74 file "/oname=$INSTDIR\@PACKAGE@.exe" "bin\@PACKAGE@.exe" 74 file "/oname=$INSTDIR\@PACKAGE@.exe" "bin\@PACKAGE@.exe"
75 file "/oname=$INSTDIR\@PACKAGE@.ico" "@PACKAGE@.ico" 75 file "/oname=$INSTDIR\@PACKAGE@.ico" "@PACKAGE@.ico"
76 - file "/oname=$INSTDIR\lib3270.dll.@PACKAGE_VERSION@" "bin\lib3270.dll.@PACKAGE_VERSION@"  
77 - file "/oname=$INSTDIR\@PACKAGE@.dll.@PACKAGE_VERSION@" "bin\@PACKAGE@.dll.@PACKAGE_VERSION@" 76 + file "/oname=$INSTDIR\lib3270.dll" "bin\lib3270.dll"
  77 + file "/oname=$INSTDIR\@PACKAGE@.dll" "bin\@PACKAGE@.dll"
78 78
79 # Configuration files 79 # Configuration files
80 file "/oname=$INSTDIR\@PACKAGE@-logo.png" "@PACKAGE@-logo.png" 80 file "/oname=$INSTDIR\@PACKAGE@-logo.png" "@PACKAGE@-logo.png"