Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-11 08:48:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

In the spirit of setting constants in only one place, pass

Browse source 
INITIAL_CLIENT_VERS in from build.xml rather than the jni makefile,
and make it available in java world as well.
This commit is contained in:
Eric House 2013-08-20 08:42:12 -07:00
parent 2157706dcd
commit 5197033de3
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
xwords4/android/XWords4/build.xml
View file

@ -49,6 +49,7 @@
<!-- extension targets. Uncomment the ones where you want to do custom work <!-- extension targets. Uncomment the ones where you want to do custom work
in between standard targets --> in between standard targets -->
<property name="INITIAL_CLIENT_VERS" value="3"/>
<target name="-pre-clean"> <target name="-pre-clean">
<exec dir="." executable="../scripts/ndkbuild.sh" output="/dev/null"> <exec dir="." executable="../scripts/ndkbuild.sh" output="/dev/null">
<arg value="clean"/> <arg value="clean"/>
@ -58,6 +59,7 @@
<target name="-pre-build"> <target name="-pre-build">
<exec dir="." executable="../scripts/ndkbuild.sh" > <exec dir="." executable="../scripts/ndkbuild.sh" >
<arg value="-j3"/> <arg value="-j3"/>
<arg value="INITIAL_CLIENT_VERS=${INITIAL_CLIENT_VERS}" />
</exec> </exec>
<exec dir="." executable="../scripts/gen_gcmid.sh" <exec dir="." executable="../scripts/gen_gcmid.sh"
output="src/org/eehouse/android/xw4/GCMConsts.java" output="src/org/eehouse/android/xw4/GCMConsts.java"
@ -66,6 +68,7 @@
<exec dir=".." executable="./scripts/genvers.sh" output="ant_out.txt"> <exec dir=".." executable="./scripts/genvers.sh" output="ant_out.txt">
<arg value="XWords4"/> <arg value="XWords4"/>
<arg value="xw4"/> <arg value="xw4"/>
<arg value="${INITIAL_CLIENT_VERS}" />
</exec> </exec>
</target> </target>
<!-- <!--

4
xwords4/android/XWords4/jni/Android.mk
View file

@ -10,7 +10,7 @@ local_C_INCLUDES+= \
local_LDLIBS += -llog local_LDLIBS += -llog
# local_DEBUG = -DMEM_DEBUG -DDEBUG -DENABLE_LOGGING -DCOMMS_CHECKSUM local_DEBUG = -DMEM_DEBUG -DDEBUG -DENABLE_LOGGING -DCOMMS_CHECKSUM
local_DEFINES += \ local_DEFINES += \
$(local_DEBUG) \ $(local_DEBUG) \
-DXWFEATURE_RELAY \ -DXWFEATURE_RELAY \
@ -36,7 +36,7 @@ local_DEFINES += \
-DHASH_STREAM \ -DHASH_STREAM \
-DXWFEATURE_BASE64 \ -DXWFEATURE_BASE64 \
-DXWFEATURE_DEVID \ -DXWFEATURE_DEVID \
-DINITIAL_CLIENT_VERS=3 \ -DINITIAL_CLIENT_VERS=${INITIAL_CLIENT_VERS} \
-DRELAY_ROOM_DEFAULT=\"\" \ -DRELAY_ROOM_DEFAULT=\"\" \
-D__LITTLE_ENDIAN \ -D__LITTLE_ENDIAN \

2
xwords4/android/scripts/genvers.sh
View file

@ -4,6 +4,7 @@ set -e -u
DIR=$1 DIR=$1
VARIANT=$2 VARIANT=$2
CLIENT_VERS_RELAY=$3
cd $(dirname $0) cd $(dirname $0)
cd ../../ cd ../../
@ -31,6 +32,7 @@ cat <<EOF > android/${DIR}/src/org/eehouse/android/${VARIANT}/GitVersion.java
package org.eehouse.android.${VARIANT}; package org.eehouse.android.${VARIANT};
class GitVersion { class GitVersion {
public static final String VERS = "$SHORTVERS"; public static final String VERS = "$SHORTVERS";
public static final short CLIENT_VERS_RELAY = $CLIENT_VERS_RELAY;
} }
EOF EOF