Merge branch 'follower-check-release' into follower

tools/bundler.js

@@ -27,6 +27,9 @@
 //    - path: path (relative to star.json) to the control file (eg,
 //      program.json) for this plugin
 //
+// - meteorRelease: the value used in Meteor.release for programs inside the
+//     star, or "none"
+//
 // /README: human readable instructions
 //
 // /main.js: script that can be run in node.js to start the site
@@ -1367,6 +1370,7 @@ var writeFile = function (file, builder) {
 // - nodeModulesMode: "skip", "symlink", "copy"
 // - builtBy: vanity identification string to write into metadata
 // - controlProgram: name of the control program (should be a target name)
+// - releaseStamp: The Meteor release version
 var writeSiteArchive = function (targets, outputPath, options) {
   var builder = new Builder({
     outputPath: outputPath,
@@ -1382,7 +1386,8 @@ var writeSiteArchive = function (targets, outputPath, options) {
       format: "site-archive-pre1",
       builtBy: options.builtBy,
       programs: [],
-      control: options.controlProgram || undefined
+      control: options.controlProgram || undefined,
+      meteorRelease: options.releaseStamp
     };
 
     // Pick a path in the bundle for each target
@@ -1776,7 +1781,8 @@ exports.bundle = function (appDir, outputPath, options) {
     starResult = writeSiteArchive(targets, outputPath, {
       nodeModulesMode: options.nodeModulesMode,
       builtBy: builtBy,
-      controlProgram: controlProgram
+      controlProgram: controlProgram,
+      releaseStamp: options.releaseStamp
     });
     watchSet.merge(starResult.watchSet);