Download as
Browse Code »

Commit 3a057b77d50edd895650fecb6fd7a91af0baf213

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

Fixing windows builds.

Showing 1 changed file with 19 additions and 14 deletions   Show diff stats
win/pack.sh
  Diff comments   View file @3a057b7
1 1 #!/bin/bash
2 2  
3   -PROJECT_NAME="pw3270"
  3 +PRODUCT_NAME="pw3270"
4 4 LIBRARY_NAME="lib3270"
5 5 CORE_LIBRARIES="lib3270 libv3270"
6 6 PACKAGE_PLUGINS="ipc"
... ... @@ -138,7 +138,7 @@ buildLibrary()
138 138 mkdir -p ${WORKDIR}/build/${ARCH}/locale
139 139 mkdir -p ${WORKDIR}/build/${ARCH}/include
140 140  
141   - export PKG_CONFIG_PATH=${WORKDIR}/build/${ARCH}/lib/pkgconfig
  141 + export PKG_CONFIG_PATH=${WORKDIR}/build/${ARCH}/pkgconfig
142 142 export cache=${WORKDIR}/cache/${ARCH}/${1}.cache
143 143  
144 144 cd ${WORKDIR}/sources/${1}
... ... @@ -168,6 +168,7 @@ buildLibrary()
168 168 --datarootdir=${WORKDIR}/build/${ARCH}
169 169 fi
170 170  
  171 + /bin/bash
171 172  
172 173 if [ "$?" != "0" ]; then
173 174 failed "Can't configure ${1}"
... ... @@ -234,7 +235,7 @@ buildApplication()
234 235 mkdir -p ${WORKDIR}/build/${ARCH}/include
235 236  
236 237 export HOST_CC=/usr/bin/gcc
237   - export PKG_CONFIG_PATH=${WORKDIR}/build/${ARCH}/lib/pkgconfig
  238 + export PKG_CONFIG_PATH=${WORKDIR}/build/${ARCH}/pkgconfig
238 239 export cache=${WORKDIR}/cache/${ARCH}/${1}.cache
239 240  
240 241 cd ${WORKDIR}/sources/${1}
... ... @@ -391,17 +392,17 @@ makeInstaller()
391 392 ls -l *-[0-9]*-${TARCH}.exe
392 393  
393 394 if [ -d ~/public_html ]; then
394   - mkdir -p ~/public_html/win/${PROJECT_NAME}/${ARCH}
395   - cp -v *-[0-9]*-${TARCH}.exe ~/public_html/win/${PROJECT_NAME}/${ARCH}
  395 + mkdir -p ~/public_html/win/${PRODUCT_NAME}/${ARCH}
  396 + cp -v *-[0-9]*-${TARCH}.exe ~/public_html/win/${PRODUCT_NAME}/${ARCH}
396 397 if [ "$?" != "0" ]; then
397   - failed "Can't copy binary to ~/public_html/win/${PROJECT_NAME}/${ARCH}"
  398 + failed "Can't copy binary to ~/public_html/win/${PRODUCT_NAME}/${ARCH}"
398 399 fi
399 400 fi
400 401  
401 402 if [ "${PUBLISH}" == "1" ] && [ ! -z ${WIN_PACKAGE_SERVER} ]; then
402   - scp *-[0-9]*-${TARCH}.exe ${WIN_PACKAGE_SERVER}/${PROJECT_NAME}/${ARCH}
  403 + scp *-[0-9]*-${TARCH}.exe ${WIN_PACKAGE_SERVER}/${PRODUCT_NAME}/${ARCH}
403 404 if [ "$?" != "0" ]; then
404   - failed "Can't publish to ${WIN_PACKAGE_SERVER}/${PROJECT_NAME}/${ARCH}"
  405 + failed "Can't publish to ${WIN_PACKAGE_SERVER}/${PRODUCT_NAME}/${ARCH}"
405 406 fi
406 407 fi
407 408  
... ... @@ -436,9 +437,13 @@ do
436 437 PUBLISH=1
437 438 ;;
438 439  
  440 + PRODUCT)
  441 + PRODUCT_NAME=${value}
  442 + ;;
  443 +
439 444 CLEAR)
440   - if [ -d ~/public_html/win/${PROJECT_NAME} ]; then
441   - rm -fr ~/public_html/win/${PROJECT_NAME}/{x86_32,x86_64}
  445 + if [ -d ~/public_html/win/${PRODUCT_NAME} ]; then
  446 + rm -fr ~/public_html/win/${PRODUCT_NAME}/{x86_32,x86_64}
442 447 fi
443 448  
444 449 ;;
... ... @@ -455,13 +460,13 @@ do
455 460 echo ""
456 461  
457 462 if [ ! -z ${WIN_PACKAGE_SERVER} ]; then
458   - echo " --nopublish Don't publish binaries in ${WIN_PACKAGE_SERVER}/${PROJECT_NAME}"
459   - echo " --publish Publish binaries in ${WIN_PACKAGE_SERVER}/${PROJECT_NAME}"
  463 + echo " --nopublish Don't publish binaries in ${WIN_PACKAGE_SERVER}/${PRODUCT_NAME}"
  464 + echo " --publish Publish binaries in ${WIN_PACKAGE_SERVER}/${PRODUCT_NAME}"
460 465 fi
461 466  
462 467  
463   - if [ -d ~/public_html/win/${PROJECT_NAME} ]; then
464   - echo " --clear Remove ~/public_html/win/${PROJECT_NAME}/{x86_32,x86_64}"
  468 + if [ -d ~/public_html/win/${PRODUCT_NAME} ]; then
  469 + echo " --clear Remove ~/public_html/win/${PRODUCT_NAME}/{x86_32,x86_64}"
465 470 fi
466 471  
467 472 echo ""
... ...