Commit Graph

86 Commits

Author SHA1 Message Date
Slava Kim
2c741b0a34 Remove redundant reference to ios-sim 2014-08-29 00:27:26 -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
Sashko Stubailo
29ff6a8d99 Add jsdoc to dev bundle 2014-08-27 14:46:55 -07:00
Matthew Arbesfeld
75427d70ce Merge branch 'devel' into cordova-hcp
Conflicts:
	docs/client/docs.js
	examples/leaderboard/.meteor/versions
	meteor
	packages/backbone/package.js
	packages/constraint-solver/package.js
	packages/meetup/package.js
	packages/meteor-tool/package.js
	packages/showdown/package.js
	packages/stylus/package.js
	scripts/admin/meteor-release-experimental.json
	tools/commands-packages.js
	tools/commands.js
	tools/project.js
	tools/tests/old/app-with-private/.meteor/versions
	tools/tests/old/app-with-public/.meteor/versions
	tools/tests/old/empty-app/.meteor/versions
2014-08-27 13:38:57 -07:00
Slava Kim
0f285d3596 Fix devbundle url for cordova fork 2014-08-25 20:11:15 -07:00
Slava Kim
5d8d9e7ddf Switch npm module 'cordova' to our fork due to an outstanding issue
fork contains this patch:
445ddd89fb
2014-08-25 20:02:05 -07:00
David Glasser
aa8e465b4e Shrink dev bundle by removing 10M phantom zip file
The phantom install process downloads this zip file but doesn't clean it
up.
2014-08-22 18:24:42 -07:00
Matthew Arbesfeld
922af65765 Merge branch 'devel' into cordova-hcp
Conflicts:
	meteor
	scripts/generate-dev-bundle.sh
	tools/bundler.js
	tools/unipackage.js
2014-08-20 19:48:26 -07:00
David Glasser
9fefcb2a6f update fstream/tar to fix tarball crash
https://github.com/npm/fstream/issues/26

We were working around this before, but this is a better fix. Plus might
be a (probably unobservable?) performance improvement since we do fewer
fs ops.
2014-08-19 12:58:32 -07:00
David Glasser
c708cd6813 Just fix the npm bug, on 0.10.29
Even though 0.10.29 has a security hole, 0.10.30 is worse: it often
takes 100% CPU if you pass a float to setTimeout!
2014-08-15 12:11:42 -07:00
David Glasser
98b2885e85 Revert "Upgrade Node to 0.10.30. Fix npm bug again."
This reverts commit 56ff54b085.
2014-08-15 07:21:24 -07:00
David Glasser
56ff54b085 Upgrade Node to 0.10.30. Fix npm bug again. 2014-08-14 10:15:47 -07:00
Slava Kim
3f04a82ea4 Checkout a certain version of ios-deploy 2014-08-12 17:24:51 -07:00
Slava Kim
c889dfdc76 ios-deploy, download ios-sim from s3 2014-08-12 17:17:41 -07:00
Slava Kim
97007f2441 ios-sim build script 2014-08-12 13:56:25 -07:00
Sashko Stubailo
f3b9c7261b Remove ios-sim because it needs rake 2014-08-07 16:18:14 -07:00
Sashko Stubailo
18e14e8e34 Update version of ios-sim 2014-08-07 15:51:40 -07:00
Sashko Stubailo
3bee8039eb Testing with jenkins, please ignore 2014-08-07 15:26:55 -07:00
Sashko Stubailo
86ef1b5c83 Add ios-sim to dev bundle 2014-08-07 14:41:30 -07:00
Sashko Stubailo
7fcc41f1ed Add script to generate Android bundle
Modify command to use the local cordova
2014-08-07 11:00:29 -07:00
Sashko Stubailo
d538d40972 Updated dev bundle script to download Android stuff, doesn't work perfectly yet 2014-08-06 10:56:24 -07:00
Matthew Arbesfeld
ff68931a51 Add BrowserStackLocal binary to dev_bundle
We added the new binaries to the s3 bucket, and then GET them from the
generate_dev_bundle shell script.
2014-07-03 14:18:55 -07:00
David Glasser
9a34a7c3ab The changes from dev bundle 0.3.41, merged in 2014-07-01 16:26:48 -07:00
David Glasser
a92a62acc1 Use a package.json file for deps of boot.js
Include package.json and npm-shrinkwrap.json in dev_bundle/etc

