Commit f851f6c3fb369a063399ca0aabe0f0bc519b060d
Exists in
master
and in
4 other branches
Fixing conflict.
Showing
2 changed files
with
10 additions
and
2 deletions
Show diff stats
win/pack.sh
... | ... | @@ -77,7 +77,15 @@ prepare() |
77 | 77 | |
78 | 78 | mkdir -p ${WORKDIR}/sources |
79 | 79 | |
80 | - git clone --quiet ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1} | |
80 | + TEMPVAR=${1}_branch | |
81 | + BRANCH=${!TEMPVAR} | |
82 | + | |
83 | + if [ -z ${BRANCH} ]; then | |
84 | + git clone --quiet ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1} | |
85 | + else | |
86 | + git clone --quiet --branch "${BRANCH}" ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1} | |
87 | + fi | |
88 | + | |
81 | 89 | if [ "$?" != "0" ]; then |
82 | 90 | failed "Can't get sources for ${1}" |
83 | 91 | fi | ... | ... |
win/pw3270.nsi.in
... | ... | @@ -218,7 +218,7 @@ SubSection "@PRODUCT_NAME@" SecMain |
218 | 218 | CreateDirectory "$INSTDIR\sdk\def" |
219 | 219 | CreateDirectory "$INSTDIR\sdk\lib" |
220 | 220 | |
221 | - file "/oname=$INSTDIR\sdk\def\lib@LIBRARY_NAME@.def" "@PRODUCT_NAME@\def\lib@LIBRARY_NAME@.def" | |
221 | + file "/oname=$INSTDIR\sdk\def\lib@LIBRARY_NAME@.def" "@PRODUCT_NAME@\def\lib@LIBRARY_NAME@.def" | |
222 | 222 | file "/oname=$INSTDIR\sdk\lib\lib3270.dll.a" "lib@LIBRARY_NAME@.dll.a" |
223 | 223 | file "/oname=$INSTDIR\sdk\lib\lib3270.delayed.a" "lib@LIBRARY_NAME@.delayed.a" |
224 | 224 | file "/oname=$INSTDIR\sdk\lib\lib3270.static.a" "lib@LIBRARY_NAME@.static.a" | ... | ... |