Download as
Browse Code »

Commit ceb068efbed010350a2b32b13048244e1a7462b3

Authored by Perry Werneck
1 parent 143e77a2
Exists in v5.2

Reactivating .NET extension on windows package.

Showing 1 changed file with 16 additions and 5 deletions   Show diff stats
@@ -30,7 +30,7 @@ PRODUCT_NAME="pw3270" @@ -30,7 +30,7 @@ PRODUCT_NAME="pw3270"
30 LIBRARY_NAME="lib3270" 30 LIBRARY_NAME="lib3270"
31 CORE_LIBRARIES="lib3270 libv3270 libipc3270" 31 CORE_LIBRARIES="lib3270 libv3270 libipc3270"
32 PACKAGE_PLUGINS="" 32 PACKAGE_PLUGINS=""
33 -PACKAGE_EXTRAS="libhllapi tn3270-mono" 33 +PACKAGE_EXTRAS="libhllapi mono-tn3270"
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 36
@@ -77,21 +77,32 @@ prepare() @@ -77,21 +77,32 @@ prepare()
77 77
78 mkdir -p ${WORKDIR}/sources 78 mkdir -p ${WORKDIR}/sources
79 79
80 - TEMPVAR=${1}_branch  
81 - BRANCH=${!TEMPVAR} 2> /dev/null 80 + NAME_CHECK=$(echo "${1}" | grep -c "-")
  81 +
  82 + if [ "${NAME_CHECK}" == "0" ]; then
  83 + TEMPVAR=${1}_branch
  84 + BRANCH=${!TEMPVAR}
  85 + echo "${TEMPVAR}: ${BRANCH}"
  86 + else
  87 + BRANCH=""
  88 + fi
82 89
83 if [ -z ${BRANCH} ]; then 90 if [ -z ${BRANCH} ]; then
84 - git clone --quiet ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1} 91 + git clone ${GIT_URL}/${1}.git --quiet ${WORKDIR}/sources/${1}
85 else 92 else
86 echo "Preparing ${1} ${BRANCH}" 93 echo "Preparing ${1} ${BRANCH}"
87 echo -e "\e]2;Preparing ${1} ${BRANCH}\a" 94 echo -e "\e]2;Preparing ${1} ${BRANCH}\a"
88 - git clone --quiet --branch "${BRANCH}" ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1} 95 + git clone --branch "${BRANCH}" --quiet ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1}
89 fi 96 fi
90 97
91 if [ "$?" != "0" ]; then 98 if [ "$?" != "0" ]; then
92 failed "Can't get sources for ${1}" 99 failed "Can't get sources for ${1}"
93 fi 100 fi
94 101
  102 + if [ ! -e "${WORKDIR}/sources/${1}" ]; then
  103 + failed "Can't get sources for ${1}"
  104 + fi
  105 +
95 if [ -x ${PROJECTDIR}/win/prepare.${1} ]; then 106 if [ -x ${PROJECTDIR}/win/prepare.${1} ]; then
96 pushd ${WORKDIR}/sources/${1} 107 pushd ${WORKDIR}/sources/${1}
97 ${PROJECTDIR}/win/prepare.${1} 108 ${PROJECTDIR}/win/prepare.${1}