Download as
Browse Code »

Commit 7bd7f7fbf1b719390bb514cef2641e6e5c6ca431

Authored by Perry Werneck
1 parent e7c7ea4b
Exists in v5.2

Updating pack script

Showing 1 changed file with 48 additions and 10 deletions   Show diff stats
@@ -33,6 +33,7 @@ PACKAGE_PLUGINS="" @@ -33,6 +33,7 @@ PACKAGE_PLUGINS=""
33 PACKAGE_EXTRAS="libhllapi" 33 PACKAGE_EXTRAS="libhllapi"
34 TARGET_ARCHS="x86_64 x86_32" 34 TARGET_ARCHS="x86_64 x86_32"
35 GIT_URL="https://github.com/PerryWerneck" 35 GIT_URL="https://github.com/PerryWerneck"
  36 +BUILD_UNSTABLE=0
36 37
37 PROJECTDIR=$(dirname $(dirname $(readlink -f ${0}))) 38 PROJECTDIR=$(dirname $(dirname $(readlink -f ${0})))
38 WORKDIR=$(mktemp -d) 39 WORKDIR=$(mktemp -d)
@@ -67,22 +68,29 @@ failed() @@ -67,22 +68,29 @@ failed()
67 exit -1 68 exit -1
68 } 69 }
69 70
  71 +
70 # 72 #
71 # Get Sources from GIT 73 # Get Sources from GIT
72 # 74 #
73 -prepare() 75 +clone()
74 { 76 {
75 - echo -e "\e]2;Preparing ${1}\a"  
76 - echo "Preparing ${1}" 77 + echo -e "\e]2;Cloning ${1}\a"
  78 + echo "Cloning ${1}"
77 79
78 mkdir -p ${WORKDIR}/sources 80 mkdir -p ${WORKDIR}/sources
79 81
80 - TEMPVAR=${1}_branch  
81 - BRANCH=${!TEMPVAR} 82 + if [ "${BUILD_UNSTABLE}" == "1" ]; then
  83 + BRANCH="develop"
  84 + else
  85 + TEMPVAR=${1}_branch
  86 + BRANCH=${!TEMPVAR}
  87 + fi
82 88
83 if [ -z ${BRANCH} ]; then 89 if [ -z ${BRANCH} ]; then
84 git clone --quiet ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1} 90 git clone --quiet ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1}
85 else 91 else
  92 + echo -e "\e]2;Cloning ${1} ${BRANCH}\a"
  93 + echo "Cloning ${1} ${BRANCH}"
