Justin SB
47b43dfb86
Prompt to install 32 bit libraries on yum machines
2014-09-10 18:53:56 -07:00
Justin SB
0ba9ec8e4e
JDK is java-1.7.0-openjdk-devel, not java-1.7.0-openjdk
2014-09-10 18:47:41 -07:00
Justin SB
94f4dfaaec
Prompt to use yum to install JDK on yum machines
...
Also recognize Debian/Ubuntu by apt-get
2014-09-10 18:39:55 -07:00
Justin SB
3dcc186914
Use double brackets in bash script
2014-09-10 18:27:54 -07:00
Justin SB
b7dbc9da62
Suggest how to install openjdk / 32 bit libs on Linux
2014-09-10 18:24:16 -07:00
Slava Kim
ca0354f6cb
Remove the warning from first boot page on mobile
2014-09-10 18:15:21 -07:00
Slava Kim
c3e2fedfb2
Merge branch 'android_tweaks' into release-0.9.2
2014-09-10 16:51:47 -07:00
Justin SB
14270c290e
Be clear that we need a JDK, not just the JRE
2014-09-10 16:19:27 -07:00
Justin SB
2116f5bf53
Avoid running ensure_android twice on failure
2014-09-10 16:09:21 -07:00
Justin SB
0860b3626d
Don't print a stack trace when android bundle fails to install
2014-09-10 16:03:42 -07:00
Slava Kim
76b5f053f1
METEOR_WAREHOUSE_DIR can be overritten by user
2014-09-10 15:56:21 -07:00
Justin SB
861697ea28
Don't include the message when we fail to install the android bundle
...
The message just says "failed to run bash; stdout & stderr have been piped
2014-09-10 15:53:27 -07:00
Justin SB
d851397dd0
Make error message when failing to run process more obvious
2014-09-10 15:52:23 -07:00
Slava Kim
fb4fbea3a8
Merge branch 'android_tweaks' into release-0.9.2
2014-09-10 15:51:36 -07:00
Slava Kim
00413f88c3
Merge branch 'cordova-httpd' into release-0.9.2
...
Conflicts:
tools/commands-cordova.js
2014-09-10 15:50:49 -07:00
Sashko Stubailo
4b40e5982d
Talk about tarball URLs
...
Conflicts:
docs/client/data.js
2014-09-10 15:48:20 -07:00
Sashko Stubailo
ac617110ea
Improve documentation, add to table of contents
...
Conflicts:
docs/client/data.js
docs/client/names.json
2014-09-10 15:45:50 -07:00
Sashko Stubailo
4698181afa
Document Npm and Cordova in package.js
2014-09-10 15:44:54 -07:00
Justin SB
ab0f57b636
Only do the localhost -> 10.0.2.2 hack if we're not using a proxy
2014-09-10 15:34:58 -07:00
Justin SB
f3b1ea2787
Don't force-enable the http proxy
2014-09-10 15:26:57 -07:00
Slava Kim
3754a16bd7
Merge remote-tracking branch 'origin/android_tweaks' into cordova-httpd
...
Conflicts:
tools/commands-cordova.js
2014-09-10 10:43:26 -07:00
Emily Stark
e192a9da67
standard-app-packages -> meteor-platform in self-test
2014-09-09 18:26:30 -07:00
Slava Kim
ec02f2281f
Improve android_bundle check
...
run check on configure-android
2014-09-09 16:56:10 -07:00
Emily Stark
404f1cc17e
Remove trailing commas
2014-09-09 16:41:06 -07:00
Slava Kim
10599e5bc5
Hot Code Push working with pushing new boilerplate
...
at least on iOS
2014-09-09 15:56:11 -07:00
Emily Stark
7ccec45494
Fix "add cordova plugins" test.
...
* Fix path to cordova.sh.
* Bump 'meteor build' timeouts.
* Set METEOR_WAREHOUSE_DIR when running cordova.sh.
* Remove expected 'org.apache.cordova.console' plugin. This wasn't
showing up in the plugin list for me, and there was an XXX being unsure
about why it would be there.
2014-09-09 14:05:22 -07:00
Emily Stark
58b5d1f6db
Rename WAREHOUSE_DIR to METEOR_WAREHOUSE_DIR in cordova scripts.
...
This is consistent with the naming in the rest of tool.
2014-09-09 14:04:35 -07:00
Emily Stark
1c6efabc45
Line wrap an error message
2014-09-09 14:03:28 -07:00
Emily Stark
3445a2712c
Record 'sdk.bundle' for stats for 'meteor build'
2014-09-09 14:02:03 -07:00
Emily Stark
b795137fcf
Remove trailing comma
2014-09-09 14:01:48 -07:00
Justin SB
b504fa8afa
Auto-install the x86 ABI if it isn't installed
...
This could be big actually; it means we don't need to bundle it
2014-09-09 13:59:10 -07:00
Justin SB
04e5bc700c
Pass a template for mktemp
...
Mac requires one
2014-09-09 13:58:54 -07:00
Justin SB
8c1b8154fe
Turn on error checking in ensure_android_bundle.sh
2014-09-09 13:58:37 -07:00
Justin SB
ffc69aa010
Super-simple script to set android proxy
...
For discussion / demo really
2014-09-09 13:17:53 -07:00
Justin SB
a1ec61dec0
Don't override ANDROID_SDK_HOME when running with system ADT
2014-09-09 13:06:58 -07:00
Justin SB
2fc07ee801
Pass http_proxy to the emulator if the httpProxyPort is set
...
It doesn't work for Cordova, though it does work for the browser
This may get fixed later
2014-09-09 13:02:32 -07:00
Justin SB
1103261918
If verbose, pass --verbose to cordova run
2014-09-09 12:59:42 -07:00
Justin SB
5a5888ec52
Don't use a huge screen by default after all; it'll be slow
2014-09-09 12:55:16 -07:00
Justin SB
d782475358
Fix typo
2014-09-09 12:35:05 -07:00
Justin SB
801b964815
Set image options to look a bit like a Nexus 4
...
Also fixes keyboard support
2014-09-09 12:34:07 -07:00
Justin SB
452da56297
Allow passing of arguments to configure-android
...
Args are passed through to the android tool
Useful commands:
configure-android avd
configure-android list avd
configure-android -- delete avd --name meteor
(Note the extra -- to delineate the args)
(Note #2 : the delete avd command doesn't seem to actually work,
though this appears to be an Android bug - it says that is has
deleted it, but it is still there!)
2014-09-09 08:51:50 -07:00
Justin SB
742603f949
Fix env logic, so we don't kill the user's PATH
2014-09-09 08:19:15 -07:00
Justin SB
36db11a63d
Fix 'typo'
2014-09-09 08:12:29 -07:00
Justin SB
accbd29b08
Merge branch 'android_tweaks' of github.com:meteor/meteor into android_tweaks
...
Conflicts:
tools/commands.js
2014-09-09 07:59:00 -07:00
Justin SB
9ebd90bddc
Start cordova using the runner infrastructure
...
Cleaner, but also we need to start the http proxy first
2014-09-09 07:55:37 -07:00
Justin SB
4c671358b2
Merge branch 'with_http_proxy' into android_tweaks
2014-09-09 07:29:20 -07:00
Justin SB
05b84fcc5e
Create avd with x86 (ARM cannot be accelerated)
2014-09-09 07:26:20 -07:00
Slava Kim
51b588b40e
Got it right for ios emulator and device
...
(no hot code push yet)
2014-09-09 00:04:48 -07:00
Slava Kim
8643e52801
Make run somehow on android
2014-09-08 23:15:12 -07:00
David Glasser
e5bdd127cf
Fix test (broken by bdcf0d188 at least on my mac)
2014-09-08 21:29:14 -07:00
