Download as
Browse Code »

Commit 955ce7ab1bbbe9eadea34c99bc8528a677abfe89

Authored by Perry Werneck
1 parent e7f00514
Exists in master and in 4 other branches develop, edit-header-bar, keypads, script-support

Preparing for windows unstable version.

Showing 1 changed file with 38 additions and 12 deletions   Show diff stats
win/pack.sh
  Diff comments   View file @955ce7a
... ... @@ -33,6 +33,7 @@ PACKAGE_PLUGINS=""
33 33 PACKAGE_EXTRAS="libhllapi"
34 34 TARGET_ARCHS="x86_64 x86_32"
35 35 GIT_URL="https://github.com/PerryWerneck"
  36 +BUILD_UNSTABLE=0
36 37  
37 38 PROJECTDIR=$(dirname $(dirname $(readlink -f ${0})))
38 39 WORKDIR=$(mktemp -d)
... ... @@ -78,15 +79,25 @@ clone()
78 79  
79 80 mkdir -p ${WORKDIR}/sources
80 81  
81   - TEMPVAR=${1}_branch
82   - BRANCH=${!TEMPVAR}
  82 + if [ "${BUILD_UNSTABLE}" == "1" ]; then
  83 + BRANCH="develop"
  84 + else
  85 + TEMPVAR=${1}_branch
  86 + BRANCH=${!TEMPVAR}
  87 + fi
83 88  
84 89 if [ -z ${BRANCH} ]; then
85 90 git clone --quiet ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1}
86 91 else
  92 + echo -e "\e]2;Cloning ${1} ${BRANCH}\a"
  93 + echo "Cloning ${1} ${BRANCH}"
87 94 git clone --quiet --branch "${BRANCH}" ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1}
88 95 fi
89 96  
  97 + if [ "$?" != "0" ]; then
  98 + failed "Can't get sources for ${1}"
  99 + fi
  100 +
90 101 }
91 102  
92 103 prepare()
... ... @@ -94,10 +105,6 @@ prepare()
94 105 echo -e "\e]2;Preparing ${1}\a"
95 106 echo "Preparing ${1}"
96 107  
97   - if [ "$?" != "0" ]; then
98   - failed "Can't get sources for ${1}"
99   - fi
100   -
101 108 if [ -x ${PROJECTDIR}/win/prepare.${1} ]; then
102 109 pushd ${WORKDIR}/sources/${1}
103 110 ${PROJECTDIR}/win/prepare.${1}
... ... @@ -593,18 +600,25 @@ makeInstaller()
593 600 failed "Error building ${ARCH} ${NSI}"
594 601 fi
595 602  
  603 + if [ ${BUILD_UNSTABLE} == "1" ]; then
  604 + TARGET_PATH="/${PRODUCT_NAME}/unstable/${ARCH}"
  605 + else
  606 + TARGET_PATH="/${PRODUCT_NAME}/${ARCH}"
  607 + fi
  608 +
596 609 if [ -d ~/public_html ]; then
597   - mkdir -p ~/public_html/win/${PRODUCT_NAME}/${ARCH}
598   - cp -v *-[0-9]*-${TARCH}.exe ~/public_html/win/${PRODUCT_NAME}/${ARCH}
  610 + mkdir -p ~/public_html/win/${TARGET_PATH}
  611 + cp -v *-[0-9]*-${TARCH}.exe ~/public_html/win/${TARGET_PATH}
599 612 if [ "$?" != "0" ]; then
600   - failed "Can't copy binary to ~/public_html/win/${PRODUCT_NAME}/${ARCH}"
  613 + failed "Can't copy binary to ~/public_html/win/${TARGET_PATH}"
601 614 fi
602 615 fi
603 616  
604 617 if [ "${PUBLISH}" == "1" ] && [ ! -z ${WIN_PACKAGE_SERVER} ]; then
605   - scp *-[0-9]*-${TARCH}.exe ${WIN_PACKAGE_SERVER}/${PRODUCT_NAME}/${ARCH}
  618 +
  619 + scp *-[0-9]*-${TARCH}.exe ${WIN_PACKAGE_SERVER}/${TARGET_PATH}
606 620 if [ "$?" != "0" ]; then
607   - failed "Can't publish to ${WIN_PACKAGE_SERVER}/${PRODUCT_NAME}/${ARCH}"
  621 + failed "Can't publish to ${WIN_PACKAGE_SERVER}/${TARGET_PATH}"
608 622 fi
609 623 fi
610 624  
... ... @@ -713,6 +727,14 @@ do
713 727 PROJECTDIR=$(readlink -f ${value})
714 728 ;;
715 729  
  730 + UNSTABLE)
  731 + BUILD_UNSTABLE=1
  732 + ;;
  733 +
  734 + DEVELOP)
  735 + BUILD_UNSTABLE=1
  736 + ;;
  737 +
716 738 SHELL-ON-ERROR)
717 739 PAUSE_ON_ERROR=1
718 740 ;;
... ... @@ -729,6 +751,7 @@ do
729 751 echo " --no-pre-reqs Don't try to install required packages"
730 752 echo " --pre-reqs Install required packages"
731 753 echo " --shell-on-error Open a shell when the build process failed"
  754 + echo " --unstable Build unstable version"
732 755  
733 756 if [ ! -z ${WIN_PACKAGE_SERVER} ]; then
734 757 echo " --no-publish Don't publish binaries in ${WIN_PACKAGE_SERVER}/${PRODUCT_NAME}"
... ... @@ -763,21 +786,24 @@ fi
763 786 #
764 787 for src in ${CORE_LIBRARIES}
765 788 do
  789 + echo "Core library: ${src}"
766 790 clone ${src}
767 791 prepare ${src}
768 792 done
769 793  
770   -clone ${src}
  794 +clone pw3270
771 795 prepare pw3270
772 796  
773 797 for src in ${PACKAGE_PLUGINS}
774 798 do
  799 + echo "Plugin module: ${src}"
775 800 clone pw3270-plugin-${src}
776 801 prepare pw3270-plugin-${src}
777 802 done
778 803  
779 804 for src in ${PACKAGE_EXTRAS}
780 805 do
  806 + echo "Extra package: ${src}"
781 807 clone ${src}
782 808 prepare ${src}
783 809 done
... ...