From 40df77249898e110bfb704c3e079730b46692801 Mon Sep 17 00:00:00 2001
From: Avital Oliver <avital@thewe.net>
Date: Wed, 20 Feb 2013 22:19:48 -0800
Subject: [PATCH] WIP: Leave placemark comments in code in preparation for
 engine version springboard

---
 lib/meteor.js    | 24 ++++++++++++++++++++++--
 lib/warehouse.js |  6 ++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/lib/meteor.js b/lib/meteor.js
index 5701d7e93e..36f7dfd4b8 100644
--- a/lib/meteor.js
+++ b/lib/meteor.js
@@ -139,6 +139,7 @@ Fiber(function () {
       }
 
       var app_dir = path.resolve(requireDirInApp("run"));
+      // xcxc springboard
       var bundle_opts = { noMinify: !new_argv.production, nodeModulesMode: 'symlink' };
       runner.run(app_dir, bundle_opts, new_argv.port, new_argv.once, new_argv.settings);
     }
@@ -179,6 +180,8 @@ Fiber(function () {
       var packages = require(path.join(__dirname, 'packages.js'));
       var releaseVersion = new_argv['release'];
 
+      // xcxc springboard release
+
       var testPackages;
       if (new_argv["package-dir"]) {
         var packageDir = path.resolve(new_argv["package-dir"], "."); // strips trailing path.sep
@@ -206,7 +209,8 @@ Fiber(function () {
       var bundleOptions = {
         nodeModulesMode: new_argv.deploy ? 'skip' : 'symlink',
         testPackages: testPackages,
-        versionOverride: releaseVersion
+        versionOverride: releaseVersion,
+        noMinify: true
       };
       app_dir = path.join(__dirname, 'test-runner-app');
 
@@ -252,6 +256,8 @@ Fiber(function () {
                 "You can pass --example to start off with a copy of one of the Meteor\n" +
                 "sample applications. Use --list to see the available examples.");
 
+      // xcxc springboard to latest
+
       var new_argv = opt.argv;
       var appname;
 
@@ -368,6 +374,7 @@ Fiber(function () {
       var app_dir = requireDirInApp('add');
       var packages = require(path.join(__dirname, 'packages.js'));
       var project = require(path.join(__dirname, 'project.js'));
+      // xcxc springboard
       var releaseManifest = warehouse.releaseManifestForApp(app_dir);
       var all = packages.list(releaseManifest);
       var using = {};
@@ -404,6 +411,8 @@ Fiber(function () {
       }
 
       var app_dir = requireDirInApp('remove');
+      // xcxc springboard
+
       var packages = require(path.join(__dirname, 'packages.js'));
       var project = require(path.join(__dirname, 'project.js'));
       var using = {};
@@ -439,6 +448,7 @@ Fiber(function () {
 
       if (argv.using) {
         var app_dir = requireDirInApp('list --using');
+        // xcxc springboard
         var using = require(path.join(__dirname, 'project.js')).get_packages(app_dir);
 
         if (using.length) {
@@ -456,6 +466,7 @@ Fiber(function () {
         return;
       } else {
         var app_dir = requireDirInApp('list');
+        // xcxc springboard
       }
 
       var packages = require(path.join(__dirname, 'packages.js'));
@@ -498,6 +509,8 @@ Fiber(function () {
       // machines, but worth it for humans)
 
       var app_dir = path.resolve(requireDirInApp("bundle"));
+      // xcxc springboard
+
       var build_dir = path.join(app_dir, '.meteor', 'local', 'build_tar');
       var bundle_path = path.join(build_dir, 'bundle');
       var output_path = path.resolve(argv._[0]); // get absolute path
@@ -559,6 +572,9 @@ Fiber(function () {
         process.exit(1);
       }
 
+      // xcxc this should springboard but we never require being in an
+      // app... (and that's correct?)
+
       var new_argv = opt.argv;
 
       if (new_argv._.length === 1) {
@@ -643,6 +659,8 @@ Fiber(function () {
         process.exit(1);
       }
 
+      // xcxc same, should springboard but can be run outside an app
+
       if (new_argv.delete) {
         deploy.delete_app(new_argv._[1]);
       } else {
@@ -668,6 +686,8 @@ Fiber(function () {
         process.exit(1);
       }
 
+      // xcxc same, should springboard but can be run outside an app
+
       deploy.logs(argv._[0]);
     }
   });
@@ -691,6 +711,7 @@ Fiber(function () {
       }
 
       var app_dir = path.resolve(requireDirInApp("reset"));
+      // xcxc springboard
 
       find_mongo_port("reset", function (mongod_port) {
         if (mongod_port) {
@@ -735,7 +756,6 @@ Fiber(function () {
       // different in this case?
       if (releaseVersion())
         process.stdout.write("Meteor release " + releaseVersion() + "\n");
-      process.stdout.write("Engine version " + updater.ENGINE_VERSION);
 
       if (files.in_checkout())
         process.stdout.write(" (git checkout)");
diff --git a/lib/warehouse.js b/lib/warehouse.js
index ee284f1d91..490742a77e 100644
--- a/lib/warehouse.js
+++ b/lib/warehouse.js
@@ -128,6 +128,12 @@ var warehouse = module.exports = {
       process.exit(1);
     }
 
+    // xcxc ENGINEVERSION needs to be stamped by build-engine-tarballs.sh
+    if (releaseManifest.engine !== ENGINEVERSION/*xcxc*/) {
+      // xcxc write engine, only for this arch
+      // xcxc re-run command
+    }
+
     // populate warehouse with missing packages
     try {
       var missingPackages = {};