Commit 9a1f6ffe96a207579f1e8a6f424192fef96f7ddf
1 parent
093946dc
Exists in
master
and in
5 other branches
Fixing windows package customization options.
Showing
2 changed files
with
11 additions
and
13 deletions
Show diff stats
win/pack.sh
| @@ -12,6 +12,7 @@ PROJECTDIR=$(dirname $(dirname $(readlink -f ${0}))) | @@ -12,6 +12,7 @@ PROJECTDIR=$(dirname $(dirname $(readlink -f ${0}))) | ||
| 12 | WORKDIR=$(mktemp -d) | 12 | WORKDIR=$(mktemp -d) |
| 13 | PUBLISH=0 | 13 | PUBLISH=0 |
| 14 | GET_PREREQS=1 | 14 | GET_PREREQS=1 |
| 15 | +CERTS_DIR=${WORKDIR}/certs | ||
| 15 | 16 | ||
| 16 | if [ -e /etc/os-release ]; then | 17 | if [ -e /etc/os-release ]; then |
| 17 | . /etc/os-release | 18 | . /etc/os-release |
| @@ -390,23 +391,16 @@ makeInstaller() | @@ -390,23 +391,16 @@ makeInstaller() | ||
| 390 | { | 391 | { |
| 391 | NSIS_ARGS="-DWITHGTK" | 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 | if [ "$?" != "0" ]; then | 400 | if [ "$?" != "0" ]; then |
| 401 | failed "Can't copy certs" | 401 | failed "Can't copy certs" |
| 402 | fi | 402 | fi |
| 403 | 403 | ||
| 404 | - c_rehash | ||
| 405 | - if [ "$?" != "0" ]; then | ||
| 406 | - failed "Can't hash certs" | ||
| 407 | - fi | ||
| 408 | - | ||
| 409 | - | ||
| 410 | fi | 404 | fi |
| 411 | 405 | ||
| 412 | if [ ! -z "${PACKAGE_PLUGINS}" ]; then | 406 | if [ ! -z "${PACKAGE_PLUGINS}" ]; then |
| @@ -529,6 +523,10 @@ do | @@ -529,6 +523,10 @@ do | ||
| 529 | GIT_URL=${value} | 523 | GIT_URL=${value} |
| 530 | ;; | 524 | ;; |
| 531 | 525 | ||
| 526 | + CERTS-FROM) | ||
| 527 | + CERTS_DIR=${value} | ||
| 528 | + ;; | ||
| 529 | + | ||
| 532 | ADD-REPOS) | 530 | ADD-REPOS) |
| 533 | addRepos | 531 | addRepos |
| 534 | exit 0 | 532 | exit 0 |
win/pw3270.nsi.in
| @@ -74,7 +74,7 @@ SubSection "@PACKAGE@" SecMain | @@ -74,7 +74,7 @@ SubSection "@PACKAGE@" SecMain | ||
| 74 | # Binary files | 74 | # Binary files |
| 75 | file "/oname=$INSTDIR\@PRODUCT_NAME@.exe" "@PACKAGE@.exe" | 75 | file "/oname=$INSTDIR\@PRODUCT_NAME@.exe" "@PACKAGE@.exe" |
| 76 | file "/oname=$INSTDIR\@PRODUCT_NAME@.ico" "@PACKAGE@.ico" | 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 | file "/oname=$INSTDIR\libv3270.dll" "libv3270.dll" | 78 | file "/oname=$INSTDIR\libv3270.dll" "libv3270.dll" |
| 79 | file "/oname=$INSTDIR\@PACKAGE@.dll" "@PACKAGE@.dll" | 79 | file "/oname=$INSTDIR\@PACKAGE@.dll" "@PACKAGE@.dll" |
| 80 | 80 | ||
| @@ -135,7 +135,7 @@ SubSection "@PACKAGE@" SecMain | @@ -135,7 +135,7 @@ SubSection "@PACKAGE@" SecMain | ||
| 135 | sectionEnd | 135 | sectionEnd |
| 136 | 136 | ||
| 137 | !ifdef WITHCERTS | 137 | !ifdef WITHCERTS |
| 138 | - Section "SSL Certificates" SecCerts | 138 | + Section "SSL Certs" SecCerts |
| 139 | setOutPath $INSTDIR\certs | 139 | setOutPath $INSTDIR\certs |
| 140 | file /r "certs\*.*" | 140 | file /r "certs\*.*" |
| 141 | sectionEnd | 141 | sectionEnd |