Commit Graph

2405 Commits

Author SHA1 Message Date
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
Justin SB
1e1a8f724b Automatically use proxy on cordova
Doesn't seem to automatically apply the settings though
2014-09-08 15:58:26 -07:00
Justin SB
efdb867ff4 Support CONNECT method, which is what Android uses 2014-09-08 11:32:03 -07:00
Justin SB
4ca704f93f Simple (generic) http proxy for meteor run & test-packages
Start it by passing --http-proxy-port=9999
2014-09-08 09:14:21 -07:00
Matthew Arbesfeld
df8774a7f2 Clean up cordovaDependencies by moving them to target level 2014-09-06 12:21:52 -04:00
David Glasser
b83d21d94d This One Weird Trick Speeds Up Startup By 50%
This is a horrible horrible hack.  If for no other reason that (without
EJSON.clone around) it leaves internal pieces of catalog.official and
catalog.complete intertwined.

But! It does mean that every single tool startup now only has to read
and parse packages.data.json once instead of twice.  Which speeds up
'meteor --version' from 1 second to 0.5.

We'll solve this for real with the sqlite refactoring. But this is fast
and easy for now.
2014-09-05 16:46:19 -07:00
Maxime Quandalle
79b52f32ec Remove sourcemap linking with a //# comment
Firefox now supports sourcemap linking using a HTTP response header
Firefox print a lot of warning when using the `//#` linking
2014-09-05 16:45:56 -07:00
ekatek
c38f21fb38 better regex for version checks 2014-09-05 16:45:49 -07:00
ekatek
398bd6f4b3 validate versions better 2014-09-05 16:45:40 -07:00
Slava Kim
c65f00887b Fix self-test for Cordova plugins
because we renamed 'standard-app-packages' to 'meteor-platform'
2014-09-05 16:25:04 -07:00
Justin SB
663d783636 Pass webArchs in meteor test-packages 2014-09-05 15:35:51 -07:00
Slava Kim
6ca6641a34 Merge branch 'master' into release-0.9.2
Includes latest 0.9.1 changes

Conflicts:
	examples/leaderboard/.meteor/versions
	examples/parties/.meteor/versions
	examples/todos/.meteor/versions
	packages/accounts-base/package.js
	packages/accounts-ui-unstyled/package.js
	packages/autoupdate/package.js
	packages/constraint-solver/package.js
	packages/facebook/package.js
	packages/github/package.js
	packages/google/package.js
	packages/http/package.js
	packages/less/package.js
	packages/meetup/package.js
	packages/meteor-developer/package.js
	packages/meteor-platform/package.js
	packages/meteor-tool/package.js
	packages/meteor/package.js
	packages/minimongo/package.js
	packages/oauth/package.js
	packages/oauth1/package.js
	packages/reload/package.js
	packages/templating/package.js
	packages/twitter/package.js
	packages/webapp/package.js
	packages/weibo/package.js
	scripts/admin/meteor-release-experimental.json
	tools/help.txt
	tools/tests/apps/hot-code-push-test/.meteor/versions
2014-09-05 11:28:12 -07:00
Emily Stark
e46522c7c6 Shorten 'meteor admin maintainers' help text 2014-09-04 15:30:43 -07:00
Emily Stark
23b8e178ff Remove a word from 0.9.1 upgrader 2014-09-04 11:39:31 -07:00
Emily Stark
569431841e Add Blaze upgrader for 0.9.1 2014-09-04 11:34:44 -07:00
Sashko Stubailo
6a2b92d638 Merge branch 'release-0.9.1' of github.com:meteor/meteor into release-0.9.1 2014-09-03 17:18:46 -07:00
Sashko Stubailo
b18d592042 Minor changes to help text 2014-09-03 17:18:33 -07:00
ekatek
2c6f294168 correcting help for meteor add 2014-09-03 16:50:26 -07:00
David Glasser
ea3a600079 Assets added via a plugin are not source files
Fixes #2488.

Assets added via "no handler" already have their source files added to
`sources` via the `sources.push(relPath)` in the sourceItems loop, and
assets added via a handler should not appear as source files themselves
--- the file that triggered the handler should!

This fixes packages like `mizzao:build-fetcher` which add static
assets via a plugin.
2014-09-03 16:45:09 -07:00
Matthew Arbesfeld
bd63f59b92 Remove unused code from hot-code-push-test 2014-09-03 14:55:44 -07:00
Matthew Arbesfeld
5cf24a948d Create more hot code push tests and let --browserstack use many browsers. 2014-09-03 14:55:44 -07:00
Sashko Stubailo
9491b0cad8 Fix length measurement for commands list 2014-09-03 13:59:14 -07:00
Sashko Stubailo
dc15e59e71 Add help text for organizations commands 2014-09-03 12:33:09 -07:00
Slava Kim
a6c4ed6e6e Merge branch 'release-0.9.1' into release-0.9.2
Conflicts:
	packages/autoupdate/package.js
	packages/meteor-tool/package.js
	packages/meteor/package.js
	scripts/admin/meteor-release-experimental.json
