Download as
Browse Code »

Commit 9a1f6ffe96a207579f1e8a6f424192fef96f7ddf

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

Fixing windows package customization options.

Showing 2 changed files with 11 additions and 13 deletions   Show diff stats
win/pack.sh
  Diff comments   View file @9a1f6ff
... ... @@ -12,6 +12,7 @@ PROJECTDIR=$(dirname $(dirname $(readlink -f ${0})))
12 12 WORKDIR=$(mktemp -d)
13 13 PUBLISH=0
14 14 GET_PREREQS=1
  15 +CERTS_DIR=${WORKDIR}/certs
15 16  
16 17 if [ -e /etc/os-release ]; then
17 18 . /etc/os-release
... ... @@ -390,23 +391,16 @@ makeInstaller()
390 391 {
391 392 NSIS_ARGS="-DWITHGTK"
392 393  
393   - if [ -d ${WORKDIR}/certs ]; then
394   - NSIS_ARGS="${NSIS_ARGS} -DWITHCERTS"
  394 + if [ -d ${CERTS_DIR} ]; then
395 395  
396   - export SSL_CERT_DIR=${WORKDIR}/build/${ARCH}/sslcerts
  396 + NSIS_ARGS="${NSIS_ARGS} -DWITHCERTS"
397 397  
398   - mkdir -p ${SSL_CERT_DIR}
399   - cp -rv ${WORKDIR}/certs ${SSL_CERT_DIR}
  398 + mkdir -p ${WORKDIR}/build/${ARCH}/sslcerts
  399 + cp -rv ${CERTS_DIR} ${WORKDIR}/build/${ARCH}/sslcerts
400 400 if [ "$?" != "0" ]; then
401 401 failed "Can't copy certs"
402 402 fi
403 403  
404   - c_rehash
405   - if [ "$?" != "0" ]; then
406   - failed "Can't hash certs"
407   - fi
408   -
409   -
410 404 fi
411 405  
412 406 if [ ! -z "${PACKAGE_PLUGINS}" ]; then
... ... @@ -529,6 +523,10 @@ do
529 523 GIT_URL=${value}
530 524 ;;
531 525  
  526 + CERTS-FROM)
  527 + CERTS_DIR=${value}
  528 + ;;
  529 +
532 530 ADD-REPOS)
533 531 addRepos
534 532 exit 0
... ...
win/pw3270.nsi.in
  Diff comments   View file @9a1f6ff
... ... @@ -74,7 +74,7 @@ SubSection "@PACKAGE@" SecMain
74 74 # Binary files
75 75 file "/oname=$INSTDIR\@PRODUCT_NAME@.exe" "@PACKAGE@.exe"
76 76 file "/oname=$INSTDIR\@PRODUCT_NAME@.ico" "@PACKAGE@.ico"
77   - file "/oname=$INSTDIR\@LIBRARY_NAME@.dll" "@LIBRARY_NAME@.dll"
  77 + file "/oname=$INSTDIR\lib@LIBRARY_NAME@.dll" "lib@LIBRARY_NAME@.dll"
78 78 file "/oname=$INSTDIR\libv3270.dll" "libv3270.dll"
79 79 file "/oname=$INSTDIR\@PACKAGE@.dll" "@PACKAGE@.dll"
80 80  
... ... @@ -135,7 +135,7 @@ SubSection "@PACKAGE@" SecMain
135 135 sectionEnd
136 136  
137 137 !ifdef WITHCERTS
138   - Section "SSL Certificates" SecCerts
  138 + Section "SSL Certs" SecCerts
139 139 setOutPath $INSTDIR\certs
140 140 file /r "certs\*.*"
141 141 sectionEnd
... ...