mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-24 07:58:34 +01:00
remove warning about not using checked-in debug keystore from release
builds that won't use it regardless
This commit is contained in:
parent
07615ff9d7
commit
6dee7e3784
2 changed files with 21 additions and 15 deletions
|
@ -16,9 +16,12 @@
|
|||
</target>
|
||||
|
||||
<target name="my-pre-build">
|
||||
<exec dir="." executable="../scripts/key-setup.sh"
|
||||
failonerror="true"
|
||||
/>
|
||||
|
||||
<exec dir="." executable="../scripts/key-setup.sh" failonerror="true"
|
||||
>
|
||||
<arg value="${build.target}"/>
|
||||
</exec>
|
||||
|
||||
<exec dir="." executable="../scripts/ndksetup.sh" output="/dev/null"
|
||||
failonerror="true">
|
||||
<arg value="${build.target}"/>
|
||||
|
|
|
@ -2,15 +2,16 @@
|
|||
|
||||
set -e -u
|
||||
|
||||
HOMELOC=~/.android/debug.keystore
|
||||
HERELOC=$(pwd)/$(dirname $0)/debug.keystore
|
||||
# SCRIPTS=
|
||||
if [ $1 = 'debug' ]; then
|
||||
|
||||
if [ -L $HOMELOC ]; then
|
||||
HOMELOC=~/.android/debug.keystore
|
||||
HERELOC=$(pwd)/$(dirname $0)/debug.keystore
|
||||
|
||||
if [ -L $HOMELOC ]; then
|
||||
if cmp $(readlink $HOMELOC) $HERELOC; then
|
||||
exit 0
|
||||
fi
|
||||
elif [ -e $HOMELOC ]; then
|
||||
elif [ -e $HOMELOC ]; then
|
||||
cat << EOF
|
||||
* You are using a different keystore from what's part of this project.
|
||||
* You won't be able to install this over something built from a
|
||||
|
@ -19,7 +20,9 @@ elif [ -e $HOMELOC ]; then
|
|||
rm $HOMELOC
|
||||
* and rerun ant to use the built-in keystore.
|
||||
EOF
|
||||
else
|
||||
else
|
||||
echo "$0: creating link at $HOMELOC"
|
||||
ln -sf $HERELOC $HOMELOC
|
||||
fi
|
||||
|
||||
fi
|
||||
|
|
Loading…
Add table
Reference in a new issue