2014-09-02 13:49:21 -07:00
Slava Kim
0b6cf4f2ca Add a special 'cordova-build-override' folder.
Basically right before the `cordova build` we `cp -R` that folder into our
cordova project. Allows users to overwrite any part of the build, it might be
config.xml, app icons or even crosswalk.
2014-08-29 18:55:54 -07:00
Slava Kim
2b1e5b80b8 Kill unused cordova.preparePlatforms 2014-08-29 18:06:23 -07:00
Sashko Stubailo
82d1db5107 Rename Meteor.Collection to Mongo.Collection again 2014-08-29 12:28:32 -07:00
Sashko Stubailo
6b3d31ff5b Revert "Rename Meteor.Collection -> Mongo.Collection"
This reverts commit 96952dda2b.

Conflicts:
	packages/ddp/livedata_tests.js
	packages/minimongo/minimongo.js
	packages/mongo/collection.js
	packages/mongo/mongo_driver.js
	packages/mongo/mongo_livedata_tests.js
	packages/mongo/oplog_tests.js
	packages/reactive-dict/reactive-dict.js
	packages/session/session_tests.js
	tools/auth.js
2014-08-29 12:26:28 -07:00
Matthew Arbesfeld
611298fb50 Merge branch 'cordova-hcp' into devel
Conflicts:
	packages/deps/package.js
	packages/reload/reload.js
	tools/tests/apps/hot-code-push-test/.meteor/versions
2014-08-29 12:08:34 -07:00
Sashko Stubailo
84f1fcace1 Fix docs and self-test 2014-08-29 11:52:33 -07:00
Matthew Arbesfeld
18e414caea Remove unused code from hot-code-push-test 2014-08-29 11:46:39 -07:00
Matthew Arbesfeld
0bf177ca0b Create more hot code push tests and let --browserstack use many browsers. 2014-08-29 11:07:13 -07:00
Sashko Stubailo
96952dda2b Rename Meteor.Collection -> Mongo.Collection 2014-08-29 10:11:21 -07:00
Slava Kim
a02cb37ca7 Also set ANDROID_SDK_HOME
Hopefully will help with the "PANIC" crash of android emulator
2014-08-29 01:19:33 -07:00
Slava Kim
1078a6eeb4 Put cordova.sh back to the list of commands requesting android_bundle 2014-08-29 00:43:07 -07:00
Matthew Arbesfeld
fca5c382d5 Merge branch 'release-0.9.1' into cordova-hcp
Conflicts:
	docs/client/api.html
	docs/client/api.js
	meteor
	packages/autoupdate/autoupdate_server.js
	packages/autoupdate/package.js
	packages/constraint-solver/package.js
	packages/less/package.js
	packages/meteor-tool/package.js
	packages/meteor/package.js
	packages/minimongo/package.js
	packages/mongo-livedata/package.js
	packages/oauth1/package.js
	packages/package-version-parser/package.js
	packages/spiderable/package.js
	packages/standard-app-packages/package.js
	packages/templating/package.js
	packages/test-in-console/package.js
	packages/webapp/package.js
	scripts/admin/meteor-release-experimental.json
	scripts/generate-dev-bundle.sh
	tools/uniload.js
2014-08-28 21:13:59 -07:00
Slava Kim
76f0836e37 Another workaround for old Android browser's quircks around Event constructor 2014-08-28 18:07:34 -07:00
Slava Kim
02755faf0d adb from global path 2014-08-28 17:49:42 -07:00
Slava Kim
a65f825d4f Push the default HOME value 2014-08-28 17:42:14 -07:00
Sashko Stubailo
aafd8a0d3e Merge branch 'release-0.9.1' into ddp
Conflicts:
	packages/livedata/package.js
2014-08-28 17:16:38 -07:00
Sashko Stubailo
c4e0ec5a14 Merge branch 'release-0.9.1' into mongo
Conflicts:
	packages/mongo-livedata/package.js
2014-08-28 17:15:06 -07:00
Slava Kim
02164d5cc8 If USE_GLOBAL_ADK is specified, don't try to
install android_bundle and use globally available
java, javac, android and ant
2014-08-28 17:10:24 -07:00
Slava Kim
5de5ba462b More logging, propagate the 'USE_GLOBAL_ADK' env variable 2014-08-28 17:10:03 -07:00
Slava Kim
81e216c599 Ignore failures of logcat -c 2014-08-28 16:10:05 -07:00