Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-09 05:24:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
9741 commits 21 branches 243 tags 33 MiB
Commit graph

383 commits

Author SHA1 Message Date
Eric House
f3d8f0b8ee pass V=1 to ndk build script to make cc calls verbose 2015-09-15 20:57:39 -07:00
Eric House
05d0974823 Merge remote-tracking branch 'origin/android_branch' into android_branch 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2015-09-15 20:46:35 -07:00
Eric House
759cd36162 Merge branch 'android_branch' of ssh://git.code.sf.net/p/xwords/git into android_branch 
Conflicts:
	xwords4/android/XWords4-dbg/AndroidManifest.xml
	xwords4/android/scripts/mkvariant.sh
 2015-09-10 18:34:28 -07:00
Eric House
be44613773 Merge branch 'android_branch' into relay_noconn 
Conflicts:
	xwords4/android/XWords4/archive/R.java
 2015-08-27 07:53:14 -07:00
Eric House
47f8bd8125 Merge branch 'android_branch' into android_translate 2015-08-27 06:42:44 -07:00
Eric House
8e17e43d9a fix to not stop removing after removing the first elem 2015-08-27 06:41:47 -07:00
Eric House
be64f78252 Merge branch 'android_branch' into android_translate 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2015-08-24 07:44:58 -07:00
Eric House
690f248e27 ignore case where no files exist (so that /* doesn't expand) 2015-08-24 07:39:24 -07:00
Eric House
c35acdd773 ignore case where no files exist (so that /* doesn't expand) 2015-08-24 07:35:00 -07:00
Eric House
daaa346bb5 generate local.properties if running for first time 2015-08-24 07:24:28 -07:00
Eric House
f7f4825c67 deal with case where file doesn't exist 2015-08-16 09:25:00 -07:00
Eric House
265ac48b88 Merge branch 'android_branch' into relay_noconn 
Conflicts:
	xwords4/android/XWords4-dbg/AndroidManifest.xml
	xwords4/android/XWords4-dbg/res/layout/.gitignore
	xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/.gitignore
 2015-08-10 07:37:03 -07:00
Eric House
a320c81009 Merge branch 'android_branch' into android_translate 
Conflicts:
	xwords4/android/XWords4/res_src/values-ca/strings.xml
	xwords4/android/scripts/fix-loc-xmls.py
 2015-08-10 06:56:31 -07:00
Eric House
2ef407320e pick package based on location 2015-08-10 06:43:19 -07:00
Eric House
87e3108296 cleanup: make work based on location if target not specified 2015-08-10 06:23:24 -07:00
Eric House
bc18f33e5d generate local.properties if running for first time 2015-08-06 21:24:56 -07:00
Eric House
134ef851f6 generate local.properties if running for first time 2015-08-06 21:01:15 -07:00
Eric House
8b90f211ed progress: compares english and other languages use of format 
specifiers, but I think is missing mismatches in plurals still.
 2015-08-05 07:19:39 -07:00
Eric House
99455a9fcb progress: compares english and other languages use of format 
specifiers, but I think is missing mismatches in plurals still.
 2015-08-05 07:18:22 -07:00
Eric House
624f78af8f don't replace old-style format strings when "formatted" attribute == false 2015-08-04 20:58:58 -07:00
Eric House
ec581d1dbd Merge branch 'android_branch' into relay_noconn 
Conflicts:
	xwords4/android/XWords4/archive/R.java
	xwords4/android/XWords4/jni/Android.mk
	xwords4/android/XWords4/jni/xwjni.c
	xwords4/android/XWords4/res/values/common_rsrc.xml
 2015-08-04 20:17:56 -07:00
Eric House
97ebdd0d63 copy changes over from android_translate branch 2015-08-04 20:15:38 -07:00
Eric House
adceab1ed1 name change 2015-08-04 20:15:00 -07:00
Eric House
3803341c9b lots of changes/fixes in progress 2015-08-04 07:57:56 -07:00
Eric House
c83d3368ad allow using script for any project with an AndroidManifest.xml 2015-08-03 04:58:34 -07:00
Eric House
a5f332dd1d different logging TAG for different variants 2015-08-03 04:57:35 -07:00
Eric House
6871ef24a6 move several strings, including app name, NBS port, and url prefix, into generated 
.xml file so Dbg and regular variants can co-exist better

Conflicts:
	xwords4/android/XWords4/archive/R.java
 2015-08-03 04:55:59 -07:00
Eric House
b500a4646d use different uuid for dbg variant so it's not cross-sending BT 
messages with other variants, causing among other problems spurious
"deleted on other device" warnings.
 2015-08-03 04:50:56 -07:00
Eric House
7875d34757 allow using script for any project with an AndroidManifest.xml 2015-08-02 14:15:14 -07:00
Eric House
af8c6d618d different logging TAG for different variants 2015-08-02 10:29:17 -07:00
Eric House
0425df7a5e move several strings, including app name, NBS port, and url prefix, into generated 
.xml file so Dbg and regular variants can co-exist better
 2015-08-01 22:39:00 -07:00
Eric House
65606607ab use different uuid for dbg variant so it's not cross-sending BT 
messages with other variants, causing among other problems spurious
"deleted on other device" warnings.
 2015-07-29 19:48:56 -07:00
Eric House
dfc3ca5289 Merge branch 'android_branch' into relay_noconn 2015-07-29 05:54:10 -07:00
Eric House
a2705ca821 uninstall dbg variant too 2015-07-28 21:01:46 -07:00
Eric House
aa78ec2701 echo name of new .apk for easier scping 2015-07-27 07:29:09 -07:00
Eric House
82f1406df7 incorporate git rev number in name of debug .apk 2015-07-27 07:28:58 -07:00
Eric House
fc904af928 echo name of new .apk for easier scping 2015-07-27 07:26:32 -07:00
Eric House
85bd8ec2d4 merge 2015-07-27 07:16:28 -07:00
Eric House
7cc58de6e5 Merge branch 'android_branch' of ssh://git.code.sf.net/p/xwords/git into android_branch 
Conflicts:
	xwords4/android/scripts/info.py
 2015-07-27 07:14:54 -07:00
Eric House
e31c7ae4f5 update to not notify of debug build updates when version matches what's installed 2015-07-27 07:12:44 -07:00
Eric House
fe91c9e04e update to serve newest debug as well as release builds, and to know about variants 2015-07-25 21:56:48 -07:00
Eric House
ca71118c8d incorporate git rev number in name of debug .apk 2015-07-25 20:54:07 -07:00
Eric House
59ab1736ca include res_src in set of directories copied for -dbg variant 2015-07-25 08:21:44 -07:00
Eric House
9e533f82db remove redundant constant 2015-07-21 06:55:43 -07:00
Eric House
f626d6ca4c remove redundant constant 2015-07-21 06:55:15 -07:00
Eric House
5e10febe0e actually serve debug build 2015-06-09 06:39:57 -07:00
Eric House
aeae648afc look for new dbg key and drop message if it's set. Later we can keep a 
separate set of binaries.
 2015-06-07 13:42:19 -07:00
Eric House
8e21c69a55 add reinstall option 2015-06-02 08:04:06 -07:00
Eric House
d00a89b8b0 Remove name property to silence warning. This didn't work with earlier 
version of ant but I'll hope it's ok for everybody now.
 2015-04-07 07:31:41 -07:00
Eric House
3e624a6829 remove warning about not using checked-in debug keystore from release 
builds that won't use it regardless
 2015-04-07 07:20:48 -07:00
Eric House
e00938aeb1 fix to use ANDROID_NDK instead of NDK_ROOT, following fdroid's 
convention, but also not to require either if ndk-build is on PATH.
 2015-04-07 07:07:24 -07:00
Eric House
7d4aa8dd17 fix warning 2015-03-31 20:38:45 -07:00
Eric House
51e6892c32 add option to list a single language code's wordlists 2015-03-27 21:54:56 -07:00
Eric House
31f3e71704 remove repeated code 2015-03-27 21:53:37 -07:00
Eric House
10fe016785 tweaks to strings.xml copying: add comment warning files are 
generated, and don't copy over strings that say "XLATE ME"
 2015-03-27 21:37:29 -07:00
Eric House
c0199e8768 include copy-strings.py in the build 2015-03-27 07:46:50 -07:00
Eric House
ac811f1690 move French strings into res_src/, and add script to filter/copy all 
strings.xml files from there to res/, effectively including them in
the app the way the Android SDK intends. This will allow me to turn
off the downloadable localization stuff which is tripping over having
more than English built in. ToDo: incorporate the copy into the build.
 2015-03-27 07:26:51 -07:00
Eric House
d5984a34b7 include language code in available dicts json 2015-03-25 06:51:13 -07:00
Eric House
51e86269ac use try for better usage error message 2015-03-25 04:51:30 -07:00
Eric House
899d2073b2 towards a script to sanity-check localized strings.xml files against 
English
 2015-03-25 04:43:33 -07:00
Eric House
69aa57d951 fix to output unicode 2015-03-19 06:58:28 -07:00
Eric House
e89fdf7dc4 first cut at script to convert <string> to <plurals> (with only one "other" <item>) 2015-03-18 07:13:27 -07:00
Eric House
4514fc4449 fake <plurals> too 2015-03-17 20:47:17 -07:00
Eric House
3ddbb6be0f include build timestamp as a long, and let android utilities format it 
based on locale and timezone.
 2015-03-16 07:38:20 -07:00
Eric House
57c727e3cd add new flag to usage() 2015-03-10 19:56:22 -07:00
Eric House
9a551c51f8 add option to print only strings missing from the localized file 2015-03-10 07:41:25 -07:00
Eric House
59f9ebc13d cleanup 2015-03-10 07:41:10 -07:00
Eric House
1e051e835c Merge remote-tracking branch 'sf/android_branch' into android_multi2 2015-03-03 21:23:30 -08:00
Eric House
7e7305c1be I want to be able to switch dev machines without having to uninstall 
the latest debug build from my phones, and that requires using the
same debug.keystore everywhere. So check one in, and add a script that
symlinks to it from the machine's global location if necessary.
 2015-03-03 21:19:07 -08:00
Eric House
027cd319e6 Merge branch 'android_branch' into android_multi2 
Conflicts:
	xwords4/android/XWords4/archive/R.java
 2015-01-24 10:10:10 -08:00
Eric House
e0c9d626ae rename script 2015-01-23 08:30:19 -08:00
Eric House
301ce8bc3c spelling error in comment :-) 2014-11-20 18:57:57 -08:00
Eric House
64276b041e echo so I know it's doing something 2014-11-15 20:37:22 -08:00
Eric House
452729fb9d merge android_branch 2014-10-17 18:36:08 -07:00
Eric House
3dfb4ae6f8 Merge remote branch 'origin/android_branch' into android_branch 2014-10-16 20:48:39 -07:00
Eric House
39f8ec4734 expand pattern to match newer .apks 2014-10-16 20:47:43 -07:00
Eric House
dd00ba477b fix mistaken commit: uncomment 2014-10-16 20:16:35 -07:00
Eric House
878a16b3bc snapshot: android compiles, and works well enough to exchange moves 
via relay!  Lots of changes, mostly around treating connTypes as a Set
inside the java world.  Jni to translate to that is a pain.
 2014-10-16 06:45:24 -07:00
Eric House
f14c3216a5 commit changes that have been running for a while 2014-10-13 19:10:56 -07:00
Eric House
bf1f0485df include git hash in name of .apk file 2014-10-13 19:06:40 -07:00
Eric House
858187b9d7 include git rev hash in update info -- for later use detecting when a 
tagged build has changed
 2014-10-13 07:20:17 -07:00
Eric House
e69f0179cc fix script 2014-09-21 16:59:00 -07:00
Eric House
473bea77d6 get rid of -i param; instead install to all devices instead of passing 
'install' to ant.
 2014-09-08 07:25:05 -07:00
Eric House
c1ee254c4f echo what's going on 2014-09-05 21:19:32 -07:00
Eric House
5035042ce4 rename script, and add install option so can work with multiple devices 2014-09-05 07:29:03 -07:00
Eric House
b9d9fc2520 put back auto-scp of finished file to server 2014-08-29 07:33:21 -07:00
Eric House
4df0f7ffd2 add option to get new .apk file name into a file 2014-08-29 07:21:54 -07:00
Eric House
031cd613c1 Don't upload .apk as part of this script. Maybe later as part of -clone.sh. 2014-07-14 21:40:31 -07:00
Eric House
4d9c7c97ba Merge remote branch 'origin/android_localize' into android_localize 2014-06-24 08:16:56 -07:00
Eric House
d1f3648390 better shelf clearing 2014-06-24 08:16:01 -07:00
Eric House
e3ca40c221 make prompt clearer 2014-06-22 11:15:44 -07:00
Eric House
2c7128ad30 pull note out of dict header 2014-06-18 20:18:09 -07:00
Eric House
b3852ba603 cast to int so doesn't get turned into a string on the java side 2014-06-18 06:46:45 -07:00
Eric House
3e107a82e2 include word count and file size 2014-06-18 05:18:22 -07:00
Eric House
45ebb8d3b9 put dict list info in shelf for faster response 2014-06-07 17:57:43 -07:00
Eric House
d54bbb3beb don't barf when something not found in git history -- just return nothing, as it's the dev case 2014-06-07 17:50:35 -07:00
Eric House
d55dd7e206 change format of downloadable dict info. Late checkin: Android code's 
been counting on this for several days.
 2014-06-03 07:43:47 -07:00
Eric House
092c0f54c8 include md5sums of dicts in json 2014-05-28 20:45:55 -07:00
Eric House
5d0a6babae add function to list all wordlists by lang in a json -- toward not 
using webview for download function.
 2014-05-28 07:14:45 -07:00
Eric House
937e1fa9a9 don't upgrade app and translations at the same time (since new app may 
behave differently once installed)
 2014-05-28 06:43:37 -07:00