Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-24 07:58:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

remove warning about not using checked-in debug keystore from release

Browse source 
builds that won't use it regardless
This commit is contained in:
Eric House 2015-04-07 07:20:48 -07:00
parent 07615ff9d7
commit 6dee7e3784
2 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
xwords4/android/scripts/common_targets.xml
View file

@ -16,9 +16,12 @@
</target> </target>
<target name="my-pre-build"> <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" <exec dir="." executable="../scripts/ndksetup.sh" output="/dev/null"
failonerror="true"> failonerror="true">
<arg value="${build.target}"/> <arg value="${build.target}"/>

15
xwords4/android/scripts/key-setup.sh
View file

@ -2,15 +2,16 @@
set -e -u set -e -u
HOMELOC=~/.android/debug.keystore if [ $1 = 'debug' ]; then
HERELOC=$(pwd)/$(dirname $0)/debug.keystore
# SCRIPTS=
if [ -L $HOMELOC ]; then HOMELOC=~/.android/debug.keystore
HERELOC=$(pwd)/$(dirname $0)/debug.keystore
if [ -L $HOMELOC ]; then
if cmp $(readlink $HOMELOC) $HERELOC; then if cmp $(readlink $HOMELOC) $HERELOC; then
exit 0 exit 0
fi fi
elif [ -e $HOMELOC ]; then elif [ -e $HOMELOC ]; then
cat << EOF cat << EOF
* You are using a different keystore from what's part of this project. * 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 * You won't be able to install this over something built from a
@ -19,7 +20,9 @@ elif [ -e $HOMELOC ]; then
rm $HOMELOC rm $HOMELOC
* and rerun ant to use the built-in keystore. * and rerun ant to use the built-in keystore.
EOF EOF
else else
echo "$0: creating link at $HOMELOC" echo "$0: creating link at $HOMELOC"
ln -sf $HERELOC $HOMELOC ln -sf $HERELOC $HOMELOC
fi
fi fi