From 5cd8694569917b8afc974baa5d383da253189268 Mon Sep 17 00:00:00 2001 From: Andy2 Date: Wed, 14 Dec 2011 07:37:59 -0800 Subject: [PATCH 1/6] ignore dicts in main wince dir --- xwords4/wince/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/xwords4/wince/.gitignore b/xwords4/wince/.gitignore index 24814d811..380e1961e 100644 --- a/xwords4/wince/.gitignore +++ b/xwords4/wince/.gitignore @@ -1,3 +1,4 @@ obj*/ Cross_dbg/ xwDbgLog.txt +*.xwd From 867d9d68b0e5f9230bd0c58c2c39d25659b87bfb Mon Sep 17 00:00:00 2001 From: Andy2 Date: Wed, 14 Dec 2011 18:17:37 -0800 Subject: [PATCH 2/6] script to install onto multiple emulators --- xwords4/android/scripts/install_all.sh | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100755 xwords4/android/scripts/install_all.sh diff --git a/xwords4/android/scripts/install_all.sh b/xwords4/android/scripts/install_all.sh new file mode 100755 index 000000000..66486e562 --- /dev/null +++ b/xwords4/android/scripts/install_all.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +for DEVICE in $(adb devices | grep '^emulator' | sed 's/device//'); do + adb -s $DEVICE install -r ./bin/XWords4-debug.apk + COUNT=$((COUNT+1)) +done + +echo "installed into $COUNT emulator instances" From d6ce11b0848059bbf55d21857719330dff8fba28 Mon Sep 17 00:00:00 2001 From: Andy2 Date: Wed, 14 Dec 2011 18:17:52 -0800 Subject: [PATCH 3/6] fix to compile with DEBUG off --- xwords4/linux/linuxmain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xwords4/linux/linuxmain.c b/xwords4/linux/linuxmain.c index 76f9a922d..176ccbb0a 100644 --- a/xwords4/linux/linuxmain.c +++ b/xwords4/linux/linuxmain.c @@ -913,7 +913,7 @@ tmp_noop_sigintterm( int XP_UNUSED(sig) ) #ifdef XWFEATURE_WALKDICT //# define PRINT_ALL static void -testGetNthWord( const DictionaryCtxt* dict, char** words, +testGetNthWord( const DictionaryCtxt* dict, char** XP_UNUSED_DBG(words), XP_U16 depth, IndexData* data, XP_U16 min, XP_U16 max ) { XP_UCHAR buf[64]; @@ -950,7 +950,7 @@ testGetNthWord( const DictionaryCtxt* dict, char** words, } static void -walk_dict_test( const LaunchParams* params, const DictionaryCtxt* dict, +walk_dict_test( const LaunchParams* XP_UNUSED_DBG(params), const DictionaryCtxt* dict, GSList* testPrefixes, const char* testMinMax ) { /* This is just to test that the dict-iterating code works. The words are From 420661bf9f7af433b54717aad2dfcf83d2d8fd5f Mon Sep 17 00:00:00 2001 From: Andy2 Date: Wed, 14 Dec 2011 20:08:38 -0800 Subject: [PATCH 4/6] put back the URL in parens. Not all email clients show the link otherwise. --- xwords4/android/XWords4/res/values/strings.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml index 0dee7eba2..229ad3354 100644 --- a/xwords4/android/XWords4/res/values/strings.xml +++ b/xwords4/android/XWords4/res/values/strings.xml @@ -1189,12 +1189,12 @@ substituted for "%1$s". (The funky \u003c and friends are encodings for the greater-than and less-than symbols which are not legal in xml strings.)--> - \u003ca href=\"%1$s\"\u003ETap here to - accept\u003c/a\u003E my invitation and join this + \u003ca href=\"%1$s\"\u003ETap + here\u003c/a\u003E (%1$s) to accept my invitation and join this game.\u003cbr\u003E \u003ca - href=\"http://eehouse.org/market_redir.php\"\u003E - Tap here to install Crosswords\u003c/a\u003E if you haven\'t - already. + href=\"http://eehouse.org/market_redir.php\"\u003E Tap + here\u003c/a\u003E (http://eehouse.org/market_redir.php) to + install Crosswords if you haven\'t already.