Download as
Browse Code »

Commit ddb1405c744fb076fbd09d0a2d24c2af6052d112

Authored by Perry Werneck
1 parent 62dd4bc8
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 22 additions and 13 deletions   Show diff stats
win/pack.sh
  Diff comments   View file @ddb1405
... ... @@ -35,16 +35,25 @@ failed()
35 35 #
36 36 # Get Sources from GIT
37 37 #
38   -getSource()
  38 +prepare()
39 39 {
40   - echo -e "\e]2;Getting sources for ${1}\a"
41   - echo "Getting sources for ${1}"
  40 + echo -e "\e]2;Preparing ${1}\a"
  41 + echo "Preparing ${1}"
42 42  
43 43 mkdir -p ${WORKDIR}/sources
44 44  
45   - git clone ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1}
  45 + git clone --quiet ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1}
46 46 if [ "$?" != "0" ]; then
47   - faile "Can't get sources for ${1}"
  47 + failed "Can't get sources for ${1}"
  48 + fi
  49 +
  50 + if [ -x ${PROJECTDIR}/win/prepare.${1} ]; then
  51 + pushd ${WORKDIR}/sources/${1}
  52 + ${PROJECTDIR}/win/prepare.${1}
  53 + if [ "$?" != "0" ]; then
  54 + failed "Can't prepare ${1}"
  55 + fi
  56 + popd
48 57 fi
49 58  
50 59 for ARCH in ${TARGET_ARCHS}
... ... @@ -154,9 +163,9 @@ buildLibrary()
154 163  
155 164 if [ -x ${PROJECTDIR}/win/configure.${1} ]; then
156 165  
157   - HOST="${host}" \
158   - PREFIX="${prefix}" \
159   - BUILDDIR="{WORKDIR}/build/${ARCH}}" \
  166 + host="${host}" \
  167 + prefix="${prefix}" \
  168 + BUILDDIR="${WORKDIR}/build/${ARCH}}" \
160 169 CFLAGS="-I${WORKDIR}/build/${ARCH}/include" \
161 170 LDFLAGS="-L${WORKDIR}/build/${ARCH}" \
162 171 ${PROJECTDIR}/win/configure.${1}
... ... @@ -509,7 +518,7 @@ do
509 518  
510 519 ;;
511 520  
512   - PATH)
  521 + PROJECT-DIR)
513 522 PROJECTDIR=$(readlink -f ${value})
514 523 ;;
515 524  
... ... @@ -554,19 +563,19 @@ fi
554 563 #
555 564 for src in ${CORE_LIBRARIES}
556 565 do
557   - getSource ${src}
  566 + prepare ${src}
558 567 done
559 568  
560   -getSource pw3270
  569 +prepare pw3270
561 570  
562 571 for src in ${PACKAGE_PLUGINS}
563 572 do
564   - getSource pw3270-plugin-${src}
  573 + prepare pw3270-plugin-${src}
565 574 done
566 575  
567 576 for src in ${PACKAGE_LANGUAGE_BINDINGS}
568 577 do
569   - getSource lib3270-${src}-bindings
  578 + prepare lib3270-${src}-bindings
570 579 done
571 580  
572 581 #
... ...