adjust paths for new tools layout

disable springboarding

meteor

@@ -97,15 +97,11 @@ if [ -d "$SCRIPT_DIR/.git" ] || [ -f "$SCRIPT_DIR/.git" ]; then
         echo "Your dependency kit is out of date. I will download the new one." >&2
         install_dev_bundle
     fi
-
-    DEV_BUNDLE="$SCRIPT_DIR/dev_bundle"
-    METEOR="$SCRIPT_DIR/tools/main.js"
-else
-    # In an install
-    DEV_BUNDLE=$(dirname "$SCRIPT_DIR")
-    METEOR="$DEV_BUNDLE/tools/main.js"
 fi
 
+DEV_BUNDLE="$SCRIPT_DIR/dev_bundle"
+METEOR="$SCRIPT_DIR/tools/main.js"
+
 
 # Bump our file descriptor ulimit as high as it will go. This is a
 # temporary workaround for dependancy watching holding open too many

tools/files.js

@@ -144,8 +144,11 @@ files.usesWarehouse = function () {
 // Read the '.tools_version.txt' file. If in a checkout, throw an error.
 files.getToolsVersion = function () {
   if (! files.inCheckout()) {
-    return fs.readFileSync(
-      path.join(files.getCurrentToolsDir(), '.tools_version.txt'), 'utf8');
+    var unipackageJson = fs.readFileSync(
+      path.join(files.getCurrentToolsDir(),
+                '..',  // get out of tool, back to package
+                'unipackage.json'));
+    return JSON.parse(unipackageJson).version;
   } else {
     throw new Error("Unexpected. Git checkouts don't have tools versions.");
   }
@@ -154,10 +157,7 @@ files.getToolsVersion = function () {
 // Return the root of dev_bundle (probably /usr/local/meteor in an
 // install, or (checkout root)/dev_bundle in a checkout.).
 files.getDevBundle = function () {
-  if (files.inCheckout())
-    return path.join(files.getCurrentToolsDir(), 'dev_bundle');
-  else
-    return files.getCurrentToolsDir();
+  return path.join(files.getCurrentToolsDir(), 'dev_bundle');
 };
 
 // Return the top-level directory for this meteor install or checkout

tools/main.js

@@ -295,6 +295,10 @@ var longHelp = function (commandName) {
 //   us to use when restarting (this functions exactly like --release
 //   and will cause release.forced to be true).
 var springboard = function (toolsVersion, releaseOverride) {
+  // The new way of building tools doesn't support springboarding yet.
+  console.log("SPRINGBOARDING DISABLED");
+  return;
+
   // Strip off the "node" and "meteor.js" from argv and replace it with the
   // appropriate tools's meteor shell script.
   var newArgv = process.argv.slice(2);

tools/unipackage.js

@@ -821,7 +821,6 @@ _.extend(Unipackage.prototype, {
       });
 
       if (self.includeTool) {
-        console.log(builder.buildPath)
         var toolsJson = self._writeTool(builder);
         mainJson.tools = toolsJson;
       }