Hide self-referential symlinks behind a flag in pub.

utils/pub/entrypoint.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #library('entrypoint');
 
 #import('io.dart');
 #import('lock_file.dart');
 #import('package.dart');
 #import('root_source.dart');
@@ skipping 13 matching lines @@
  * point either to the [SystemCache] or to some other location on the local
  * filesystem.
  *
  * While entrypoints are typically applications, a pure library package may end
  * up being used as an entrypoint. Also, a single package may be used as an
  * entrypoint in one context but not in another. For example, a package that
  * contains a reusable library may not be the entrypoint when used by an app,
  * but may be the entrypoint when you're running its tests.
  */
 class Entrypoint {
+  // TODO(rnystrom): Get rid of this when #4820 is fixed.
+  static bool installSelfLink = false;
+
   /**
    * The root package this entrypoint is associated with.
    */
   final Package root;
 
   /**
    * The system-wide cache which caches packages that need to be fetched over
    * the network.
    */
   final SystemCache cache;
@@ skipping 172 matching lines @@
     return writeTextFile(join(root.dir, 'pubspec.lock'), lockFile.serialize());
   }
 
   /**
    * Installs a self-referential symlink in the `packages` directory that will
    * allow a package to import its own files using `package:`.
    */
   Future _installSelfReference(_) {
     var linkPath = join(path, root.name);
     return exists(linkPath).chain((exists) {
-      if (exists) return new Future.immediate(null);
-      return ensureDir(path).chain((_) => createSymlink(root.dir, linkPath));
+      if (installSelfLink) {
+        // Create the symlink if it doesn't exist.
+        if (exists) return new Future.immediate(null);
+        return ensureDir(path).chain((_) => createSymlink(root.dir, linkPath));
+      } else {
+        // TODO(rnystrom): Get rid of this branch when #4820 is fixed.
+        // Delete the old one if it's there.
+        return ensureDir(path).chain((_) {
+          if (!exists) return new Future.immediate(null);
+          return deleteDir(linkPath);
+        });
+      }
     });
   }
 
   /**
    * If `bin/`, `test/`, or `example/` directories exist, symlink `packages/`
    * into them so that their entrypoints can be run. Do the same for any
    * subdirectories of `test/` and `example/`.
    */
   Future _linkSecondaryPackageDirs(_) {
     var binDir = join(root.dir, 'bin');
@@ skipping 72 matching lines @@
       });
     }
 
     return future.transform((_) {
       if (root.pubspec.name != null) return;
       throw '"pubspec.yaml" is missing the required "name" field (e.g. "name: '
         '${root.name}").';
     });
   }
 }