Download as
Browse Code »

Commit 076c3e5e9840c578fe4a9d8d9cc84e0673b62590

Authored by Perry Werneck
1 parent 7eb83e14
Exists in v5.2

Fixing customized windows build.

Showing 1 changed file with 8 additions and 26 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 mono-tn3270" 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 36
@@ -77,31 +77,19 @@ prepare() @@ -77,31 +77,19 @@ prepare()
77 77
78 mkdir -p ${WORKDIR}/sources 78 mkdir -p ${WORKDIR}/sources
79 79
80 - NAME_CHECK=$(echo "${1}" | grep -c "-")  
81 -  
82 - if [ "${NAME_CHECK}" == "0" ]; then  
83 - TEMPVAR=${1}_branch  
84 - BRANCH=${!TEMPVAR}  
85 - else  
86 - BRANCH=""  
87 - fi 80 + TEMPVAR=${1}_branch
  81 + BRANCH=${!TEMPVAR}
88 82
89 if [ -z ${BRANCH} ]; then 83 if [ -z ${BRANCH} ]; then
90 - git clone ${GIT_URL}/${1}.git --quiet ${WORKDIR}/sources/${1} 84 + git clone --quiet ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1}
91 else 85 else
92 - echo "Preparing ${1} ${BRANCH}"  
93 - echo -e "\e]2;Preparing ${1} ${BRANCH}\a"  
94 - git clone --branch "${BRANCH}" --quiet ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1} 86 + git clone --quiet --branch "${BRANCH}" ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1}
95 fi 87 fi
96 88
97 if [ "$?" != "0" ]; then 89 if [ "$?" != "0" ]; then
98 failed "Can't get sources for ${1}" 90 failed "Can't get sources for ${1}"
99 fi 91 fi
100 92
101 - if [ ! -e "${WORKDIR}/sources/${1}" ]; then  
102 - failed "Can't get sources for ${1}"  
103 - fi  
104 -  
105 if [ -x ${PROJECTDIR}/win/prepare.${1} ]; then 93 if [ -x ${PROJECTDIR}/win/prepare.${1} ]; then
106 pushd ${WORKDIR}/sources/${1} 94 pushd ${WORKDIR}/sources/${1}
107 ${PROJECTDIR}/win/prepare.${1} 95 ${PROJECTDIR}/win/prepare.${1}
@@ -209,9 +197,6 @@ buildLibrary() @@ -209,9 +197,6 @@ buildLibrary()
209 export cache=${WORKDIR}/cache/${ARCH}/${1}.cache 197 export cache=${WORKDIR}/cache/${ARCH}/${1}.cache
210 198
211 cd ${WORKDIR}/sources/${1} 199 cd ${WORKDIR}/sources/${1}
212 - if [ "$?" != "0" ]; then  
213 - failed "Can't change to ${WORKDIR}/sources/${1}"  
214 - fi  
215 200
216 if [ -x ${PROJECTDIR}/win/configure.${1} ]; then 201 if [ -x ${PROJECTDIR}/win/configure.${1} ]; then
217 202
@@ -313,9 +298,6 @@ buildExtraPackage() @@ -313,9 +298,6 @@ buildExtraPackage()
313 export cache=${WORKDIR}/cache/${ARCH}/${1}.cache 298 export cache=${WORKDIR}/cache/${ARCH}/${1}.cache
314 299
315 cd ${WORKDIR}/sources/${1} 300 cd ${WORKDIR}/sources/${1}
316 - if [ "$?" != "0" ]; then  
317 - failed "Can't change to ${WORKDIR}/sources/${1}"  
318 - fi  
319 301
320 if [ -x ${PROJECTDIR}/win/configure.${1} ]; then 302 if [ -x ${PROJECTDIR}/win/configure.${1} ]; then
321 303
@@ -571,10 +553,11 @@ makeInstaller() @@ -571,10 +553,11 @@ makeInstaller()
571 fi 553 fi
572 554
573 if [ -d ${PROJECTDIR}/ui ]; then 555 if [ -d ${PROJECTDIR}/ui ]; then
574 - mkdir -p ${WORKDIR}/build/${ARCH}/ui 556 + mkdir -p ${WORKDIR}/build/${ARCH}/${PRODUCT_NAME}/ui
575 cp -rv ${PROJECTDIR}/ui/* ${WORKDIR}/build/${ARCH}/${PRODUCT_NAME}/ui 557 cp -rv ${PROJECTDIR}/ui/* ${WORKDIR}/build/${ARCH}/${PRODUCT_NAME}/ui
  558 +
576 if [ "$?" != "0" ]; then 559 if [ "$?" != "0" ]; then
577 - failed "Can't copy customized UI" 560 + failed "Can't copy UI files"
578 fi 561 fi
579 fi 562 fi
580 563
@@ -587,7 +570,6 @@ makeInstaller() @@ -587,7 +570,6 @@ makeInstaller()
587 570
588 for NSI in *.nsi 571 for NSI in *.nsi
589 do 572 do
590 -  
591 makensis ${NSIS_ARGS} ${NSI} 573 makensis ${NSIS_ARGS} ${NSI}
592 if [ "$?" != "0" ]; then 574 if [ "$?" != "0" ]; then
593 echo makensis ${NSIS_ARGS} ${NSI} 575 echo makensis ${NSIS_ARGS} ${NSI}