Dev bundle version number skips over one used on matt-dev-bundle-update
2014-07-01 14:57:42 -07:00
David Glasser
af7c8a3e6e can't override npm version
bump dev bundle again

sigh.  in trying to work around a silly bug (npm creates ~/tmp), it
turns out that you can't actually install npm like that --- because it
reverts the hack done by 'make install PORTABLE=1' to make npm find node
properly (because that hack literally rewrites a file in the npm module)
2014-06-26 13:53:14 -07:00
David Glasser
c6a94b7f19 new dev bundle
Changes:

- Drop keypress; it hasn't been used since we rewrote prompts to use
  built-in readline

- Use a slightly newer version of npm, to avoid strange thing where it
  creates ~/tmp

- Drop node-aes-gcm and bcrypt: we now can support cross-platform
  package deploys directly!  (A follow-up commit will add them
  to the corresponding packages.)

- Drop heapdump: it was only there for convenience, and now can also be
  added via a package

- upddate some comments
2014-06-26 13:53:13 -07:00
Emily Stark
1180597f06 bump dev bundle; upgrade node 2014-06-16 18:17:21 -07:00
Torgny Bjers
816641caad Adding = to long options for MongoDB compilation
References meteor/meteor#2163
2014-05-22 15:57:54 -07:00
Felix Rabe
3431c66c16 Fix occurrences of "cd dirname $0"
They are not safe for spaces in paths. There might be other places to look for trouble.

I've run the following command to produce this commit: (on OS X, copy-and-pasting the below exactly)

    find . -type f -name '*.sh' -print0  |  # Find all .sh files
        xargs -0 fgrep -H -- '`'         |  # See all places with backticks in them
        fgrep 'cd `dirname $0'           |  # I deemed these problematic (variable assignments are safe)
        cut -d ':' -f 1                  |  # Take the <file> from <file>:<line> produced by "grep -H"
        tr '\n' '\0'                     |  # Also here, spaces can be problematic - always do "xargs -0"!
        xargs -0 -- sed -i '' 's/cd `dirname $0`/cd "`dirname "$0"`"/g'

The significance of adding the two levels of "'s can be verified by running the following in your Terminal:

    $ node -e 'console.log(process.argv.splice(1))' -- `echo 1   2`
    [ '1', '2' ]

    $ node -e 'console.log(process.argv.splice(1))' -- "`echo 1   2`"
    [ '1 2' ]

    $ node -e 'console.log(process.argv.splice(1))' -- "`echo "1   2"`"
    [ '1   2' ]
2014-05-07 17:51:09 -07:00
David Glasser
f2e2a781cc Update Node to 0.10.28 which includes our npm fix 2014-05-02 10:59:37 -07:00
David Glasser
000c71ec30 A better version of our patch
However, the better version involves taking some changes from a version
of npm not yet released with Node.
2014-04-30 18:03:53 -07:00
David Glasser
94074c0dcd new dev bundle: with npm/npm#5137
We should be able to remove our "npm install --force" workaround after
this.
2014-04-30 18:03:53 -07:00
Nick Martin
714e513b99 Upgrade Node.js from 0.10.25 to 0.10.26 2014-04-07 22:56:41 -07:00
Nick Martin
4a1a6816d3 Bump openssl version used for mongo. Add node-aes-gcm.
The previous version of openssl (1.0.1f) was vulnerable to the 'heartbleed'
attack, though Meteor did not use this version in a way that opened
it to attack. The build of openssl here is used only for mongod, not
node, and was used only as a client, not a server. But lets upgrade anyway.
2014-04-07 22:50:43 -07:00
David Glasser
0791b31b30 dev bundle: fork node-http-proxy to fix #1871 2014-03-03 23:15:41 -08:00
David Glasser
28227b783c new dev bundle, fixing an eachline bug 2014-02-13 18:48:07 -08:00
David Glasser
d54aae78f8 new dev bundle (0.3.31) with newer source-map
Fixes #1782.

This dev bundle also drops optimist from the dev bundle (previously
committed, not built until now).
2014-02-11 16:16:36 -08:00
David Glasser
153d84cb9f Drop optimist from the dev bundle
The tool no longer uses it.  Simplify webapp_server to do a dumb check
for a flag instead of using optimist.

ctl-helper still uses optimist; ideally it should use our parser from
main.js instead.

Also, remove a debugging "|| true" that was causing "LISTENING" to be
output even without --keepalive.

I am not actually planning to rebuild the dev bundle just to drop
optimist.
2014-02-07 18:26:29 -08:00
Naomi Seyfer
b32e1d3c78 Update dev bundle to include heapdump, 0.3.30 2014-02-03 17:41:02 -08:00
David Glasser
604cd853f3 Update http-proxy to 1.0.2 from our fork of 1.0.1
Only real change is changing a bad console.log into invoking our error
handler, which we need for not printing too much junk in the runner
  https://github.com/nodejitsu/node-http-proxy/commit/daad4703
2014-01-28 11:57:36 -08:00
David Glasser
291c2ecad7 Upgrade kexec, drop shell-quote
We only used shell-quote to workaround kexec's lack of a feature added
in this version.
2014-01-27 09:52:50 -08:00
David Glasser
d4e0cff766 Use a fork of http-proxy with two PRs 2014-01-23 12:23:16 -08:00
David Glasser
a7d10d650d Update Node to 0.10.25. Remove bug workaround. 2014-01-23 12:15:29 -08:00
David Glasser
4f34ac0d6e Various dev bundle upgrades
* http-proxy: 1.0.1 (from a pre-release fork of 1.0)
* Node: 0.10.24 (from 0.10.22)
* semver: 2.2.1 (from 2.1.0)
* request: 2.33.0 (from 2.27.0)
* fstream: 0.1.25 (from 0.1.24)
* tar: 0.1.19 (from 0.1.18)
* eachline: 2.4.0 (from 2.3.3)
* source-map: 0.1.31 (from 0.1.30)
* source-map-support: 0.2.5 (from 0.2.3)
* mongo: 2.4.9 (from 2.4.8)
* openssl in mongo: 1.0.1f (from 1.0.1e)

Have not yet updated the various minimum Node version requirements.
2014-01-23 12:09:40 -08:00
Nick Martin
24a80d49b1 Preemptively add bcrypt to the dev bundle. We think we may want it soon. 2013-12-10 15:36:46 -08:00
Nick Martin
1b08ac2d9d Upgrade to stock Node 0.10.22.
This discards our fix for stream pausing. We'll monkey patch it in
at startup instead of relying on a custom build.
2013-12-10 15:27:40 -08:00
Nick Martin
db624dd162 New dev bundle: mongo with startup speed boost.
Also upgrade to 2.4.8 while we're at it.

(In the meteor/mongo repository, we've created an ssl-2.4.8 branch, and
also added a backported-from-Mongo-2.5 change to poll the repl set
config more often on startup.)
2013-12-10 12:45:53 -08:00
David Glasser
cd873c0e47 Drop handlebars from the dev bundle. 2013-12-02 17:15:37 -08:00
David Glasser
088b6d37ac Build a fork of Node. 2013-11-13 01:08:49 -08:00
Nick Martin
f4e21c0d37 Bump node version from 0.10.20 to 0.10.21 for Meteor 0.6.6.2 release. 2013-10-20 22:02:25 -07:00