diff --git a/android/mythbuild.sh b/android/mythbuild.sh
index c4dbd93..65a18d0 100755
a
|
b
|
if [ $SHADOW_BUILD = 1 ]; then |
287 | 287 | else |
288 | 288 | # cheap mans shadow build |
289 | 289 | MYTHTVSRC=. |
| 290 | SOURCE_VERSION=$(git -C $MYMYTHPATH describe --dirty || git -C $MYMYTHPATH describe || echo Unknown) |
| 291 | BRANCH=$(git -C $MYMYTHPATH branch --no-color | sed -e '/^[^\*]/d' -e 's/^\* //' -e 's/(no branch)/exported/') |
| 292 | pushd $MYMYTHBUILDPATH |
| 293 | echo "Format" > EXPORTED_VERSION |
| 294 | echo "SOURCE_VERSION=\"$SOURCE_VERSION\"" > VERSION |
| 295 | echo "BRANCH=\"$BRANCH\"" >> VERSION |
| 296 | popd |
290 | 297 | if [ ! -e $MYMYTHBUILDBASEPATH/mythtv/stamp_shadow_android ] ; then |
291 | 298 | rm -r $MYMYTHBUILDBASEPATH |
292 | 299 | cp -as `readlink -f $MYMYTHPATH` $MYMYTHBUILDBASEPATH |
… |
… |
else |
294 | 301 | pushd $MYMYTHBUILDBASEPATH |
295 | 302 | git -C $MYMYTHPATH ls-files -o | grep -vE "kdev4|user|src" | xargs -n1 rm |
296 | 303 | popd |
297 | | SOURCE_VERSION=$(git -C $MYMYTHPATH describe --dirty || git -C $MYMYTHPATH describe || echo Unknown) |
298 | | BRANCH=$(git -C $MYMYTHPATH branch --no-color | sed -e '/^[^\*]/d' -e 's/^\* //' -e 's/(no branch)/exported/') |
299 | | pushd $MYMYTHBUILDPATH |
300 | | rm EXPORTED_VERSION || true |
301 | | rm VERSION || true |
302 | | popd |
303 | 304 | touch $MYMYTHBUILDBASEPATH/mythtv/stamp_shadow_android |
304 | 305 | fi |
305 | 306 | pwd |
306 | | if [ ! -e $MYMYTHBUILDBASEPATH/mythtv/stamp_configure_android ] ; then |
307 | | cd $MYMYTHBUILDPATH |
308 | | echo "Format" > EXPORTED_VERSION |
309 | | echo "SOURCE_VERSION=\"$SOURCE_VERSION\"" > VERSION |
310 | | echo "BRANCH=\"$BRANCH\"" >> VERSION |
311 | | export MYTHLIBVERSION=${SOURCE_VERSION%%-*} |
312 | | export MYTHLIBVERSION=${MYTHLIBVERSION#v} |
313 | | else |
314 | | cd $MYMYTHBUILDPATH |
315 | | source VERSION |
316 | | export MYTHLIBVERSION=${SOURCE_VERSION%%-*} |
317 | | export MYTHLIBVERSION=${MYTHLIBVERSION#v} |
318 | | fi |
| 307 | cd $MYMYTHBUILDPATH |
| 308 | export MYTHLIBVERSION=${SOURCE_VERSION%%-*} |
| 309 | export MYTHLIBVERSION=${MYTHLIBVERSION#v} |
319 | 310 | export GIT_CEILING_DIRECTORIES="`readlink -f ..`" |
320 | 311 | fi |
321 | 312 | |