Commit Graph

1264 Commits

Author SHA1 Message Date
Emily Stark
42ef8d3714 Minor build id cleanup 2014-03-31 22:14:21 -07:00
Emily Stark
3e60740952 Revert "Minor build id cleanup"
This reverts commit 877be7b33e.

Accidentally included a whole bunch of debugging stuff.
2014-03-31 22:12:27 -07:00
Emily Stark
877be7b33e Minor build id cleanup 2014-03-31 22:09:58 -07:00
Emily Stark
1989702e07 Separate bootstrapping from localPackageDirs in catalog initialization.
Previously, if localPackageDirs contained an app package that used a
troposphere package, the constraint solver would bomb out on that app
package. This commit separates out the checkout packages that we need for
bootstrapping catalog initialization from other local packages, which
are allowed to use troposphere packages.
2014-03-31 21:32:39 -07:00
Emily Stark
9c3d6e03f9 Fix mysterious inconsistency in PackageLoader.versions format.
Also fix some indentation.
2014-03-31 21:31:04 -07:00
Emily Stark
c375b58c6b Fix a PackageLoader argument 2014-03-31 21:28:32 -07:00
Emily Stark
419a343b81 Rename a variable.
serverPackageData -> allPackageData
2014-03-31 21:27:58 -07:00
Emily Stark
29d8883a35 Store build-time deps with package version.
Use the build-time deps determined at compile time in 'meteor
publish-for-arch'.
2014-03-31 20:12:09 -07:00
Emily Stark
b3a8944167 Merge branch 'library-refactor-buildids' into library-refactor 2014-03-31 09:09:43 -07:00
Emily Stark
2bab6940b0 Merge branch 'library-refactor-downloads' into library-refactor 2014-03-31 09:09:32 -07:00
Emily Stark
2ca550ae6e Fix incorrect PackageLoader constructor arguments 2014-03-30 21:55:52 -07:00
Emily Stark
e3b9c09319 Remove another XXX 2014-03-30 20:40:31 -07:00
Emily Stark
ae506b6707 Remove packageDirectoryForBuildInfo.
We used to keep the `packageDirectoryForBuildInfo` of every package that
a package directly depends on in its buildinfo.json; if direct
dependencies change, then we might need to rebuild because they could
have registered or unregistered a plugin. Now we just keep the package
name and version (including build for our local packages) of our direct
dependencies.
2014-03-30 20:40:31 -07:00
Emily Stark
62153ce0b0 Remove a couple completed XXXs 2014-03-30 20:39:39 -07:00
Emily Stark
1b66cf60d7 Use build-time deps in checkUpToDate 2014-03-30 20:39:39 -07:00
Emily Stark
af195e2f48 Store and read build-time deps in unipackage buildinfo.json 2014-03-30 20:39:39 -07:00
Emily Stark
9d174696e7 Remove outdated comment 2014-03-30 20:39:39 -07:00
Emily Stark
58e4a31df8 Fix WatchSet.merge to actually merge files.
Not sure why this was commented out?
2014-03-30 20:39:39 -07:00
Emily Stark
f55c501ae9 Fix checks before computing build id 2014-03-30 20:39:39 -07:00
Emily Stark
601393d90f Set officialBuild flags on 'publish' and 'publish-for-arch' 2014-03-30 20:39:39 -07:00
Emily Stark
8d0f57ef59 serverPackageData can be null 2014-03-30 20:39:39 -07:00
Emily Stark
077437bea6 Merge plugin/slice watch sets before including in build id 2014-03-30 20:39:39 -07:00
Emily Stark
9f3ff7da0f WIP: compute build ids and add to versions.
Utterly untested.
2014-03-30 20:39:38 -07:00
Emily Stark
8382013dd7 Allow circular deps when initializing catalog if already built.
Previously, we could only run any commands at all on this branch because
of a typo that was causing us to ignore all plugin dependencies when we
computed build-time dependencies (fixed in f94fd9d). This commit puts us
back in the state we thought we were in (things mostly work if you have
package builds cached from a different meteor branch).
2014-03-30 20:38:53 -07:00
Emily Stark
a6152c392c Fix typo in computing build-time plugin dependencies 2014-03-30 20:30:08 -07:00
ekatek
2a833a224d Revert "hax"
This reverts commit 5f4b44316d.
2014-03-30 00:54:50 -07:00
ekatek
5f4b44316d hax 2014-03-28 11:12:35 -07:00
Emily Stark
86835b521b Fix check for already-existing constraint 2014-03-27 22:53:43 -07:00
Emily Stark
bdc3257d6e Fix typos and undefined things 2014-03-27 22:48:30 -07:00
Emily Stark
9def0fafd7 Defer PackageSource import from project to avoid circular dep. 2014-03-27 22:16:07 -07:00
Emily Stark
7f814871d5 Make constraint solver accept multiple constraints per package 2014-03-27 14:23:23 -07:00
Emily Stark
d572363d62 WIP: include programs' deps in an app's direct dependencies 2014-03-27 13:48:18 -07:00
Emily Stark
e3f11c733a Download package builds when we write to versions file. 2014-03-26 21:37:13 -07:00
Emily Stark
55d8e03978 Save build to disk after building during publish 2014-03-26 15:06:14 -07:00
Emily Stark
06e4f062b9 Add ServiceConnection.apply 2014-03-26 14:43:17 -07:00
ekatek
f9357c0775 remove underscroe, better errors 2014-03-26 14:35:09 -07:00
Emily Stark
a9c47e4662 Make sure connection gets closed when loading remote package data 2014-03-25 11:14:12 -07:00
Emily Stark
2e0b54e038 Attempt to handle package server errors gracefully.
Still needs some more work and tests.
2014-03-25 10:59:51 -07:00
Emily Stark
074f140ca7 Fix some error handling and add XXX to do it better 2014-03-25 10:09:28 -07:00
Emily Stark
4368309b3f Factor out ServiceConnection 2014-03-25 10:04:42 -07:00
Emily Stark
3f6ee74abd Update uniload comments.
unipackage.load -> uniload.load
2014-03-25 09:57:43 -07:00
ekatek
8ad25b5a6f Adding templating 2014-03-24 22:34:51 -07:00
ekatek
d3f768717a updated troposphere schema 2014-03-24 14:56:38 -07:00
ekatek
0197ff0bfc documented the methods 2014-03-24 14:44:07 -07:00
ekatek
cdaa8aa230 merge 2014-03-21 15:30:53 -07:00
ekatek
6663528a34 Merge branch 'devel' into publish-packages
Conflicts:
	packages/underscore-tests/package.js
2014-03-21 15:26:06 -07:00
ekatek
518d5bf4a8 Merge branch 'publish-packages' of https://github.com/meteor/meteor into publish-packages 2014-03-21 15:19:47 -07:00
ekatek
5445276631 increasing timout makes tests pass, but it is iffy 2014-03-20 16:05:12 -07:00
ekatek
60ffe51f22 meteor --get-ready and some misc cleanup 2014-03-20 12:31:55 -07:00
Emily Stark
da7400aca5 Miscellaneous trivial cleanup.
Comment typos, duplicate require()'s, missing require(), missing
semicolon.
2014-03-20 12:29:16 -07:00