mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-22 07:28:16 +01:00
Merge branch 'android_branch' into android_translate
This commit is contained in:
Eric House
commit
9a8b323f4d
383 changed files with 628 additions and 9015 deletions
|
|
@ -1,6 +1,4 @@
|
||||||
-TAGS
|
-TAGS
|
||||||
-/xwords4/android/XWords4-dbg
|
-/xwords4/android/app/build
|
||||||
-/xwords4/linux/discon_ok2.sh_logs
|
-/xwords4/linux/discon_ok2.sh_logs
|
||||||
-/xwords4/android/XWords4/res_src/values-pt/strings.xml
|
|
||||||
-/xwords4/android/XWords4/res_src/values-ba_CK/strings.xml
|
|
||||||
-/xwords4/relay/xwrelay.log
|
-/xwords4/relay/xwrelay.log
|
||||||
|
|
|
||||||
7
xwords4/android/XWords4-dbg/.gitignore
vendored
7
xwords4/android/XWords4-dbg/.gitignore
vendored
|
|
@ -1,7 +0,0 @@
|
||||||
*.apk
|
|
||||||
ant_out.txt
|
|
||||||
local.properties
|
|
||||||
bin
|
|
||||||
gen
|
|
||||||
proguard.cfg
|
|
||||||
obj
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
/R.java
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
BasEnglish2to8.xwd
|
|
||||||
CollegeEng_2to8.xwd
|
|
||||||
Top5000.xwd
|
|
||||||
changes.html
|
|
||||||
gitvers.txt
|
|
||||||
|
|
@ -1,111 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project name="XWords4" default="release">
|
|
||||||
|
|
||||||
<!-- eeh: allow ant files to refer e.g. to ${env.HOME} -->
|
|
||||||
<property environment="env" />
|
|
||||||
|
|
||||||
<!-- The local.properties file is created and updated by the 'android' tool.
|
|
||||||
It contains the path to the SDK. It should *NOT* be checked into
|
|
||||||
Version Control Systems. -->
|
|
||||||
<loadproperties srcFile="local.properties" />
|
|
||||||
|
|
||||||
<!-- The ant.properties file can be created by you. It is only edited by the
|
|
||||||
'android' tool to add properties to it.
|
|
||||||
This is the place to change some Ant specific build properties.
|
|
||||||
Here are some properties you may want to change/update:
|
|
||||||
|
|
||||||
source.dir
|
|
||||||
The name of the source directory. Default is 'src'.
|
|
||||||
out.dir
|
|
||||||
The name of the output directory. Default is 'bin'.
|
|
||||||
|
|
||||||
For other overridable properties, look at the beginning of the rules
|
|
||||||
files in the SDK, at tools/ant/build.xml
|
|
||||||
|
|
||||||
Properties related to the SDK location or the project target should
|
|
||||||
be updated using the 'android' tool with the 'update' action.
|
|
||||||
|
|
||||||
This file is an integral part of the build system for your
|
|
||||||
application and should be checked into Version Control Systems.
|
|
||||||
|
|
||||||
-->
|
|
||||||
<property file="ant.properties" />
|
|
||||||
|
|
||||||
<!-- The project.properties file is created and updated by the 'android'
|
|
||||||
tool, as well as ADT.
|
|
||||||
|
|
||||||
This contains project specific properties such as project target, and library
|
|
||||||
dependencies. Lower level build properties are stored in ant.properties
|
|
||||||
(or in .classpath for Eclipse projects).
|
|
||||||
|
|
||||||
This file is an integral part of the build system for your
|
|
||||||
application and should be checked into Version Control Systems. -->
|
|
||||||
<loadproperties srcFile="project.properties" />
|
|
||||||
|
|
||||||
<!-- An attempt to define stuff to be included from multiple build.xml files -->
|
|
||||||
<import file="../scripts/common_targets.xml" />
|
|
||||||
|
|
||||||
<!-- quick check on sdk.dir -->
|
|
||||||
<fail
|
|
||||||
message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
|
|
||||||
unless="sdk.dir"
|
|
||||||
/>
|
|
||||||
|
|
||||||
|
|
||||||
<!-- extension targets. Uncomment the ones where you want to do custom work
|
|
||||||
in between standard targets -->
|
|
||||||
|
|
||||||
<property name="INITIAL_CLIENT_VERS" value="8"/>
|
|
||||||
<property name="VARIANT_NAME" value="xw4dbg"/>
|
|
||||||
<property name="APP_NAME" value="CrossDbg"/>
|
|
||||||
<property name="WIDIR_ENABLED" value="true" />
|
|
||||||
|
|
||||||
<target name="-pre-clean">
|
|
||||||
<antcall target="my-pre-clean" />
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="-pre-build" depends="my-copy-src, my-check-props">
|
|
||||||
<antcall target="my-pre-build">
|
|
||||||
<param name="VARIANT_NAME" value="${VARIANT_NAME}"/>
|
|
||||||
<param name="APP_NAME" value="${APP_NAME}"/>
|
|
||||||
</antcall>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="-pre-compile">
|
|
||||||
<antcall target="my-pre-compile">
|
|
||||||
<param name="VARIANT_NAME" value="${VARIANT_NAME}"/>
|
|
||||||
</antcall>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!--
|
|
||||||
<target name="-pre-compile">
|
|
||||||
</target>
|
|
||||||
/* This is typically used for code obfuscation.
|
|
||||||
Compiled code location: ${out.classes.absolute.dir}
|
|
||||||
If this is not done in place, override ${out.dex.input.absolute.dir} */
|
|
||||||
<target name="-post-compile">
|
|
||||||
</target>
|
|
||||||
-->
|
|
||||||
|
|
||||||
<!-- Import the actual build file.
|
|
||||||
|
|
||||||
To customize existing targets, there are two options:
|
|
||||||
- Customize only one target:
|
|
||||||
- copy/paste the target into this file, *before* the
|
|
||||||
<import> task.
|
|
||||||
- customize it to your needs.
|
|
||||||
- Customize the whole content of build.xml
|
|
||||||
- copy/paste the content of the rules files (minus the top node)
|
|
||||||
into this file, replacing the <import> task.
|
|
||||||
- customize to your needs.
|
|
||||||
|
|
||||||
***********************
|
|
||||||
****** IMPORTANT ******
|
|
||||||
***********************
|
|
||||||
In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
|
|
||||||
in order to avoid having your file be overridden by tools such as "android update project"
|
|
||||||
-->
|
|
||||||
<!-- version-tag: 1 -->
|
|
||||||
<import file="${sdk.dir}/tools/ant/build.xml" />
|
|
||||||
|
|
||||||
</project>
|
|
||||||
25
xwords4/android/XWords4-dbg/img_src/.gitignore
vendored
25
xwords4/android/XWords4-dbg/img_src/.gitignore
vendored
|
|
@ -1,25 +0,0 @@
|
||||||
/clear_all.svg
|
|
||||||
/search.svg
|
|
||||||
/select_all.svg
|
|
||||||
back.svg
|
|
||||||
content_copy.svg
|
|
||||||
content_discard.svg
|
|
||||||
content_new.svg
|
|
||||||
dict.svg
|
|
||||||
down.svg
|
|
||||||
download.svg
|
|
||||||
email.svg
|
|
||||||
new_group.svg
|
|
||||||
prefs.svg
|
|
||||||
relabel.svg
|
|
||||||
reset.svg
|
|
||||||
save.svg
|
|
||||||
send.svg
|
|
||||||
up.svg
|
|
||||||
clear_all.svg
|
|
||||||
search.svg
|
|
||||||
select_all.svg
|
|
||||||
content_new_net.svg
|
|
||||||
content_new_solo.svg
|
|
||||||
multigame.svg
|
|
||||||
sologame.svg
|
|
||||||
20
xwords4/android/XWords4-dbg/jni/.gitignore
vendored
20
xwords4/android/XWords4-dbg/jni/.gitignore
vendored
|
|
@ -1,20 +0,0 @@
|
||||||
anddict.c
|
|
||||||
anddict.h
|
|
||||||
andglobals.h
|
|
||||||
Android.mk
|
|
||||||
andutils.c
|
|
||||||
andutils.h
|
|
||||||
drawwrapper.c
|
|
||||||
drawwrapper.h
|
|
||||||
jniutlswrapper.c
|
|
||||||
jniutlswrapper.h
|
|
||||||
LocalizedStrIncludes.h
|
|
||||||
utils.c
|
|
||||||
utilwrapper.c
|
|
||||||
utilwrapper.h
|
|
||||||
xportwrapper.c
|
|
||||||
xportwrapper.h
|
|
||||||
xptypes.h
|
|
||||||
xwjni.c
|
|
||||||
paths.h
|
|
||||||
Application.mk
|
|
||||||
4
xwords4/android/XWords4-dbg/libs/.gitignore
vendored
4
xwords4/android/XWords4-dbg/libs/.gitignore
vendored
|
|
@ -1,4 +0,0 @@
|
||||||
gcm.jar
|
|
||||||
armeabi
|
|
||||||
x86
|
|
||||||
android-support-v13.jar
|
|
||||||
Binary file not shown.
|
|
@ -1,11 +0,0 @@
|
||||||
# This file is automatically generated by Android Tools.
|
|
||||||
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
|
|
||||||
#
|
|
||||||
# This file must be checked in Version Control Systems.
|
|
||||||
#
|
|
||||||
# To customize properties used by the Ant build system use,
|
|
||||||
# "ant.properties", and override values to adapt the script to your
|
|
||||||
# project structure.
|
|
||||||
|
|
||||||
# Project target.
|
|
||||||
target=android-23
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
/clear_all__gen.png
|
|
||||||
/search__gen.png
|
|
||||||
/select_all__gen.png
|
|
||||||
back__gen.png
|
|
||||||
content_copy__gen.png
|
|
||||||
content_discard__gen.png
|
|
||||||
content_edit.png
|
|
||||||
content_new__gen.png
|
|
||||||
dict__gen.png
|
|
||||||
down__gen.png
|
|
||||||
download__gen.png
|
|
||||||
email__gen.png
|
|
||||||
new_group__gen.png
|
|
||||||
prefs__gen.png
|
|
||||||
relabel__gen.png
|
|
||||||
reset__gen.png
|
|
||||||
save__gen.png
|
|
||||||
send__gen.png
|
|
||||||
up__gen.png
|
|
||||||
clear_all__gen.png
|
|
||||||
search__gen.png
|
|
||||||
select_all__gen.png
|
|
||||||
content_new_net__gen.png
|
|
||||||
content_new_solo__gen.png
|
|
||||||
multigame__gen.png
|
|
||||||
sologame__gen.png
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
/clear_all__gen.png
|
|
||||||
/search__gen.png
|
|
||||||
/select_all__gen.png
|
|
||||||
back__gen.png
|
|
||||||
content_copy__gen.png
|
|
||||||
content_discard__gen.png
|
|
||||||
content_edit.png
|
|
||||||
content_new__gen.png
|
|
||||||
dict__gen.png
|
|
||||||
down__gen.png
|
|
||||||
download__gen.png
|
|
||||||
email__gen.png
|
|
||||||
new_group__gen.png
|
|
||||||
prefs__gen.png
|
|
||||||
relabel__gen.png
|
|
||||||
reset__gen.png
|
|
||||||
save__gen.png
|
|
||||||
send__gen.png
|
|
||||||
up__gen.png
|
|
||||||
clear_all__gen.png
|
|
||||||
search__gen.png
|
|
||||||
select_all__gen.png
|
|
||||||
content_new_net__gen.png
|
|
||||||
content_new_solo__gen.png
|
|
||||||
multigame__gen.png
|
|
||||||
sologame__gen.png
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
/clear_all__gen.png
|
|
||||||
/search__gen.png
|
|
||||||
/select_all__gen.png
|
|
||||||
back__gen.png
|
|
||||||
content_copy__gen.png
|
|
||||||
content_discard__gen.png
|
|
||||||
content_edit.png
|
|
||||||
content_new__gen.png
|
|
||||||
dict__gen.png
|
|
||||||
down__gen.png
|
|
||||||
download__gen.png
|
|
||||||
email__gen.png
|
|
||||||
new_group__gen.png
|
|
||||||
prefs__gen.png
|
|
||||||
relabel__gen.png
|
|
||||||
reset__gen.png
|
|
||||||
save__gen.png
|
|
||||||
send__gen.png
|
|
||||||
up__gen.png
|
|
||||||
clear_all__gen.png
|
|
||||||
search__gen.png
|
|
||||||
select_all__gen.png
|
|
||||||
content_new_net__gen.png
|
|
||||||
content_new_solo__gen.png
|
|
||||||
multigame__gen.png
|
|
||||||
sologame__gen.png
|
|
||||||
|
|
@ -1,30 +0,0 @@
|
||||||
dicticon.png
|
|
||||||
downarrow.png
|
|
||||||
expander_ic_maximized.9.png
|
|
||||||
expander_ic_minimized.9.png
|
|
||||||
flip.png
|
|
||||||
icon48x48.png
|
|
||||||
ic_popup_sync_1.png
|
|
||||||
netarrow_allconn.png
|
|
||||||
netarrow_someconn.png
|
|
||||||
netarrow_unconn.png
|
|
||||||
next_hint.png
|
|
||||||
origin.png
|
|
||||||
prev_hint.png
|
|
||||||
refresh.png
|
|
||||||
relaygame.png
|
|
||||||
rightarrow.png
|
|
||||||
shuffle.png
|
|
||||||
sologame.png
|
|
||||||
stat_notify_chat.png
|
|
||||||
stat_notify_sync.png
|
|
||||||
undo.png
|
|
||||||
values.png
|
|
||||||
zoom.png
|
|
||||||
bluetooth_active.png
|
|
||||||
bluetooth_disabled.png
|
|
||||||
in_arrow_active.png
|
|
||||||
in_arrow.png
|
|
||||||
out_arrow_active.png
|
|
||||||
out_arrow.png
|
|
||||||
notify.png
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
board.xml
|
|
||||||
|
|
@ -1,54 +0,0 @@
|
||||||
about_dlg.xml
|
|
||||||
board.xml
|
|
||||||
btinviter_item.xml.~1~
|
|
||||||
chat_history_local.xml
|
|
||||||
chat_history_remote.xml
|
|
||||||
chat.xml
|
|
||||||
color_display.xml
|
|
||||||
color_edit.xml
|
|
||||||
dflt_name.xml
|
|
||||||
dict_browser.xml
|
|
||||||
dict_browse.xml
|
|
||||||
divider_view.xml
|
|
||||||
force_remote.xml
|
|
||||||
game_config.xml
|
|
||||||
game_list_item.xml
|
|
||||||
game_list.xml
|
|
||||||
import_dict.xml
|
|
||||||
list_item.xml
|
|
||||||
lookup.xml
|
|
||||||
new_game.xml
|
|
||||||
passwd_view.xml
|
|
||||||
player_edit.xml
|
|
||||||
player_list_elem.xml
|
|
||||||
prefs_w_buttons.xml
|
|
||||||
relay_game_config.xml
|
|
||||||
rename_game.xml
|
|
||||||
select_dialog_item.xml
|
|
||||||
confirm_sms.xml
|
|
||||||
game_list_group.xml
|
|
||||||
studylist.xml
|
|
||||||
loc_list_item.xml
|
|
||||||
loc_main.xml
|
|
||||||
loc_item_edit.xml
|
|
||||||
import_dict_item.xml
|
|
||||||
list_group.xml
|
|
||||||
conn_types_display.xml
|
|
||||||
expander_header.xml
|
|
||||||
msg_label_and_edit.xml
|
|
||||||
not_again_view.xml
|
|
||||||
relayinviter.xml
|
|
||||||
remote_dict_details.xml
|
|
||||||
toolbar.xml
|
|
||||||
chat_row.xml
|
|
||||||
fragact.xml
|
|
||||||
main.xml
|
|
||||||
dualcontainer.xml
|
|
||||||
dict_browser_list.xml
|
|
||||||
inviter_item.xml
|
|
||||||
inviter.xml
|
|
||||||
bt_buttons.xml
|
|
||||||
relay_buttons.xml
|
|
||||||
sms_buttons.xml
|
|
||||||
inviter_item_frame.xml
|
|
||||||
two_strs_item.xml
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
board_menu.xml
|
|
||||||
11
xwords4/android/XWords4-dbg/res/menu/.gitignore
vendored
11
xwords4/android/XWords4-dbg/res/menu/.gitignore
vendored
|
|
@ -1,11 +0,0 @@
|
||||||
board_menu.xml
|
|
||||||
chat_menu.xml
|
|
||||||
dicts_item_menu.xml
|
|
||||||
games_list_menu.xml
|
|
||||||
dicts_menu.xml
|
|
||||||
studylist.xml
|
|
||||||
loc_menu.xml
|
|
||||||
empty.xml
|
|
||||||
loc_item_menu.xml
|
|
||||||
games_list_group_menu.xml
|
|
||||||
games_list_game_menu.xml
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
changes
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
styles.xml
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
strings.xml
|
|
||||||
styles.xml
|
|
||||||
common_rsrc.xml
|
|
||||||
gen_strings.xml
|
|
||||||
app_name.xml
|
|
||||||
dimensions.xml
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
xwprefs.xml
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
/strings.xml
|
|
||||||
strings.xml
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
strings.xml
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
/strings.xml
|
|
||||||
strings.xml
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
strings.xml
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
strings.xml
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
strings.xml
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
strings.xml
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
strings.xml
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
strings.xml
|
|
||||||
|
|
@ -1,148 +0,0 @@
|
||||||
/DlgID.java
|
|
||||||
/LookupAlert.java
|
|
||||||
ABUtils.java
|
|
||||||
BTInviteActivity.java
|
|
||||||
BTReceiver.java
|
|
||||||
BTService.java
|
|
||||||
BoardActivity.java
|
|
||||||
BoardCanvas.java
|
|
||||||
BoardDims.java
|
|
||||||
BoardView.java
|
|
||||||
BuildConstants.java
|
|
||||||
ChatActivity.java
|
|
||||||
CommsTransport.java
|
|
||||||
ConnStatusHandler.java
|
|
||||||
DBHelper.java
|
|
||||||
DBUtils.java
|
|
||||||
DbgUtils.java
|
|
||||||
DictBrowseActivity.java
|
|
||||||
DictImportActivity.java
|
|
||||||
DictLangCache.java
|
|
||||||
DictListPreference.java
|
|
||||||
DictUtils.java
|
|
||||||
DictsActivity.java
|
|
||||||
DispatchNotify.java
|
|
||||||
DlgDelegate.java
|
|
||||||
DlgState.java
|
|
||||||
EditColorPreference.java
|
|
||||||
ExpiringDelegate.java
|
|
||||||
ExpiringLinearLayout.java
|
|
||||||
ExpiringTextView.java
|
|
||||||
FirstRunDialog.java
|
|
||||||
GCMConsts.java
|
|
||||||
GCMIntentService.java
|
|
||||||
GameConfig.java
|
|
||||||
GameListAdapter.java
|
|
||||||
GameListGroup.java
|
|
||||||
GameListItem.java
|
|
||||||
GameLock.java
|
|
||||||
GameNamer.java
|
|
||||||
GameUtils.java
|
|
||||||
GamesList.java
|
|
||||||
GitVersion.java
|
|
||||||
InviteActivity.java
|
|
||||||
LookupActivity.java
|
|
||||||
MountEventReceiver.java
|
|
||||||
MultiMsgSink.java
|
|
||||||
MultiService.java
|
|
||||||
NBSReceiver.java
|
|
||||||
NFCUtils.java
|
|
||||||
NetLaunchInfo.java
|
|
||||||
NetStateCache.java
|
|
||||||
NetUtils.java
|
|
||||||
NewGameActivity.java
|
|
||||||
PollListPreference.java
|
|
||||||
PrefsActivity.java
|
|
||||||
ReceiveNBS.java
|
|
||||||
RefreshNamesTask.java
|
|
||||||
RelayGameActivity.java
|
|
||||||
RelayMsgSink.java
|
|
||||||
RelayReceiver.java
|
|
||||||
RelayService.java
|
|
||||||
SMSCheckBoxPreference.java
|
|
||||||
SMSInviteActivity.java
|
|
||||||
SMSReceiver.java
|
|
||||||
SMSService.java
|
|
||||||
SelectableItem.java
|
|
||||||
StatusReceiver.java
|
|
||||||
StudyList.java
|
|
||||||
ThumbCanvas.java
|
|
||||||
Toolbar.java
|
|
||||||
UpdateCheckReceiver.java
|
|
||||||
Utils.java
|
|
||||||
XWActivity.java
|
|
||||||
XWApp.java
|
|
||||||
XWConstants.java
|
|
||||||
XWEditTextPreference.java
|
|
||||||
XWExpandableListActivity.java
|
|
||||||
XWListActivity.java
|
|
||||||
XWListAdapter.java
|
|
||||||
XWListItem.java
|
|
||||||
XWListPreference.java
|
|
||||||
XWPrefs.java
|
|
||||||
XWService.java
|
|
||||||
XWSumListPreference.java
|
|
||||||
XWThumbListPreference.java
|
|
||||||
DelegateBase.java
|
|
||||||
DlgID.java
|
|
||||||
GamesListDelegate.java
|
|
||||||
LookupAlert.java
|
|
||||||
BoardDelegate.java
|
|
||||||
ChatDelegate.java
|
|
||||||
DictBrowseDelegate.java
|
|
||||||
DictImportDelegate.java
|
|
||||||
DictsDelegate.java
|
|
||||||
DrawSelDelegate.java
|
|
||||||
GameConfigActivity.java
|
|
||||||
GameConfigDelegate.java
|
|
||||||
NewGameDelegate.java
|
|
||||||
RelayGameDelegate.java
|
|
||||||
StudyListActivity.java
|
|
||||||
StudyListDelegate.java
|
|
||||||
BTInviteDelegate.java
|
|
||||||
InviteDelegate.java
|
|
||||||
ListDelegateBase.java
|
|
||||||
PrefsDelegate.java
|
|
||||||
SMSInviteDelegate.java
|
|
||||||
DwnldActivity.java
|
|
||||||
DwnldDelegate.java
|
|
||||||
GroupStateListener.java
|
|
||||||
ListGroup.java
|
|
||||||
ConnViaViewLayout.java
|
|
||||||
Delegator.java
|
|
||||||
DevID.java
|
|
||||||
HeaderWithExpander.java
|
|
||||||
LangListPreference.java
|
|
||||||
ListDelegator.java
|
|
||||||
NagTurnReceiver.java
|
|
||||||
NotAgainView.java
|
|
||||||
OnBootReceiver.java
|
|
||||||
RelayInviteActivity.java
|
|
||||||
RelayInviteDelegate.java
|
|
||||||
XWConnAddrPreference.java
|
|
||||||
XWDevIDPreference.java
|
|
||||||
XWExpListAdapter.java
|
|
||||||
RequestCode.java
|
|
||||||
BoardFrag.java
|
|
||||||
ChatFrag.java
|
|
||||||
DictBrowseFrag.java
|
|
||||||
FragActivity.java
|
|
||||||
GameConfigFrag.java
|
|
||||||
GamesListFrag.java
|
|
||||||
Main.java
|
|
||||||
nohup.out
|
|
||||||
StudyListFrag.java
|
|
||||||
XWFragment.java
|
|
||||||
ConfirmingCheckBoxPreference.java
|
|
||||||
RelayCheckBoxPreference.java
|
|
||||||
MainActivity.java
|
|
||||||
DictsFrag.java
|
|
||||||
DualpaneDelegate.java
|
|
||||||
BoardContainer.java
|
|
||||||
BiDiSockWrap.java
|
|
||||||
WiDirService.java
|
|
||||||
WiDirInviteActivity.java
|
|
||||||
WiDirInviteDelegate.java
|
|
||||||
XWPacket.java
|
|
||||||
TwoStrsItem.java
|
|
||||||
Perms23.java
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
BoardHandler.java
|
|
||||||
CommonPrefs.java
|
|
||||||
CommsAddrRec.java
|
|
||||||
CurGameInfo.java
|
|
||||||
DictInfo.java
|
|
||||||
DrawCtx.java
|
|
||||||
DrawScoreInfo.java
|
|
||||||
GameSummary.java
|
|
||||||
JNIThread.java
|
|
||||||
JNIUtilsImpl.java
|
|
||||||
JNIUtils.java
|
|
||||||
LocalPlayer.java
|
|
||||||
SyncedDraw.java
|
|
||||||
TransportProcs.java
|
|
||||||
UtilCtxtImpl.java
|
|
||||||
UtilCtxt.java
|
|
||||||
XwJNI.java
|
|
||||||
BoardDims.java
|
|
||||||
LastMoveInfo.java
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
/LocItemEditActivity.java
|
|
||||||
/LocItemEditDelegate.java
|
|
||||||
LocActivity.java
|
|
||||||
LocDelegate.java
|
|
||||||
LocIDs.java
|
|
||||||
LocIDsData.java
|
|
||||||
LocListAdapter.java
|
|
||||||
LocListItem.java
|
|
||||||
LocSearcher.java
|
|
||||||
LocUtils.java
|
|
||||||
XlatingSpinnerAdapter.java
|
|
||||||
LocItemEditActivity.java
|
|
||||||
LocItemEditDelegate.java
|
|
||||||
20
xwords4/android/XWords4/.gitignore
vendored
20
xwords4/android/XWords4/.gitignore
vendored
|
|
@ -1,20 +0,0 @@
|
||||||
*.apk
|
|
||||||
.DS_Store
|
|
||||||
.gradle
|
|
||||||
/.idea/libraries
|
|
||||||
/.idea/workspace.xml
|
|
||||||
/build
|
|
||||||
/captures
|
|
||||||
/libs-debug
|
|
||||||
/libs-release
|
|
||||||
/local.properties
|
|
||||||
/obj-debug
|
|
||||||
/obj-release
|
|
||||||
ant_out.txt
|
|
||||||
bin
|
|
||||||
gen
|
|
||||||
obj
|
|
||||||
proguard.cfg
|
|
||||||
res/drawable*/*gen.png
|
|
||||||
.idea/
|
|
||||||
*.iml
|
|
||||||
1
xwords4/android/XWords4/app/.gitignore
vendored
1
xwords4/android/XWords4/app/.gitignore
vendored
|
|
@ -1 +0,0 @@
|
||||||
/build
|
|
||||||
|
|
@ -1,237 +0,0 @@
|
||||||
def VARIANT_NAME = 'xw4'
|
|
||||||
def INITIAL_CLIENT_VERS = 6
|
|
||||||
def CHAT_ENABLED = true
|
|
||||||
def LIBS_DEBUG = 'libs-debug'
|
|
||||||
def LIBS_RELEASE = 'libs-release'
|
|
||||||
def VERSION_CODE_BASE = 1
|
|
||||||
def VARIANTS = [ "Xw4", "Xw4dbg" ]
|
|
||||||
def BUILDS = [ "Debug", "Release" ]
|
|
||||||
|
|
||||||
apply plugin: 'com.android.application'
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
compile files('../libs/gcm.jar')
|
|
||||||
compile files('../libs/android-support-v13.jar')
|
|
||||||
}
|
|
||||||
|
|
||||||
android {
|
|
||||||
compileSdkVersion 23
|
|
||||||
buildToolsVersion "23.0.2"
|
|
||||||
defaultConfig {
|
|
||||||
minSdkVersion 7
|
|
||||||
targetSdkVersion 23
|
|
||||||
}
|
|
||||||
|
|
||||||
// Rename all output artifacts to include version information
|
|
||||||
// applicationVariants.all { variant ->
|
|
||||||
// renameArtifact(variant)
|
|
||||||
// variant.buildConfigField "String", "FIELD_NAME", "\"my String\""
|
|
||||||
// }
|
|
||||||
|
|
||||||
flavorDimensions "variant"//, "abi"
|
|
||||||
productFlavors {
|
|
||||||
xw4 {
|
|
||||||
dimension "variant"
|
|
||||||
applicationId "org.eehouse.android.xw4"
|
|
||||||
}
|
|
||||||
xw4dbg {
|
|
||||||
dimension "variant"
|
|
||||||
applicationId "org.eehouse.android.xw4dbg"
|
|
||||||
}
|
|
||||||
|
|
||||||
// WARNING: "all" breaks things. Seems to be a keyword. Need
|
|
||||||
// to figure out how to express include-all-abis
|
|
||||||
// all {
|
|
||||||
// dimension "abi"
|
|
||||||
// versionCode 0 + VERSION_CODE_BASE
|
|
||||||
// }
|
|
||||||
// armeabi {
|
|
||||||
// dimension "abi"
|
|
||||||
// versionCode 1 + VERSION_CODE_BASE
|
|
||||||
// }
|
|
||||||
// x86 {
|
|
||||||
// dimension "abi"
|
|
||||||
// versionCode 2 + VERSION_CODE_BASE
|
|
||||||
// }
|
|
||||||
// armeabiv7a {
|
|
||||||
// dimension "abi"
|
|
||||||
// versionCode 3 + VERSION_CODE_BASE
|
|
||||||
// }
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
signingConfigs {
|
|
||||||
release {
|
|
||||||
storeFile file(System.getenv("HOME") + "/.keystore")
|
|
||||||
keyAlias "mykey"
|
|
||||||
|
|
||||||
// These two lines make gradle believe that the signingConfigs
|
|
||||||
// section is complete. Without them, tasks like installRelease
|
|
||||||
// will not be available!
|
|
||||||
storePassword "notReal"
|
|
||||||
keyPassword "notReal"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
buildTypes {
|
|
||||||
release {
|
|
||||||
signingConfig signingConfigs.release
|
|
||||||
debuggable false
|
|
||||||
minifyEnabled true
|
|
||||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
|
||||||
}
|
|
||||||
debug {
|
|
||||||
debuggable true
|
|
||||||
// This doesn't work on marshmallow: duplicate permission error
|
|
||||||
// applicationIdSuffix ".debug"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
sourceSets {
|
|
||||||
// Use symlinks instead of setting non-conventional
|
|
||||||
// directories here. AS doesn't respect what's set here: it'll
|
|
||||||
// compile, but post-install app launch and source-level
|
|
||||||
// debugging don't work.
|
|
||||||
release {
|
|
||||||
jniLibs.srcDir "../$LIBS_RELEASE"
|
|
||||||
}
|
|
||||||
debug {
|
|
||||||
jniLibs.srcDir "../$LIBS_DEBUG"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
lintOptions {
|
|
||||||
abortOnError false
|
|
||||||
}
|
|
||||||
|
|
||||||
def gitrev = "git describe --tags".execute().text.trim()
|
|
||||||
applicationVariants.all { variant ->
|
|
||||||
variant.outputs.each { output ->
|
|
||||||
output.outputFile =
|
|
||||||
new File(output.outputFile.parent,
|
|
||||||
output.outputFile.name.replace(".apk", "-${gitrev}.apk"))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Prevent release builds. They haven't been tested, and now that
|
|
||||||
// f-droid has been releasing them they're KNOWN not to work.
|
|
||||||
android.applicationVariants.all { variant ->
|
|
||||||
if ( variant.name.endsWith("Release") ) {
|
|
||||||
String NAME = "check" + variant.name.capitalize() + "Manifest"
|
|
||||||
task "$NAME"(overwrite: true) << {
|
|
||||||
throw new RuntimeException('<<<<< Release builds should not be built '
|
|
||||||
+ 'using gradle! Please use ant for now. >>>>>');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
compile fileTree(dir: 'libs', include: ['*.jar'])
|
|
||||||
}
|
|
||||||
|
|
||||||
task genVers(type: Exec) {
|
|
||||||
workingDir '../'
|
|
||||||
commandLine '../scripts/genvers.sh', '--variant', VARIANT_NAME,
|
|
||||||
'--client-vers', INITIAL_CLIENT_VERS,
|
|
||||||
'--vers-outfile', "assets/gitvers.txt"
|
|
||||||
}
|
|
||||||
|
|
||||||
task mkImages(type: Exec) {
|
|
||||||
workingDir '../'
|
|
||||||
commandLine '../scripts/mkimages.sh'
|
|
||||||
}
|
|
||||||
|
|
||||||
task copyStrings(type: Exec) {
|
|
||||||
workingDir '../'
|
|
||||||
commandLine '../scripts/copy-strings.py'
|
|
||||||
}
|
|
||||||
|
|
||||||
task ndkSetup(type: Exec) {
|
|
||||||
workingDir '../'
|
|
||||||
commandLine "../scripts/ndksetup.sh"
|
|
||||||
}
|
|
||||||
|
|
||||||
task myPreBuild(dependsOn: ['genVers', 'ndkSetup', 'mkImages', 'copyStrings', 'mkXml']) {
|
|
||||||
}
|
|
||||||
preBuild.dependsOn myPreBuild
|
|
||||||
|
|
||||||
task ndkBuildDebug(type: Exec) {
|
|
||||||
workingDir '../'
|
|
||||||
commandLine '../scripts/ndkbuild.sh', '-j3', "CHAT_ENABLED=$CHAT_ENABLED",
|
|
||||||
'BUILD_TARGET=debug', "INITIAL_CLIENT_VERS=$INITIAL_CLIENT_VERS",
|
|
||||||
"VARIANT=$VARIANT_NAME", "NDK_LIBS_OUT=$LIBS_DEBUG", 'NDK_OUT=./obj-debug'
|
|
||||||
}
|
|
||||||
|
|
||||||
task ndkBuildRelease(type: Exec) {
|
|
||||||
workingDir '../'
|
|
||||||
commandLine '../scripts/ndkbuild.sh', '-j3', "CHAT_ENABLED=$CHAT_ENABLED",
|
|
||||||
'BUILD_TARGET=release', "INITIAL_CLIENT_VERS=$INITIAL_CLIENT_VERS",
|
|
||||||
"VARIANT=$VARIANT_NAME", "NDK_LIBS_OUT=$LIBS_RELEASE", 'NDK_OUT=./obj-release'
|
|
||||||
}
|
|
||||||
|
|
||||||
task mkXml(type: Exec) {
|
|
||||||
workingDir '../'
|
|
||||||
commandLine '../scripts/mk_xml.py', '-o',
|
|
||||||
"src/org/eehouse/android/$VARIANT_NAME/loc/LocIDsData.java",
|
|
||||||
'-t', "debug", '-v', "$VARIANT_NAME"
|
|
||||||
}
|
|
||||||
|
|
||||||
afterEvaluate {
|
|
||||||
VARIANTS.each { VARIANT ->
|
|
||||||
String compileTask = "compile${VARIANT}ReleaseNdk"
|
|
||||||
tasks.getByName(compileTask).dependsOn ndkBuildRelease
|
|
||||||
compileTask = "compile${VARIANT}DebugNdk"
|
|
||||||
tasks.getByName(compileTask).dependsOn ndkBuildDebug
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
task askForPassword << {
|
|
||||||
def password = System.getenv("ANDROID_KEY_PASS")
|
|
||||||
if (null == password || 0 == password.length()) {
|
|
||||||
if ( null != System.console() ) {
|
|
||||||
password = new String(System.console()
|
|
||||||
.readPassword("ANDROID_KEY_PASS not set; "
|
|
||||||
+ "Keystore password: "))
|
|
||||||
} else {
|
|
||||||
password = null
|
|
||||||
println( "ANDROID_KEY_PASS not set and no console; " )
|
|
||||||
println( "sign it yerself later. (Or you might try" )
|
|
||||||
println( " running gradlew with the --no-daemon flag)" )
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( null != password ) {
|
|
||||||
android.signingConfigs.release.storePassword = password
|
|
||||||
android.signingConfigs.release.keyPassword = password
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.whenTaskAdded { theTask ->
|
|
||||||
if (theTask.name.equals("packageRelease")) {
|
|
||||||
theTask.dependsOn "askForPassword"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// def getVersionName() {
|
|
||||||
// try {
|
|
||||||
// def stdout = new ByteArrayOutputStream()
|
|
||||||
// exec {
|
|
||||||
// commandLine 'git', 'describe', '--dirty'
|
|
||||||
// standardOutput = stdout
|
|
||||||
// }
|
|
||||||
// return stdout.toString().trim()
|
|
||||||
// }
|
|
||||||
// catch (ignored) {
|
|
||||||
// return null;
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
// def renameArtifact(variant) {
|
|
||||||
// variant.outputs.each { output ->
|
|
||||||
// def name = String.format( "XWords4-%s-%s.apk", variant.name,
|
|
||||||
// getVersionName() )
|
|
||||||
// output.outputFile = new File( (String)output.outputFile.parent,
|
|
||||||
// (String)name )
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../AndroidManifest.xml
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../assets/
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../src/
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../res
|
|
||||||
File diff suppressed because it is too large
Load diff
1
xwords4/android/XWords4/assets/.gitignore
vendored
1
xwords4/android/XWords4/assets/.gitignore
vendored
|
|
@ -1 +0,0 @@
|
||||||
gitvers.txt
|
|
||||||
|
|
@ -1,112 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project name="XWords4" default="release">
|
|
||||||
|
|
||||||
<!-- eeh: allow ant files to refer e.g. to ${env.HOME} -->
|
|
||||||
<property environment="env" />
|
|
||||||
|
|
||||||
<!-- The local.properties file is created and updated by the 'android' tool.
|
|
||||||
It contains the path to the SDK. It should *NOT* be checked into
|
|
||||||
Version Control Systems. -->
|
|
||||||
<loadproperties srcFile="local.properties" />
|
|
||||||
|
|
||||||
<!-- The ant.properties file can be created by you. It is only edited by the
|
|
||||||
'android' tool to add properties to it.
|
|
||||||
This is the place to change some Ant specific build properties.
|
|
||||||
Here are some properties you may want to change/update:
|
|
||||||
|
|
||||||
source.dir
|
|
||||||
The name of the source directory. Default is 'src'.
|
|
||||||
out.dir
|
|
||||||
The name of the output directory. Default is 'bin'.
|
|
||||||
|
|
||||||
For other overridable properties, look at the beginning of the rules
|
|
||||||
files in the SDK, at tools/ant/build.xml
|
|
||||||
|
|
||||||
Properties related to the SDK location or the project target should
|
|
||||||
be updated using the 'android' tool with the 'update' action.
|
|
||||||
|
|
||||||
This file is an integral part of the build system for your
|
|
||||||
application and should be checked into Version Control Systems.
|
|
||||||
|
|
||||||
-->
|
|
||||||
<property file="ant.properties" />
|
|
||||||
|
|
||||||
<!-- The project.properties file is created and updated by the 'android'
|
|
||||||
tool, as well as ADT.
|
|
||||||
|
|
||||||
This contains project specific properties such as project target, and library
|
|
||||||
dependencies. Lower level build properties are stored in ant.properties
|
|
||||||
(or in .classpath for Eclipse projects).
|
|
||||||
|
|
||||||
This file is an integral part of the build system for your
|
|
||||||
application and should be checked into Version Control Systems. -->
|
|
||||||
<loadproperties srcFile="project.properties" />
|
|
||||||
|
|
||||||
<!-- An attempt to define stuff to be included from multiple build.xml files -->
|
|
||||||
<import file="../scripts/common_targets.xml" />
|
|
||||||
|
|
||||||
<!-- quick check on sdk.dir -->
|
|
||||||
<fail
|
|
||||||
message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
|
|
||||||
unless="sdk.dir"
|
|
||||||
/>
|
|
||||||
|
|
||||||
|
|
||||||
<!-- extension targets. Uncomment the ones where you want to do custom work
|
|
||||||
in between standard targets -->
|
|
||||||
|
|
||||||
<property name="INITIAL_CLIENT_VERS" value="8"/>
|
|
||||||
<property name="VARIANT_NAME" value="xw4"/>
|
|
||||||
<property name="APP_NAME" value="Crosswords"/>
|
|
||||||
<property name="SKIP_LANGS" value="values-de"/>
|
|
||||||
<property name="WIDIR_ENABLED" value="false" />
|
|
||||||
|
|
||||||
<target name="-pre-clean">
|
|
||||||
<antcall target="my-pre-clean" />
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="-pre-build" depends="my-copy-src, my-check-props">
|
|
||||||
<antcall target="my-pre-build">
|
|
||||||
<param name="VARIANT_NAME" value="${VARIANT_NAME}"/>
|
|
||||||
<param name="APP_NAME" value="${APP_NAME}"/>
|
|
||||||
</antcall>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="-pre-compile">
|
|
||||||
<antcall target="my-pre-compile">
|
|
||||||
<param name="VARIANT_NAME" value="${VARIANT_NAME}"/>
|
|
||||||
</antcall>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!--
|
|
||||||
<target name="-pre-compile">
|
|
||||||
</target>
|
|
||||||
/* This is typically used for code obfuscation.
|
|
||||||
Compiled code location: ${out.classes.absolute.dir}
|
|
||||||
If this is not done in place, override ${out.dex.input.absolute.dir} */
|
|
||||||
<target name="-post-compile">
|
|
||||||
</target>
|
|
||||||
-->
|
|
||||||
|
|
||||||
<!-- Import the actual build file.
|
|
||||||
|
|
||||||
To customize existing targets, there are two options:
|
|
||||||
- Customize only one target:
|
|
||||||
- copy/paste the target into this file, *before* the
|
|
||||||
<import> task.
|
|
||||||
- customize it to your needs.
|
|
||||||
- Customize the whole content of build.xml
|
|
||||||
- copy/paste the content of the rules files (minus the top node)
|
|
||||||
into this file, replacing the <import> task.
|
|
||||||
- customize to your needs.
|
|
||||||
|
|
||||||
***********************
|
|
||||||
****** IMPORTANT ******
|
|
||||||
***********************
|
|
||||||
In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
|
|
||||||
in order to avoid having your file be overridden by tools such as "android update project"
|
|
||||||
-->
|
|
||||||
<!-- version-tag: 1 -->
|
|
||||||
<import file="${sdk.dir}/tools/ant/build.xml" />
|
|
||||||
|
|
||||||
</project>
|
|
||||||
|
|
@ -1,516 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project name="XWords4" default="release">
|
|
||||||
|
|
||||||
<!-- The local.properties file is created and updated by the 'android' tool.
|
|
||||||
It contains the path to the SDK. It should *NOT* be checked in in Version
|
|
||||||
Control Systems. -->
|
|
||||||
<exec dir=".." executable="./scripts/setup_local_props.sh" output="ant_out.txt" />
|
|
||||||
<property file="local.properties" />
|
|
||||||
|
|
||||||
<!-- The build.properties file can be created by you and is never touched
|
|
||||||
by the 'android' tool. This is the place to change some of the default property values
|
|
||||||
used by the Ant rules.
|
|
||||||
Here are some properties you may want to change/update:
|
|
||||||
|
|
||||||
application.package
|
|
||||||
the name of your application package as defined in the manifest. Used by the
|
|
||||||
'uninstall' rule.
|
|
||||||
source.dir
|
|
||||||
the name of the source directory. Default is 'src'.
|
|
||||||
out.dir
|
|
||||||
the name of the output directory. Default is 'bin'.
|
|
||||||
|
|
||||||
Properties related to the SDK location or the project target should be updated
|
|
||||||
using the 'android' tool with the 'update' action.
|
|
||||||
|
|
||||||
This file is an integral part of the build system for your application and
|
|
||||||
should be checked in in Version Control Systems.
|
|
||||||
|
|
||||||
-->
|
|
||||||
<property file="build.properties" />
|
|
||||||
|
|
||||||
<!-- The default.properties file is created and updated by the 'android' tool, as well
|
|
||||||
as ADT.
|
|
||||||
This file is an integral part of the build system for your application and
|
|
||||||
should be checked in in Version Control Systems. -->
|
|
||||||
<property file="default.properties" />
|
|
||||||
|
|
||||||
<!-- Custom Android task to deal with the project target, and import the proper rules.
|
|
||||||
This requires ant 1.6.0 or above. -->
|
|
||||||
<path id="android.antlibs">
|
|
||||||
<pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
|
|
||||||
<pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
|
|
||||||
<pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
|
|
||||||
<pathelement path="${sdk.dir}/tools/lib/apkbuilder.jar" />
|
|
||||||
<pathelement path="${sdk.dir}/tools/lib/jarutils.jar" />
|
|
||||||
</path>
|
|
||||||
|
|
||||||
<taskdef name="setup"
|
|
||||||
classname="com.android.ant.SetupTask"
|
|
||||||
classpathref="android.antlibs" />
|
|
||||||
|
|
||||||
<exec dir=".." executable="./scripts/genvers.sh" output="ant_out.txt" />
|
|
||||||
|
|
||||||
<!-- Execute the Android Setup task that will setup some properties specific to the target,
|
|
||||||
and import the build rules files.
|
|
||||||
|
|
||||||
The rules file is imported from
|
|
||||||
<SDK>/platforms/<target_platform>/templates/android_rules.xml
|
|
||||||
|
|
||||||
To customize some build steps for your project:
|
|
||||||
- copy the content of the main node <project> from android_rules.xml
|
|
||||||
- paste it in this build.xml below the <setup /> task.
|
|
||||||
- disable the import by changing the setup task below to <setup import="false" />
|
|
||||||
|
|
||||||
This will ensure that the properties are setup correctly but that your customized
|
|
||||||
build steps are used.
|
|
||||||
-->
|
|
||||||
<setup import="false"/>
|
|
||||||
|
|
||||||
|
|
||||||
<!--
|
|
||||||
This rules file is meant to be imported by the custom Ant task:
|
|
||||||
com.android.ant.AndroidInitTask
|
|
||||||
|
|
||||||
The following properties are put in place by the importing task:
|
|
||||||
android.jar, android.aidl, aapt, aidl, and dx
|
|
||||||
|
|
||||||
Additionnaly, the task sets up the following classpath reference:
|
|
||||||
android.target.classpath
|
|
||||||
This is used by the compiler task as the boot classpath.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<!-- Custom tasks -->
|
|
||||||
<taskdef name="aaptexec"
|
|
||||||
classname="com.android.ant.AaptExecLoopTask"
|
|
||||||
classpathref="android.antlibs" />
|
|
||||||
|
|
||||||
<taskdef name="apkbuilder"
|
|
||||||
classname="com.android.ant.ApkBuilderTask"
|
|
||||||
classpathref="android.antlibs" />
|
|
||||||
|
|
||||||
<taskdef name="xpath"
|
|
||||||
classname="com.android.ant.XPathTask"
|
|
||||||
classpathref="android.antlibs" />
|
|
||||||
|
|
||||||
<!-- Properties -->
|
|
||||||
|
|
||||||
<!-- Tells adb which device to target. You can change this from the command line
|
|
||||||
by invoking "ant -Dadb.device.arg=-d" for device "ant -Dadb.device.arg=-e" for
|
|
||||||
the emulator. -->
|
|
||||||
<property name="adb.device.arg" value="" />
|
|
||||||
|
|
||||||
<property name="android.tools.dir" location="${sdk.dir}/tools" />
|
|
||||||
<!-- Name of the application package extracted from manifest file -->
|
|
||||||
<xpath input="AndroidManifest.xml" expression="/manifest/@package"
|
|
||||||
output="manifest.package" />
|
|
||||||
|
|
||||||
<!-- Input directories -->
|
|
||||||
<property name="source.dir" value="src" />
|
|
||||||
<property name="source.absolute.dir" location="${source.dir}" />
|
|
||||||
<property name="gen.dir" value="gen" />
|
|
||||||
<property name="gen.absolute.dir" location="${gen.dir}" />
|
|
||||||
<property name="resource.dir" value="res" />
|
|
||||||
<property name="resource.absolute.dir" location="${resource.dir}" />
|
|
||||||
<property name="asset.dir" value="assets" />
|
|
||||||
<property name="asset.absolute.dir" location="${asset.dir}" />
|
|
||||||
|
|
||||||
<!-- Directory for the third party java libraries -->
|
|
||||||
<property name="external.libs.dir" value="libs" />
|
|
||||||
<property name="external.libs.absolute.dir" location="${external.libs.dir}" />
|
|
||||||
|
|
||||||
<!-- Directory for the native libraries -->
|
|
||||||
<property name="native.libs.dir" value="libs" />
|
|
||||||
<property name="native.libs.absolute.dir" location="${native.libs.dir}" />
|
|
||||||
|
|
||||||
<!-- Output directories -->
|
|
||||||
<property name="out.dir" value="bin" />
|
|
||||||
<property name="out.absolute.dir" location="${out.dir}" />
|
|
||||||
<property name="out.classes.dir" value="${out.absolute.dir}/classes" />
|
|
||||||
<property name="out.classes.absolute.dir" location="${out.classes.dir}" />
|
|
||||||
|
|
||||||
<!-- Intermediate files -->
|
|
||||||
<property name="dex.file.name" value="classes.dex" />
|
|
||||||
<property name="intermediate.dex.file" location="${out.absolute.dir}/${dex.file.name}" />
|
|
||||||
|
|
||||||
<!-- The final package file to generate -->
|
|
||||||
<property name="out.debug.unaligned.package"
|
|
||||||
location="${out.absolute.dir}/${ant.project.name}-debug-unaligned.apk" />
|
|
||||||
<property name="out.debug.package"
|
|
||||||
location="${out.absolute.dir}/${ant.project.name}-debug.apk" />
|
|
||||||
<property name="out.unsigned.package"
|
|
||||||
location="${out.absolute.dir}/${ant.project.name}-unsigned.apk" />
|
|
||||||
<property name="out.unaligned.package"
|
|
||||||
location="${out.absolute.dir}/${ant.project.name}-unaligned.apk" />
|
|
||||||
<property name="out.release.package"
|
|
||||||
location="${out.absolute.dir}/${ant.project.name}-release.apk" />
|
|
||||||
|
|
||||||
<!-- Verbosity -->
|
|
||||||
<property name="verbose" value="false" />
|
|
||||||
<!-- This is needed by emma as it uses multilevel verbosity instead of simple 'true' or 'false'
|
|
||||||
The property 'verbosity' is not user configurable and depends exclusively on 'verbose'
|
|
||||||
value.-->
|
|
||||||
<condition property="verbosity" value="verbose" else="quiet">
|
|
||||||
<istrue value="${verbose}" />
|
|
||||||
</condition>
|
|
||||||
<!-- This is needed to switch verbosity of zipalign and aapt. Depends exclusively on 'verbose'
|
|
||||||
-->
|
|
||||||
<condition property="v.option" value="-v" else="">
|
|
||||||
<istrue value="${verbose}" />
|
|
||||||
</condition>
|
|
||||||
<!-- This is needed to switch verbosity of dx. Depends exclusively on 'verbose' -->
|
|
||||||
<condition property="verbose.option" value="--verbose" else="">
|
|
||||||
<istrue value="${verbose}" />
|
|
||||||
</condition>
|
|
||||||
|
|
||||||
<!-- Tools -->
|
|
||||||
<condition property="exe" value=".exe" else=""><os family="windows" /></condition>
|
|
||||||
<property name="adb" location="${android.tools.dir}/adb${exe}" />
|
|
||||||
<property name="zipalign" location="${android.tools.dir}/zipalign${exe}" />
|
|
||||||
|
|
||||||
<!-- Emma configuration -->
|
|
||||||
<property name="emma.dir" value="${sdk.dir}/tools/lib" />
|
|
||||||
<path id="emma.lib">
|
|
||||||
<pathelement location="${emma.dir}/emma.jar" />
|
|
||||||
<pathelement location="${emma.dir}/emma_ant.jar" />
|
|
||||||
</path>
|
|
||||||
<taskdef resource="emma_ant.properties" classpathref="emma.lib" />
|
|
||||||
<!-- End of emma configuration -->
|
|
||||||
|
|
||||||
<!-- Macros -->
|
|
||||||
|
|
||||||
<!-- Configurable macro, which allows to pass as parameters output directory,
|
|
||||||
output dex filename and external libraries to dex (optional) -->
|
|
||||||
<macrodef name="dex-helper">
|
|
||||||
<element name="external-libs" optional="yes" />
|
|
||||||
<element name="extra-parameters" optional="yes" />
|
|
||||||
<sequential>
|
|
||||||
<echo>Converting compiled files and external libraries into ${intermediate.dex.file}...
|
|
||||||
</echo>
|
|
||||||
<apply executable="${dx}" failonerror="true" parallel="true">
|
|
||||||
<arg value="--dex" />
|
|
||||||
<arg value="--output=${intermediate.dex.file}" />
|
|
||||||
<extra-parameters />
|
|
||||||
<arg line="${verbose.option}" />
|
|
||||||
<arg path="${out.classes.absolute.dir}" />
|
|
||||||
<fileset dir="${external.libs.absolute.dir}" includes="*.jar" />
|
|
||||||
<external-libs />
|
|
||||||
</apply>
|
|
||||||
</sequential>
|
|
||||||
</macrodef>
|
|
||||||
|
|
||||||
<!-- This is macro that enable passing variable list of external jar files to ApkBuilder
|
|
||||||
Example of use:
|
|
||||||
<package-helper>
|
|
||||||
<extra-jars>
|
|
||||||
<jarfolder path="my_jars" />
|
|
||||||
<jarfile path="foo/bar.jar" />
|
|
||||||
<jarfolder path="your_jars" />
|
|
||||||
</extra-jars>
|
|
||||||
</package-helper> -->
|
|
||||||
<macrodef name="package-helper">
|
|
||||||
<attribute name="sign.package" />
|
|
||||||
<element name="extra-jars" optional="yes" />
|
|
||||||
<sequential>
|
|
||||||
<apkbuilder
|
|
||||||
outfolder="${out.absolute.dir}"
|
|
||||||
basename="${ant.project.name}"
|
|
||||||
signed="@{sign.package}"
|
|
||||||
verbose="${verbose}">
|
|
||||||
<file path="${intermediate.dex.file}" />
|
|
||||||
<sourcefolder path="${source.absolute.dir}" />
|
|
||||||
<nativefolder path="${native.libs.absolute.dir}" />
|
|
||||||
<jarfolder path="${external.libs.absolute.dir}" />
|
|
||||||
<extra-jars/>
|
|
||||||
</apkbuilder>
|
|
||||||
</sequential>
|
|
||||||
</macrodef>
|
|
||||||
|
|
||||||
<!-- This is macro which zipaligns in.package and outputs it to out.package. Used by targets
|
|
||||||
debug, -debug-with-emma and release.-->
|
|
||||||
<macrodef name="zipalign-helper">
|
|
||||||
<attribute name="in.package" />
|
|
||||||
<attribute name="out.package" />
|
|
||||||
<sequential>
|
|
||||||
<echo>Running zip align on final apk...</echo>
|
|
||||||
<exec executable="${zipalign}" failonerror="true">
|
|
||||||
<arg line="${v.option}" />
|
|
||||||
<arg value="-f" />
|
|
||||||
<arg value="4" />
|
|
||||||
<arg path="@{in.package}" />
|
|
||||||
<arg path="@{out.package}" />
|
|
||||||
</exec>
|
|
||||||
</sequential>
|
|
||||||
</macrodef>
|
|
||||||
|
|
||||||
<!-- This is macro used only for sharing code among two targets, -install and
|
|
||||||
-install-with-emma which do exactly the same but differ in dependencies -->
|
|
||||||
<macrodef name="install-helper">
|
|
||||||
<sequential>
|
|
||||||
<echo>Installing ${out.debug.package} onto default emulator or device...</echo>
|
|
||||||
<exec executable="${adb}" failonerror="true">
|
|
||||||
<arg line="${adb.device.arg}" />
|
|
||||||
<arg value="install" />
|
|
||||||
<arg value="-r" />
|
|
||||||
<arg path="${out.debug.package}" />
|
|
||||||
</exec>
|
|
||||||
</sequential>
|
|
||||||
</macrodef>
|
|
||||||
|
|
||||||
<!-- Rules -->
|
|
||||||
|
|
||||||
<!-- Creates the output directories if they don't exist yet. -->
|
|
||||||
<target name="-dirs">
|
|
||||||
<echo>Creating output directories if needed...</echo>
|
|
||||||
<mkdir dir="${resource.absolute.dir}" />
|
|
||||||
<mkdir dir="${external.libs.absolute.dir}" />
|
|
||||||
<mkdir dir="${gen.absolute.dir}" />
|
|
||||||
<mkdir dir="${out.absolute.dir}" />
|
|
||||||
<mkdir dir="${out.classes.absolute.dir}" />
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- Generates the R.java file for this project's resources. -->
|
|
||||||
<target name="-resource-src" depends="-dirs">
|
|
||||||
<echo>Generating R.java / Manifest.java from the resources...</echo>
|
|
||||||
<exec executable="${aapt}" failonerror="true">
|
|
||||||
<arg value="package" />
|
|
||||||
<arg line="${v.option}" />
|
|
||||||
<arg value="-m" />
|
|
||||||
<arg value="-J" />
|
|
||||||
<arg path="${gen.absolute.dir}" />
|
|
||||||
<arg value="-M" />
|
|
||||||
<arg path="AndroidManifest.xml" />
|
|
||||||
<arg value="-S" />
|
|
||||||
<arg path="${resource.absolute.dir}" />
|
|
||||||
<arg value="-I" />
|
|
||||||
<arg path="${android.jar}" />
|
|
||||||
</exec>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- Generates java classes from .aidl files. -->
|
|
||||||
<target name="-aidl" depends="-dirs">
|
|
||||||
<echo>Compiling aidl files into Java classes...</echo>
|
|
||||||
<apply executable="${aidl}" failonerror="true">
|
|
||||||
<arg value="-p${android.aidl}" />
|
|
||||||
<arg value="-I${source.absolute.dir}" />
|
|
||||||
<arg value="-o${gen.absolute.dir}" />
|
|
||||||
<fileset dir="${source.absolute.dir}">
|
|
||||||
<include name="**/*.aidl" />
|
|
||||||
</fileset>
|
|
||||||
</apply>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- Compiles this project's .java files into .class files. -->
|
|
||||||
<target name="compile" depends="-resource-src, -aidl"
|
|
||||||
description="Compiles project's .java files into .class files">
|
|
||||||
<!-- If android rules are used for a test project, its classpath should include
|
|
||||||
tested project's location -->
|
|
||||||
<condition property="extensible.classpath"
|
|
||||||
value="${tested.project.absolute.dir}/bin/classes" else=".">
|
|
||||||
<isset property="tested.project.absolute.dir" />
|
|
||||||
</condition>
|
|
||||||
<javac encoding="ascii" target="1.5" debug="true" extdirs=""
|
|
||||||
destdir="${out.classes.absolute.dir}"
|
|
||||||
bootclasspathref="android.target.classpath"
|
|
||||||
verbose="${verbose}" classpath="${extensible.classpath}">
|
|
||||||
<src path="${source.absolute.dir}" />
|
|
||||||
<src path="${gen.absolute.dir}" />
|
|
||||||
<classpath>
|
|
||||||
<fileset dir="${external.libs.absolute.dir}" includes="*.jar" />
|
|
||||||
</classpath>
|
|
||||||
<compilerarg value="-Xlint:unchecked"/>
|
|
||||||
</javac>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- Converts this project's .class files into .dex files -->
|
|
||||||
<target name="-dex" depends="compile">
|
|
||||||
<dex-helper />
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- Puts the project's resources into the output package file
|
|
||||||
This actually can create multiple resource package in case
|
|
||||||
Some custom apk with specific configuration have been
|
|
||||||
declared in default.properties.
|
|
||||||
-->
|
|
||||||
<target name="-package-resources">
|
|
||||||
<echo>Packaging resources</echo>
|
|
||||||
<aaptexec executable="${aapt}"
|
|
||||||
command="package"
|
|
||||||
manifest="AndroidManifest.xml"
|
|
||||||
resources="${resource.absolute.dir}"
|
|
||||||
assets="${asset.absolute.dir}"
|
|
||||||
androidjar="${android.jar}"
|
|
||||||
outfolder="${out.absolute.dir}"
|
|
||||||
basename="${ant.project.name}" />
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- Packages the application and sign it with a debug key. -->
|
|
||||||
<target name="-package-debug-sign" depends="-dex, -package-resources">
|
|
||||||
<package-helper sign.package="true" />
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- Packages the application without signing it. -->
|
|
||||||
<target name="-package-no-sign" depends="-dex, -package-resources">
|
|
||||||
<package-helper sign.package="false" />
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="-compile-tested-if-test" if="tested.project.dir" unless="do.not.compile.again">
|
|
||||||
<subant target="compile">
|
|
||||||
<fileset dir="${tested.project.absolute.dir}" includes="build.xml" />
|
|
||||||
</subant>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- Builds debug output package, provided all the necessary files are already dexed -->
|
|
||||||
<target name="debug" depends="-compile-tested-if-test, -package-debug-sign"
|
|
||||||
description="Builds the application and signs it with a debug key.">
|
|
||||||
<zipalign-helper in.package="${out.debug.unaligned.package}"
|
|
||||||
out.package="${out.debug.package}" />
|
|
||||||
<echo>Debug Package: ${out.debug.package}</echo>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="-release-check">
|
|
||||||
<condition property="release.sign">
|
|
||||||
<and>
|
|
||||||
<isset property="key.store" />
|
|
||||||
<isset property="key.alias" />
|
|
||||||
</and>
|
|
||||||
</condition>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="-release-nosign" depends="-release-check" unless="release.sign">
|
|
||||||
<echo>No key.store and key.alias properties found in build.properties.</echo>
|
|
||||||
<echo>Please sign ${out.unsigned.package} manually</echo>
|
|
||||||
<echo>and run zipalign from the Android SDK tools.</echo>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="release" depends="-package-no-sign, -release-nosign" if="release.sign"
|
|
||||||
description="Builds the application. The generated apk file must be signed before
|
|
||||||
it is published.">
|
|
||||||
<!-- Gets passwords -->
|
|
||||||
<input
|
|
||||||
message="Please enter keystore password (store:${key.store}):"
|
|
||||||
addproperty="key.store.password" />
|
|
||||||
<input
|
|
||||||
message="Please enter password for alias '${key.alias}':"
|
|
||||||
addproperty="key.alias.password" />
|
|
||||||
|
|
||||||
<!-- Signs the APK -->
|
|
||||||
<echo>Signing final apk...</echo>
|
|
||||||
<signjar
|
|
||||||
jar="${out.unsigned.package}"
|
|
||||||
signedjar="${out.unaligned.package}"
|
|
||||||
keystore="${key.store}"
|
|
||||||
storepass="${key.store.password}"
|
|
||||||
alias="${key.alias}"
|
|
||||||
keypass="${key.alias.password}"
|
|
||||||
verbose="${verbose}" />
|
|
||||||
|
|
||||||
<!-- Zip aligns the APK -->
|
|
||||||
<zipalign-helper in.package="${out.unaligned.package}"
|
|
||||||
out.package="${out.release.package}" />
|
|
||||||
<echo>Release Package: ${out.release.package}</echo>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="install" depends="debug"
|
|
||||||
description="Installs/reinstalls the debug package onto a running
|
|
||||||
emulator or device. If the application was previously installed,
|
|
||||||
the signatures must match." >
|
|
||||||
<install-helper />
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="-uninstall-check">
|
|
||||||
<condition property="uninstall.run">
|
|
||||||
<isset property="manifest.package" />
|
|
||||||
</condition>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="-uninstall-error" depends="-uninstall-check" unless="uninstall.run">
|
|
||||||
<echo>Unable to run 'ant uninstall', manifest.package property is not defined.
|
|
||||||
</echo>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- Uninstalls the package from the default emulator/device -->
|
|
||||||
<target name="uninstall" depends="-uninstall-error" if="uninstall.run"
|
|
||||||
description="Uninstalls the application from a running emulator or device.">
|
|
||||||
<echo>Uninstalling ${manifest.package} from the default emulator or device...</echo>
|
|
||||||
<exec executable="${adb}" failonerror="true">
|
|
||||||
<arg line="${adb.device.arg}" />
|
|
||||||
<arg value="uninstall" />
|
|
||||||
<arg value="${manifest.package}" />
|
|
||||||
</exec>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="clean" description="Removes output files created by other targets.">
|
|
||||||
<delete dir="${out.absolute.dir}" verbose="${verbose}" />
|
|
||||||
<delete dir="${gen.absolute.dir}" verbose="${verbose}" />
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- Targets for code-coverage measurement purposes, invoked from external file -->
|
|
||||||
|
|
||||||
<!-- Emma-instruments tested project classes (compiles the tested project if necessary)
|
|
||||||
and writes instrumented classes to ${instrumentation.absolute.dir}/classes -->
|
|
||||||
<target name="-emma-instrument" depends="compile">
|
|
||||||
<echo>Instrumenting classes from ${out.absolute.dir}/classes...</echo>
|
|
||||||
<!-- It only instruments class files, not any external libs -->
|
|
||||||
<emma enabled="true">
|
|
||||||
<instr verbosity="${verbosity}"
|
|
||||||
mode="overwrite"
|
|
||||||
instrpath="${out.absolute.dir}/classes"
|
|
||||||
outdir="${out.absolute.dir}/classes">
|
|
||||||
</instr>
|
|
||||||
<!-- TODO: exclusion filters on R*.class and allowing custom exclusion from
|
|
||||||
user defined file -->
|
|
||||||
</emma>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="-dex-instrumented" depends="-emma-instrument">
|
|
||||||
<dex-helper>
|
|
||||||
<extra-parameters>
|
|
||||||
<arg value="--no-locals" />
|
|
||||||
</extra-parameters>
|
|
||||||
<external-libs>
|
|
||||||
<fileset file="${emma.dir}/emma_device.jar" />
|
|
||||||
</external-libs>
|
|
||||||
</dex-helper>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- Invoked from external files for code coverage purposes -->
|
|
||||||
<target name="-package-with-emma" depends="-dex-instrumented, -package-resources">
|
|
||||||
<package-helper sign.package="true">
|
|
||||||
<extra-jars>
|
|
||||||
<!-- Injected from external file -->
|
|
||||||
<jarfile path="${emma.dir}/emma_device.jar" />
|
|
||||||
</extra-jars>
|
|
||||||
</package-helper>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="-debug-with-emma" depends="-package-with-emma">
|
|
||||||
<zipalign-helper in.package="${out.debug.unaligned.package}"
|
|
||||||
out.package="${out.debug.package}" />
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="-install-with-emma" depends="-debug-with-emma">
|
|
||||||
<install-helper />
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- End of targets for code-coverage measurement purposes -->
|
|
||||||
|
|
||||||
<target name="help">
|
|
||||||
<!-- displays starts at col 13
|
|
||||||
|13 80| -->
|
|
||||||
<echo>Android Ant Build. Available targets:</echo>
|
|
||||||
<echo> help: Displays this help.</echo>
|
|
||||||
<echo> clean: Removes output files created by other targets.</echo>
|
|
||||||
<echo> compile: Compiles project's .java files into .class files.</echo>
|
|
||||||
<echo> debug: Builds the application and signs it with a debug key.</echo>
|
|
||||||
<echo> release: Builds the application. The generated apk file must be</echo>
|
|
||||||
<echo> signed before it is published.</echo>
|
|
||||||
<echo> install: Installs/reinstalls the debug package onto a running</echo>
|
|
||||||
<echo> emulator or device.</echo>
|
|
||||||
<echo> If the application was previously installed, the</echo>
|
|
||||||
<echo> signatures must match.</echo>
|
|
||||||
<echo> uninstall: Uninstalls the application from a running emulator or</echo>
|
|
||||||
<echo> device.</echo>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
2
xwords4/android/XWords4/libs/.gitignore
vendored
2
xwords4/android/XWords4/libs/.gitignore
vendored
|
|
@ -1,2 +0,0 @@
|
||||||
/armeabi
|
|
||||||
/x86
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
# To enable ProGuard in your project, edit project.properties
|
|
||||||
# to define the proguard.config property as described in that file.
|
|
||||||
#
|
|
||||||
# Add project specific ProGuard rules here.
|
|
||||||
# By default, the flags in this file are appended to flags specified
|
|
||||||
# in ${sdk.dir}/tools/proguard/proguard-android.txt
|
|
||||||
# You can edit the include path and order by changing the ProGuard
|
|
||||||
# include property in project.properties.
|
|
||||||
#
|
|
||||||
# For more details, see
|
|
||||||
# http://developer.android.com/guide/developing/tools/proguard.html
|
|
||||||
|
|
||||||
# Add any project specific keep options here:
|
|
||||||
|
|
||||||
# If your project uses WebView with JS, uncomment the following
|
|
||||||
# and specify the fully qualified class name to the JavaScript interface
|
|
||||||
# class:
|
|
||||||
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
|
|
||||||
# public *;
|
|
||||||
#}
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
# This file is automatically generated by Android Tools.
|
|
||||||
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
|
|
||||||
#
|
|
||||||
# This file must be checked in Version Control Systems.
|
|
||||||
#
|
|
||||||
# To customize properties used by the Ant build system edit
|
|
||||||
# "ant.properties", and override values to adapt the script to your
|
|
||||||
# project structure.
|
|
||||||
#
|
|
||||||
# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
|
|
||||||
# proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
|
|
||||||
|
|
||||||
# Project target.
|
|
||||||
target=android-23
|
|
||||||
1
xwords4/android/XWords4/res/.gitignore
vendored
1
xwords4/android/XWords4/res/.gitignore
vendored
|
|
@ -1 +0,0 @@
|
||||||
values-??/strings.xml
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
|
|
||||||
<resources>
|
|
||||||
<string name="app_version">4.4.115</string>
|
|
||||||
</resources>
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
|
||||||
<bool name="dualpane_enabled">false</bool>
|
|
||||||
</resources>
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
/GitVersion.java
|
|
||||||
BuildConstants.java
|
|
||||||
GCMConsts.java
|
|
||||||
nohup.out
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
LocIDsData.java
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
BuildConstants.java
|
|
||||||
Utils.java
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
gitvers.txt
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
gitvers.txt
|
|
||||||
290
xwords4/android/app/build.gradle
Normal file
290
xwords4/android/app/build.gradle
Normal file
|
|
@ -0,0 +1,290 @@
|
||||||
|
import groovy.swing.SwingBuilder
|
||||||
|
|
||||||
|
def INITIAL_CLIENT_VERS = 8
|
||||||
|
def VERSION_CODE_BASE = 111
|
||||||
|
def VERSION_NAME = '4.4.115'
|
||||||
|
def VARIANTS = [ "xw4", "xw4dbg" ]
|
||||||
|
def BUILDS = [ "Debug", "Release" ]
|
||||||
|
|
||||||
|
apply plugin: 'com.android.application'
|
||||||
|
|
||||||
|
android {
|
||||||
|
buildToolsVersion '23.0.2'
|
||||||
|
defaultConfig {
|
||||||
|
minSdkVersion 7
|
||||||
|
targetSdkVersion 23
|
||||||
|
versionCode VERSION_CODE_BASE
|
||||||
|
versionName VERSION_NAME
|
||||||
|
}
|
||||||
|
|
||||||
|
// Rename all output artifacts to include version information
|
||||||
|
applicationVariants.all { variant ->
|
||||||
|
// renameArtifact(variant)
|
||||||
|
// variant.buildConfigField "String", "FIELD_NAME", "\"my String\""
|
||||||
|
def GCM_SENDER_ID = System.getenv("GCM_SENDER_ID")
|
||||||
|
variant.buildConfigField "String", "SENDER_ID", "\"$GCM_SENDER_ID\""
|
||||||
|
def CRITTERCISM_APP_ID = System.getenv("CRITTERCISM_APP_ID")
|
||||||
|
variant.buildConfigField "String", "CRITTERCISM_APP_ID", "\"$CRITTERCISM_APP_ID\""
|
||||||
|
|
||||||
|
def gitHash = "../scripts/gitversion.sh".execute().text.trim()
|
||||||
|
resValue "string", "git_rev", "$gitHash"
|
||||||
|
variant.buildConfigField "String", "GIT_REV", "\"$gitHash\""
|
||||||
|
|
||||||
|
// def stamp = Long.valueOf('date +\'%s\''.execute().text.trim());
|
||||||
|
def stamp = Math.round(System.currentTimeMillis() / 1000)
|
||||||
|
variant.buildConfigField "long", "BUILD_STAMP", "$stamp"
|
||||||
|
|
||||||
|
// FIX ME
|
||||||
|
variant.buildConfigField "String", "STRINGS_HASH", "\"00000\""
|
||||||
|
variant.buildConfigField "boolean", "WIDIR_ENABLED", "false"
|
||||||
|
|
||||||
|
def senderID = System.getenv("GCM_SENDER_ID")
|
||||||
|
variant.buildConfigField "String", "GCM_SENDER_ID", "\"$senderID\""
|
||||||
|
|
||||||
|
variant.buildConfigField "short", "CLIENT_VERS_RELAY", "$INITIAL_CLIENT_VERS"
|
||||||
|
}
|
||||||
|
|
||||||
|
flavorDimensions "variant"//, "abi"
|
||||||
|
productFlavors {
|
||||||
|
xw4 {
|
||||||
|
dimension "variant"
|
||||||
|
applicationId "org.eehouse.android.${VARIANTS[0]}"
|
||||||
|
manifestPlaceholders = [ APP_ID: applicationId ]
|
||||||
|
resValue "string", "app_name", "CrossWords"
|
||||||
|
resValue "string", "nbs_port", "3344"
|
||||||
|
resValue "string", "invite_prefix", "/and/"
|
||||||
|
}
|
||||||
|
xw4dbg {
|
||||||
|
dimension "variant"
|
||||||
|
applicationId "org.eehouse.android.${VARIANTS[1]}"
|
||||||
|
manifestPlaceholders = [ APP_ID: applicationId ]
|
||||||
|
resValue "string", "app_name", "CrossDbg"
|
||||||
|
resValue "string", "nbs_port", "3345"
|
||||||
|
resValue "string", "invite_prefix", "/anddbg/"
|
||||||
|
}
|
||||||
|
|
||||||
|
// WARNING: "all" breaks things. Seems to be a keyword. Need
|
||||||
|
// to figure out how to express include-all-abis
|
||||||
|
// all {
|
||||||
|
// dimension "abi"
|
||||||
|
// versionCode 0 + VERSION_CODE_BASE
|
||||||
|
// }
|
||||||
|
// armeabi {
|
||||||
|
// dimension "abi"
|
||||||
|
// versionCode 1 + VERSION_CODE_BASE
|
||||||
|
// }
|
||||||
|
// x86 {
|
||||||
|
// dimension "abi"
|
||||||
|
// versionCode 2 + VERSION_CODE_BASE
|
||||||
|
// }
|
||||||
|
// armeabiv7a {
|
||||||
|
// dimension "abi"
|
||||||
|
// versionCode 3 + VERSION_CODE_BASE
|
||||||
|
// }
|
||||||
|
}
|
||||||
|
|
||||||
|
signingConfigs {
|
||||||
|
release {
|
||||||
|
storeFile file(System.getenv("HOME") + "/.keystore")
|
||||||
|
keyAlias "mykey"
|
||||||
|
|
||||||
|
// These two lines make gradle believe that the signingConfigs
|
||||||
|
// section is complete. Without them, tasks like installRelease
|
||||||
|
// will not be available!
|
||||||
|
storePassword "notReal"
|
||||||
|
keyPassword "notReal"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
buildTypes {
|
||||||
|
release {
|
||||||
|
signingConfig signingConfigs.release
|
||||||
|
debuggable false
|
||||||
|
minifyEnabled false // PENDING
|
||||||
|
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||||
|
}
|
||||||
|
debug {
|
||||||
|
debuggable true
|
||||||
|
// This doesn't work on marshmallow: duplicate permission error
|
||||||
|
// applicationIdSuffix ".debug"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
sourceSets {
|
||||||
|
// Use symlinks instead of setting non-conventional
|
||||||
|
// directories here. AS doesn't respect what's set here: it'll
|
||||||
|
// compile, but post-install app launch and source-level
|
||||||
|
// debugging don't work.
|
||||||
|
xw4 {
|
||||||
|
release {
|
||||||
|
jniLibs.srcDir "../libs-release-xw4"
|
||||||
|
}
|
||||||
|
debug {
|
||||||
|
jniLibs.srcDir "../libs-debug-xw4"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
xw4dbg {
|
||||||
|
release {
|
||||||
|
jniLibs.srcDir "../libs-release-xw4dbg"
|
||||||
|
}
|
||||||
|
debug {
|
||||||
|
jniLibs.srcDir "../libs-debug-xw4dbg"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
lintOptions {
|
||||||
|
abortOnError false
|
||||||
|
}
|
||||||
|
|
||||||
|
def gitrev = "git describe --tags".execute().text.trim()
|
||||||
|
applicationVariants.all { variant ->
|
||||||
|
variant.outputs.each { output ->
|
||||||
|
output.outputFile =
|
||||||
|
new File(output.outputFile.parent,
|
||||||
|
output.outputFile.name.replace(".apk", "-${gitrev}.apk"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
// Look into replacing this with a fetch too PENDING
|
||||||
|
compile files('../libs/gcm.jar')
|
||||||
|
|
||||||
|
// Should probably choose a version rather than risk having it
|
||||||
|
// upgraded on me. PENDING
|
||||||
|
compile 'com.android.support:support-v4:+'
|
||||||
|
// compile files('../libs/android-support-v13.jar')
|
||||||
|
|
||||||
|
xw4dbgCompile 'com.crittercism:crittercism-android-agent:+'
|
||||||
|
}
|
||||||
|
|
||||||
|
task mkImages(type: Exec) {
|
||||||
|
workingDir '../'
|
||||||
|
commandLine './scripts/mkimages.sh'
|
||||||
|
}
|
||||||
|
|
||||||
|
task copyStrings(type: Exec) {
|
||||||
|
workingDir '../'
|
||||||
|
commandLine './scripts/copy-strings.py'
|
||||||
|
}
|
||||||
|
|
||||||
|
task ndkSetup(type: Exec) {
|
||||||
|
workingDir '../'
|
||||||
|
commandLine "./scripts/ndksetup.sh", "--with-clang"
|
||||||
|
}
|
||||||
|
|
||||||
|
task myPreBuild(dependsOn: ['ndkSetup', 'mkImages', 'copyStrings', 'mkXml']) {
|
||||||
|
}
|
||||||
|
preBuild.dependsOn myPreBuild
|
||||||
|
|
||||||
|
task mkXml(type: Exec) {
|
||||||
|
workingDir '../'
|
||||||
|
commandLine './scripts/mk_xml.py', '-o',
|
||||||
|
"app/src/main/java/org/eehouse/android/xw4/loc/LocIDsData.java",
|
||||||
|
'-t', "debug"
|
||||||
|
}
|
||||||
|
|
||||||
|
afterEvaluate {
|
||||||
|
VARIANTS.each { VARIANT ->
|
||||||
|
String variantCaps = VARIANT.capitalize()
|
||||||
|
BUILDS.each { BUILD ->
|
||||||
|
String nameLC = BUILD.toLowerCase()
|
||||||
|
String lib = "libs-${nameLC}-${VARIANT}"
|
||||||
|
String ndkBuildTask = "ndkBuild${variantCaps}${BUILD}"
|
||||||
|
task "$ndkBuildTask"(type: Exec) {
|
||||||
|
workingDir '../'
|
||||||
|
commandLine './scripts/ndkbuild.sh', '-j3',
|
||||||
|
"BUILD_TARGET=${nameLC}", "INITIAL_CLIENT_VERS=$INITIAL_CLIENT_VERS",
|
||||||
|
"VARIANT=$VARIANT", "NDK_LIBS_OUT=${lib}", "NDK_OUT=./obj-${nameLC}-${VARIANT}"
|
||||||
|
}
|
||||||
|
|
||||||
|
String compileTask = "compile${variantCaps}${BUILD}Ndk"
|
||||||
|
tasks.getByName(compileTask).dependsOn ndkBuildTask
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
String copyStringsTask = "copyStringsXw4Dbg"
|
||||||
|
task "$copyStringsTask"(type: Exec) {
|
||||||
|
workingDir './'
|
||||||
|
environment.put('APPNAME', 'CrossDbg')
|
||||||
|
commandLine 'make', '-f', '../scripts/Variant.mk',
|
||||||
|
"src/xw4dbg/res/values/strings.xml"
|
||||||
|
}
|
||||||
|
preBuild.dependsOn copyStringsTask
|
||||||
|
}
|
||||||
|
|
||||||
|
clean.dependsOn 'cleanNDK'
|
||||||
|
task cleanNDK(type: Exec) {
|
||||||
|
ArrayList<String> lst = new ArrayList<String>(["rm", "-rf"]);
|
||||||
|
BUILDS.each { BUILD ->
|
||||||
|
String buildLC = BUILD.toLowerCase()
|
||||||
|
VARIANTS.each { VARIANT ->
|
||||||
|
lst.add("libs-${buildLC}-${VARIANT}")
|
||||||
|
lst.add("obj-${buildLC}-${VARIANT}")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
workingDir '../'
|
||||||
|
commandLine lst
|
||||||
|
}
|
||||||
|
|
||||||
|
gradle.taskGraph.whenReady { taskGraph ->
|
||||||
|
if ( taskGraph.hasTask(':app:validateReleaseSigning') ) {
|
||||||
|
def pass
|
||||||
|
if (System.getenv("ANDROID_RELEASE_PASSWORD")) {
|
||||||
|
pass = System.getenv("ANDROID_RELEASE_PASSWORD")
|
||||||
|
} else if ( null != System.console() ) {
|
||||||
|
pass = System.console().readPassword("\nPlease enter key passphrase: ")
|
||||||
|
pass = new String(pass)
|
||||||
|
} else {
|
||||||
|
new SwingBuilder().edt {
|
||||||
|
dialog(modal: true, // Otherwise the build will continue running before you closed the dialog
|
||||||
|
title: 'Enter password', // Dialog title
|
||||||
|
alwaysOnTop: true, // pretty much what the name says
|
||||||
|
resizable: false, // Don't allow the user to resize the dialog
|
||||||
|
locationRelativeTo: null, // Place dialog in center of the screen
|
||||||
|
pack: true, // We need to pack the dialog (so it will take the size of it's children
|
||||||
|
show: true // Let's show it
|
||||||
|
) {
|
||||||
|
vbox { // Put everything below each other
|
||||||
|
label(text: "Please enter key passphrase:")
|
||||||
|
input = passwordField();
|
||||||
|
button(defaultButton: true, text: 'OK', actionPerformed: {
|
||||||
|
pass = new String(input.password); // Set pass variable to value of input field
|
||||||
|
// println "myPass: $myPass"
|
||||||
|
|
||||||
|
dispose(); // Close dialog
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
android.signingConfigs.release.storePassword = pass
|
||||||
|
android.signingConfigs.release.keyPassword = pass
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// def getVersionName() {
|
||||||
|
// try {
|
||||||
|
// def stdout = new ByteArrayOutputStream()
|
||||||
|
// exec {
|
||||||
|
// commandLine 'git', 'describe', '--dirty'
|
||||||
|
// standardOutput = stdout
|
||||||
|
// }
|
||||||
|
// return stdout.toString().trim()
|
||||||
|
// }
|
||||||
|
// catch (ignored) {
|
||||||
|
// return null;
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
// def renameArtifact(variant) {
|
||||||
|
// variant.outputs.each { output ->
|
||||||
|
// def name = String.format( "XWords4-%s-%s.apk", variant.name,
|
||||||
|
// getVersionName() )
|
||||||
|
// output.outputFile = new File( (String)output.outputFile.parent,
|
||||||
|
// (String)name )
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
@ -8,7 +8,6 @@
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
package="org.eehouse.android.xw4"
|
package="org.eehouse.android.xw4"
|
||||||
android:versionCode="111"
|
android:versionCode="111"
|
||||||
android:versionName="@string/app_version"
|
|
||||||
>
|
>
|
||||||
|
|
||||||
<!-- BE SURE TO MODIFY project.properties AND the variable TARGET in
|
<!-- BE SURE TO MODIFY project.properties AND the variable TARGET in
|
||||||
|
|
@ -45,9 +44,9 @@
|
||||||
<uses-feature android:name="android.hardware.nfc" android:required="false" />
|
<uses-feature android:name="android.hardware.nfc" android:required="false" />
|
||||||
|
|
||||||
<!-- GCM stuff -->
|
<!-- GCM stuff -->
|
||||||
<permission android:name="org.eehouse.android.xw4.permission.C2D_MESSAGE"
|
<permission android:name="${APP_ID}.permission.C2D_MESSAGE"
|
||||||
android:protectionLevel="signature" />
|
android:protectionLevel="signature" />
|
||||||
<uses-permission android:name="org.eehouse.android.xw4.permission.C2D_MESSAGE" />
|
<uses-permission android:name="${APP_ID}.permission.C2D_MESSAGE" />
|
||||||
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
|
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
|
||||||
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
|
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
|
||||||
<uses-permission android:name="android.permission.WAKE_LOCK" />
|
<uses-permission android:name="android.permission.WAKE_LOCK" />
|
||||||
|
|
@ -236,7 +235,7 @@
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="com.google.android.c2dm.intent.RECEIVE" />
|
<action android:name="com.google.android.c2dm.intent.RECEIVE" />
|
||||||
<action android:name="com.google.android.c2dm.intent.REGISTRATION" />
|
<action android:name="com.google.android.c2dm.intent.REGISTRATION" />
|
||||||
<category android:name="org.eehouse.android.xw4" />
|
<category android:name="${APP_ID}" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
</receiver>
|
</receiver>
|
||||||
|
|
||||||
|
|
@ -30,6 +30,8 @@
|
||||||
<li>Request permissions when they're needed, e.g. ask to send
|
<li>Request permissions when they're needed, e.g. ask to send
|
||||||
SMS messages when a game is being configured to communicate
|
SMS messages when a game is being configured to communicate
|
||||||
using SMS</li>
|
using SMS</li>
|
||||||
|
<li>Change order of games to put oldest in which it's your turn
|
||||||
|
at the top</li>
|
||||||
<li>New two-color icon for notifications (required by the newer
|
<li>New two-color icon for notifications (required by the newer
|
||||||
Android that supports just-in-time permissions)</li>
|
Android that supports just-in-time permissions)</li>
|
||||||
<li>Use less battery by being smarter about how often to check
|
<li>Use less battery by being smarter about how often to check
|
||||||
|
|
@ -37,6 +39,7 @@
|
||||||
installing from F-Droid.)</li>
|
installing from F-Droid.)</li>
|
||||||
<li>Stop mis-identifying tablets as data-SMS-capable (only GSM
|
<li>Stop mis-identifying tablets as data-SMS-capable (only GSM
|
||||||
phones are)</li>
|
phones are)</li>
|
||||||
|
<li>Shorten default rematch game name</li>
|
||||||
<li>Allow board "squares" to be wider than tall if it
|
<li>Allow board "squares" to be wider than tall if it
|
||||||
fills the screen better</li>
|
fills the screen better</li>
|
||||||
<li>Improvements in localization for French, Catalan, Dutch,
|
<li>Improvements in localization for French, Catalan, Dutch,
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2009-2010 by Eric House (xwords@eehouse.org). All
|
* Copyright 2009-2010 by Eric House (xwords@eehouse.org). All
|
||||||
* rights reserved.
|
* rights reserved.
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2009-2014 by Eric House (xwords@eehouse.org). All
|
* Copyright 2009-2014 by Eric House (xwords@eehouse.org). All
|
||||||
* rights reserved.
|
* rights reserved.
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2009 - 2016 by Eric House (xwords@eehouse.org). All rights
|
* Copyright 2009 - 2016 by Eric House (xwords@eehouse.org). All rights
|
||||||
* reserved.
|
* reserved.
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2012 by Eric House (xwords@eehouse.org). All rights
|
* Copyright 2012 by Eric House (xwords@eehouse.org). All rights
|
||||||
* reserved.
|
* reserved.
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2010 - 2014 by Eric House (xwords@eehouse.org). All
|
* Copyright 2010 - 2014 by Eric House (xwords@eehouse.org). All
|
||||||
* rights reserved.
|
* rights reserved.
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2016 by Eric House (xwords@eehouse.org). All rights reserved.
|
* Copyright 2016 by Eric House (xwords@eehouse.org). All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2009 - 2013 by Eric House (xwords@eehouse.org). All
|
* Copyright 2009 - 2013 by Eric House (xwords@eehouse.org). All
|
||||||
* rights reserved.
|
* rights reserved.
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2009 - 2013 by Eric House (xwords@eehouse.org). All
|
* Copyright 2009 - 2013 by Eric House (xwords@eehouse.org). All
|
||||||
* rights reserved.
|
* rights reserved.
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2009 - 2016 by Eric House (xwords@eehouse.org). All
|
* Copyright 2009 - 2016 by Eric House (xwords@eehouse.org). All
|
||||||
* rights reserved.
|
* rights reserved.
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2009 - 2017 by Eric House (xwords@eehouse.org). All rights
|
* Copyright 2009 - 2017 by Eric House (xwords@eehouse.org). All rights
|
||||||
* reserved.
|
* reserved.
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2014 - 2016 by Eric House (xwords@eehouse.org). All rights
|
* Copyright 2014 - 2016 by Eric House (xwords@eehouse.org). All rights
|
||||||
* reserved.
|
* reserved.
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2009 - 2012 by Eric House (xwords@eehouse.org). All
|
* Copyright 2009 - 2012 by Eric House (xwords@eehouse.org). All
|
||||||
* rights reserved.
|
* rights reserved.
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2011 by Eric House (xwords@eehouse.org). All rights
|
* Copyright 2011 by Eric House (xwords@eehouse.org). All rights
|
||||||
* reserved.
|
* reserved.
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2011 by Eric House (xwords@eehouse.org). All rights
|
* Copyright 2011 by Eric House (xwords@eehouse.org). All rights
|
||||||
* reserved.
|
* reserved.
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2016 by Eric House (xwords@eehouse.org). All rights reserved.
|
* Copyright 2016 by Eric House (xwords@eehouse.org). All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2009 - 2012 by Eric House (xwords@eehouse.org). All
|
* Copyright 2009 - 2012 by Eric House (xwords@eehouse.org). All
|
||||||
* rights reserved.
|
* rights reserved.
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2009 - 2016 by Eric House (xwords@eehouse.org). All
|
* Copyright 2009 - 2016 by Eric House (xwords@eehouse.org). All
|
||||||
* rights reserved.
|
* rights reserved.
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2009-2010 by Eric House (xwords@eehouse.org). All
|
* Copyright 2009-2010 by Eric House (xwords@eehouse.org). All
|
||||||
* rights reserved.
|
* rights reserved.
|
||||||
|
|
@ -566,7 +566,9 @@ public class ConnStatusHandler {
|
||||||
if ( BuildConfig.DEBUG ) {
|
if ( BuildConfig.DEBUG ) {
|
||||||
switch ( typ ) {
|
switch ( typ ) {
|
||||||
case COMMS_CONN_RELAY:
|
case COMMS_CONN_RELAY:
|
||||||
result = String.format( "(DevID: %d) ", DevID.getRelayDevIDInt(context) );
|
result = String.format( "(DevID: %d; host: %s) ",
|
||||||
|
DevID.getRelayDevIDInt(context),
|
||||||
|
XWPrefs.getDefaultRelayHost(context) );
|
||||||
break;
|
break;
|
||||||
case COMMS_CONN_P2P:
|
case COMMS_CONN_P2P:
|
||||||
result = WiDirService.formatNetStateInfo();
|
result = WiDirService.formatNetStateInfo();
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2015 by Eric House (xwords@eehouse.org). All
|
* Copyright 2015 by Eric House (xwords@eehouse.org). All
|
||||||
* rights reserved.
|
* rights reserved.
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2009-2016 by Eric House (xwords@eehouse.org). All
|
* Copyright 2009-2016 by Eric House (xwords@eehouse.org). All
|
||||||
* rights reserved.
|
* rights reserved.
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2009 - 2012 by Eric House (xwords@eehouse.org). All
|
* Copyright 2009 - 2012 by Eric House (xwords@eehouse.org). All
|
||||||
* rights reserved.
|
* rights reserved.
|
||||||
|
|
@ -1663,7 +1663,7 @@ public class DBUtils {
|
||||||
initDB( context );
|
initDB( context );
|
||||||
String[] columns = { ROW_ID };
|
String[] columns = { ROW_ID };
|
||||||
String selection = String.format( "%s=%d", DBHelper.GROUPID, groupID );
|
String selection = String.format( "%s=%d", DBHelper.GROUPID, groupID );
|
||||||
String orderBy = String.format( "%s,%s DESC,%s DESC", DBHelper.GAME_OVER,
|
String orderBy = String.format( "%s,%s DESC,%s", DBHelper.GAME_OVER,
|
||||||
DBHelper.TURN_LOCAL, DBHelper.LASTMOVE );
|
DBHelper.TURN_LOCAL, DBHelper.LASTMOVE );
|
||||||
synchronized( s_dbHelper ) {
|
synchronized( s_dbHelper ) {
|
||||||
SQLiteDatabase db = s_dbHelper.getReadableDatabase();
|
SQLiteDatabase db = s_dbHelper.getReadableDatabase();
|
||||||
|
|
@ -2543,7 +2543,7 @@ public class DBUtils {
|
||||||
private static String getVariantDBName()
|
private static String getVariantDBName()
|
||||||
{
|
{
|
||||||
return String.format( "%s_%s", DBHelper.getDBName(),
|
return String.format( "%s_%s", DBHelper.getDBName(),
|
||||||
BuildConstants.VARIANT );
|
BuildConfig.FLAVOR );
|
||||||
}
|
}
|
||||||
|
|
||||||
// private static void clearChatHistoryString( Context context, long rowid )
|
// private static void clearChatHistoryString( Context context, long rowid )
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2009-2011 by Eric House (xwords@eehouse.org). All
|
* Copyright 2009-2011 by Eric House (xwords@eehouse.org). All
|
||||||
* rights reserved.
|
* rights reserved.
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2014 by Eric House (xwords@eehouse.org). All rights reserved.
|
* Copyright 2014 by Eric House (xwords@eehouse.org). All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2014 by Eric House (xwords@eehouse.org). All rights reserved.
|
* Copyright 2014 by Eric House (xwords@eehouse.org). All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2010 - 2015 by Eric House (xwords@eehouse.org). All rights
|
* Copyright 2010 - 2015 by Eric House (xwords@eehouse.org). All rights
|
||||||
* reserved.
|
* reserved.
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2009 - 2011 by Eric House (xwords@eehouse.org). All
|
* Copyright 2009 - 2011 by Eric House (xwords@eehouse.org). All
|
||||||
* rights reserved.
|
* rights reserved.
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2009 - 2011 by Eric House (xwords@eehouse.org). All
|
* Copyright 2009 - 2011 by Eric House (xwords@eehouse.org). All
|
||||||
* rights reserved.
|
* rights reserved.
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2016 by Eric House (xwords@eehouse.org). All rights reserved.
|
* Copyright 2016 by Eric House (xwords@eehouse.org). All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2010 by Eric House (xwords@eehouse.org). All rights
|
* Copyright 2010 by Eric House (xwords@eehouse.org). All rights
|
||||||
* reserved.
|
* reserved.
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2010 by Eric House (xwords@eehouse.org). All
|
* Copyright 2010 by Eric House (xwords@eehouse.org). All
|
||||||
* rights reserved.
|
* rights reserved.
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2009-2011 by Eric House (xwords@eehouse.org). All rights
|
* Copyright 2009-2011 by Eric House (xwords@eehouse.org). All rights
|
||||||
* reserved.
|
* reserved.
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2009 - 2014 by Eric House (xwords@eehouse.org). All
|
* Copyright 2009 - 2014 by Eric House (xwords@eehouse.org). All
|
||||||
* rights reserved.
|
* rights reserved.
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2009 - 2012 by Eric House (xwords@eehouse.org). All
|
* Copyright 2009 - 2012 by Eric House (xwords@eehouse.org). All
|
||||||
* rights reserved.
|
* rights reserved.
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2016 by Eric House (xwords@eehouse.org). All rights reserved.
|
* Copyright 2016 by Eric House (xwords@eehouse.org). All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2010 by Eric House (xwords@eehouse.org). All rights
|
* Copyright 2010 by Eric House (xwords@eehouse.org). All rights
|
||||||
* reserved.
|
* reserved.
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2009 - 2012 by Eric House (xwords@eehouse.org). All
|
* Copyright 2009 - 2012 by Eric House (xwords@eehouse.org). All
|
||||||
* rights reserved.
|
* rights reserved.
|
||||||
|
|
@ -631,10 +631,10 @@ public class DlgDelegate {
|
||||||
DateFormat df = DateFormat.getDateTimeInstance( DateFormat.FULL,
|
DateFormat df = DateFormat.getDateTimeInstance( DateFormat.FULL,
|
||||||
DateFormat.FULL );
|
DateFormat.FULL );
|
||||||
String dateString
|
String dateString
|
||||||
= df.format( new Date( BuildConstants.BUILD_STAMP * 1000 ) );
|
= df.format( new Date( BuildConfig.BUILD_STAMP * 1000 ) );
|
||||||
vers.setText( getString( R.string.about_vers_fmt,
|
vers.setText( getString( R.string.about_vers_fmt,
|
||||||
getString( R.string.app_version ),
|
getString( R.string.app_version ),
|
||||||
BuildConstants.GIT_REV, dateString ) );
|
BuildConfig.GIT_REV, dateString ) );
|
||||||
|
|
||||||
TextView xlator = (TextView)view.findViewById( R.id.about_xlator );
|
TextView xlator = (TextView)view.findViewById( R.id.about_xlator );
|
||||||
String str = getString( R.string.xlator );
|
String str = getString( R.string.xlator );
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2014 by Eric House (xwords@eehouse.org). All rights reserved.
|
* Copyright 2014 by Eric House (xwords@eehouse.org). All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2009 - 2013 by Eric House (xwords@eehouse.org). All
|
* Copyright 2009 - 2013 by Eric House (xwords@eehouse.org). All
|
||||||
* rights reserved.
|
* rights reserved.
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue