mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-27 07:58:49 +01:00
improvements to work with variants -- though jni still doesn't compile.
This commit is contained in:
parent
d2952794af
commit
542f10a3e5
1 changed files with 14 additions and 5 deletions
|
@ -3,13 +3,14 @@
|
||||||
set -e -u
|
set -e -u
|
||||||
|
|
||||||
usage () {
|
usage () {
|
||||||
echo "usage: $(basename $0) [--tag tagname | --branch branchname]"
|
echo "usage: $(basename $0) [--tag tagname | --branch branchname] [--variant variant]"
|
||||||
echo " # (uses current branch as default)"
|
echo " # (uses current branch as default)"
|
||||||
exit 0
|
exit 0
|
||||||
}
|
}
|
||||||
|
|
||||||
TAG=""
|
TAG=""
|
||||||
BRANCH=""
|
BRANCH=""
|
||||||
|
VARIANT="XWords4"
|
||||||
|
|
||||||
while [ 0 -lt $# ] ; do
|
while [ 0 -lt $# ] ; do
|
||||||
case $1 in
|
case $1 in
|
||||||
|
@ -21,6 +22,10 @@ while [ 0 -lt $# ] ; do
|
||||||
BRANCH=$2
|
BRANCH=$2
|
||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
|
--variant)
|
||||||
|
VARIANT=$2
|
||||||
|
shift
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
usage
|
usage
|
||||||
;;
|
;;
|
||||||
|
@ -28,6 +33,8 @@ while [ 0 -lt $# ] ; do
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
|
|
||||||
|
echo "VARIANT=$VARIANT"
|
||||||
|
|
||||||
if [ -n "$TAG" ]; then
|
if [ -n "$TAG" ]; then
|
||||||
if ! git tag | grep -w "$TAG"; then
|
if ! git tag | grep -w "$TAG"; then
|
||||||
echo "tag $TAG not found"
|
echo "tag $TAG not found"
|
||||||
|
@ -37,7 +44,7 @@ elif [ -z $BRANCH ]; then
|
||||||
BRANCH=$(git branch | grep '^*' | sed 's,^.* ,,')
|
BRANCH=$(git branch | grep '^*' | sed 's,^.* ,,')
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "building with ${TAG}${BRANCH}"
|
echo "building $VARIANT with ${TAG}${BRANCH}"
|
||||||
|
|
||||||
BUILDIR=/tmp/$(basename $0)_build_$$
|
BUILDIR=/tmp/$(basename $0)_build_$$
|
||||||
SRCDIR=$(pwd)/$(dirname $0)/../../../
|
SRCDIR=$(pwd)/$(dirname $0)/../../../
|
||||||
|
@ -49,9 +56,11 @@ cd $BUILDIR
|
||||||
git clone $SRCDIR BUILD
|
git clone $SRCDIR BUILD
|
||||||
cd BUILD
|
cd BUILD
|
||||||
git checkout ${TAG}${BRANCH}
|
git checkout ${TAG}${BRANCH}
|
||||||
./xwords4/android/scripts/setup_local_props.sh
|
cd ./xwords4/android/${VARIANT}
|
||||||
./xwords4/android/scripts/arelease.sh
|
../scripts/setup_local_props.sh
|
||||||
cp *.apk /tmp
|
../scripts/arelease.sh --variant ${VARIANT}
|
||||||
|
mkdir /tmp/releases_${VARIANT}
|
||||||
|
cp *.apk /tmp/releases_${VARIANT}
|
||||||
|
|
||||||
cd $CURDIR
|
cd $CURDIR
|
||||||
rm -rf $BUILDIR
|
rm -rf $BUILDIR
|
||||||
|
|
Loading…
Add table
Reference in a new issue