86 git clone --quiet --branch "${BRANCH}" ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1} 94 git clone --quiet --branch "${BRANCH}" ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1}
87 fi 95 fi
88 96
@@ -90,6 +98,13 @@ prepare() @@ -90,6 +98,13 @@ prepare()
90 failed "Can't get sources for ${1}" 98 failed "Can't get sources for ${1}"
91 fi 99 fi
92 100
  101 +}
  102 +
  103 +prepare()
  104 +{
  105 + echo -e "\e]2;Preparing ${1}\a"
  106 + echo "Preparing ${1}"
  107 +
93 if [ -x ${PROJECTDIR}/win/prepare.${1} ]; then 108 if [ -x ${PROJECTDIR}/win/prepare.${1} ]; then
94 pushd ${WORKDIR}/sources/${1} 109 pushd ${WORKDIR}/sources/${1}
95 ${PROJECTDIR}/win/prepare.${1} 110 ${PROJECTDIR}/win/prepare.${1}
@@ -584,18 +599,25 @@ makeInstaller() @@ -584,18 +599,25 @@ makeInstaller()
584 failed "Error building ${ARCH} ${NSI}" 599 failed "Error building ${ARCH} ${NSI}"
585 fi 600 fi
586 601
  602 + if [ ${BUILD_UNSTABLE} == "1" ]; then
  603 + TARGET_PATH="/${PRODUCT_NAME}/unstable/${ARCH}"
  604 + else
  605 + TARGET_PATH="/${PRODUCT_NAME}/${ARCH}"
  606 + fi
  607 +
587 if [ -d ~/public_html ]; then 608 if [ -d ~/public_html ]; then
588 - mkdir -p ~/public_html/win/${PRODUCT_NAME}/${ARCH}  
589 - cp -v *-[0-9]*-${TARCH}.exe ~/public_html/win/${PRODUCT_NAME}/${ARCH} 609 + mkdir -p ~/public_html/win/${TARGET_PATH}
  610 + cp -v *-[0-9]*-${TARCH}.exe ~/public_html/win/${TARGET_PATH}
590 if [ "$?" != "0" ]; then 611 if [ "$?" != "0" ]; then
591 - failed "Can't copy binary to ~/public_html/win/${PRODUCT_NAME}/${ARCH}" 612 + failed "Can't copy binary to ~/public_html/win/${TARGET_PATH}"
592 fi 613 fi
593 fi 614 fi
594 615
595 if [ "${PUBLISH}" == "1" ] && [ ! -z ${WIN_PACKAGE_SERVER} ]; then 616 if [ "${PUBLISH}" == "1" ] && [ ! -z ${WIN_PACKAGE_SERVER} ]; then
596 - scp *-[0-9]*-${TARCH}.exe ${WIN_PACKAGE_SERVER}/${PRODUCT_NAME}/${ARCH} 617 +
  618 + scp *-[0-9]*-${TARCH}.exe ${WIN_PACKAGE_SERVER}/${TARGET_PATH}
597 if [ "$?" != "0" ]; then 619 if [ "$?" != "0" ]; then
598 - failed "Can't publish to ${WIN_PACKAGE_SERVER}/${PRODUCT_NAME}/${ARCH}" 620 + failed "Can't publish to ${WIN_PACKAGE_SERVER}/${TARGET_PATH}"
599 fi 621 fi
600 fi 622 fi
601 623
@@ -704,6 +726,14 @@ do @@ -704,6 +726,14 @@ do
704 PROJECTDIR=$(readlink -f ${value}) 726 PROJECTDIR=$(readlink -f ${value})
705 ;; 727 ;;
706 728
  729 + UNSTABLE)
  730 + BUILD_UNSTABLE=1
  731 + ;;
  732 +
  733 + DEVELOP)
  734 + BUILD_UNSTABLE=1
  735 + ;;
  736 +
707 SHELL-ON-ERROR) 737 SHELL-ON-ERROR)
708 PAUSE_ON_ERROR=1 738 PAUSE_ON_ERROR=1
709 ;; 739 ;;
@@ -720,6 +750,7 @@ do @@ -720,6 +750,7 @@ do
720 echo " --no-pre-reqs Don't try to install required packages" 750 echo " --no-pre-reqs Don't try to install required packages"
721 echo " --pre-reqs Install required packages" 751 echo " --pre-reqs Install required packages"
722 echo " --shell-on-error Open a shell when the build process failed" 752 echo " --shell-on-error Open a shell when the build process failed"
  753 + echo " --unstable Build unstable version"
723 754
724 if [ ! -z ${WIN_PACKAGE_SERVER} ]; then 755 if [ ! -z ${WIN_PACKAGE_SERVER} ]; then
725 echo " --no-publish Don't publish binaries in ${WIN_PACKAGE_SERVER}/${PRODUCT_NAME}" 756 echo " --no-publish Don't publish binaries in ${WIN_PACKAGE_SERVER}/${PRODUCT_NAME}"
@@ -754,18 +785,25 @@ fi @@ -754,18 +785,25 @@ fi
754 # 785 #
755 for src in ${CORE_LIBRARIES} 786 for src in ${CORE_LIBRARIES}
756 do 787 do
  788 + echo "Core library: ${src}"
  789 + clone ${src}
757 prepare ${src} 790 prepare ${src}
758 done 791 done
759 792
  793 +clone pw3270
760 prepare pw3270 794 prepare pw3270
761 795
762 for src in ${PACKAGE_PLUGINS} 796 for src in ${PACKAGE_PLUGINS}
763 do 797 do
  798 + echo "Plugin module: ${src}"
  799 + clone pw3270-plugin-${src}
764 prepare pw3270-plugin-${src} 800 prepare pw3270-plugin-${src}
765 done 801 done
766 802
767 for src in ${PACKAGE_EXTRAS} 803 for src in ${PACKAGE_EXTRAS}
768 do 804 do
  805 + echo "Extra package: ${src}"
  806 + clone ${src}
769 prepare ${src} 807 prepare ${src}
770 done 808 done
771 809