Fixes requirejs#56, a built layer's output could be picked up as part of another layer if the first layer is a dependency of the second one.

jrburke · jrburke · commit 6486a152a36e · 2011-12-22T21:29:58.000-08:00
diff --git a/build/jslib/build.js b/build/jslib/build.js
@@ -312,9 +312,22 @@ function (lang,   logger,   file,          parse,    optimize,   pragma,
 
                 //Flatten them and collect the build output for each module.
                 builtModule = build.flattenModule(module, module.layer, config);
-                file.saveUtf8File(module._buildPath, builtModule.text);
+
+                //Save it to a temp file for now, in case there are other layers that
+                //contain optimized content that should not be included in later
+                //layer optimizations. See issue #56.
+                file.saveUtf8File(module._buildPath + '-temp', builtModule.text);
                 buildFileContents += builtModule.buildText;
             });
+
+            //Now move the build layers to their final position.
+            modules.forEach(function (module) {
+                var finalPath = module._buildPath;
+                if (file.exists(finalPath)) {
+                    file.deleteFile(finalPath);
+                }
+                file.renameFile(finalPath + '-temp', finalPath);
+            });
         }
 
         //Do other optimizations.
diff --git a/build/jslib/node/file.js b/build/jslib/node/file.js
@@ -32,7 +32,7 @@ define(['fs', 'path'], function (fs, path) {
 
     function mkDir(dir) {
         if (!exists(dir)) {
-            fs.mkdirSync(dir, 0777);
+            fs.mkdirSync(dir, 511);
         }
     }
 
@@ -193,6 +193,13 @@ define(['fs', 'path'], function (fs, path) {
             return true; //Boolean
         },
 
+        /**
+         * Renames a file. May fail if "to" already exists or is on another drive.
+         */
+        renameFile: function (from, to) {
+            return fs.renameSync(from, to);
+        },
+
         /**
          * Reads a *text* file.
          */
diff --git a/build/jslib/rhino/file.js b/build/jslib/rhino/file.js
@@ -162,6 +162,13 @@ define(function () {
             return true; //Boolean
         },
 
+        /**
+         * Renames a file. May fail if "to" already exists or is on another drive.
+         */
+        renameFile: function (from, to) {
+            return (new java.io.File(from)).renameTo((new java.io.File(to)));
+        },
+
         readFile: function (/*String*/path, /*String?*/encoding) {
             //A file read function that can deal with BOMs
             encoding = encoding || "utf-8";
