Fixes requirejs#95, allows name= on command line if appDir/baseUrl are in play.

jrburke · jrburke · commit 740d53939587 · 2012-02-12T21:57:25.000-08:00
diff --git a/build/jslib/build.js b/build/jslib/build.js
@@ -723,10 +723,11 @@ function (lang,   logger,   file,          parse,    optimize,   pragma,
                             ' or baseUrl directories optimized.');
         }
 
-        if (config.out && !config.cssIn) {
-            //Just one file to optimize.
-
-            //Set up dummy module layer to build.
+        if (config.name && !config.modules) {
+            //Just need to build one file, but may be part of a whole appDir/
+            //baseUrl copy, but specified on the command line, so cannot do
+            //the modules array setup. So create a modules section in that
+            //case.
             config.modules = [
                 {
                     name: config.name,
@@ -736,6 +737,10 @@ function (lang,   logger,   file,          parse,    optimize,   pragma,
                     excludeShallow: config.excludeShallow
                 }
             ];
+        }
+
+        if (config.out && !config.cssIn) {
+            //Just one file to optimize.
 
             //Does not have a build file, so set up some defaults.
             //Optimizing CSS should not be allowed, unless explicitly
diff --git a/build/tests/builds.js b/build/tests/builds.js
@@ -143,6 +143,30 @@ define(['build', 'env!env/file'], function (build, file) {
     );
     doh.run();
 
+
+    doh.register("buildSimpleCommandLineName",
+        [
+            function buildSimpleCommandLineName(t) {
+                //Do the build
+                build([
+                    "baseUrl=../../../requirejs/tests",
+                    "optimize=none",
+                    "dir=builds/simpleCommandLineName",
+                    "name=one",
+                    "include=dimple"
+                ]);
+
+                t.is(nol(oneResult), nol(c("builds/simpleCommandLineName/one.js")));
+
+                //Reset require internal state for the contexts so future
+                //builds in these tests will work correctly.
+                require._buildReset();
+            }
+        ]
+    );
+    doh.run();
+
+
     doh.register("buildExcludeShallow",
         [
             function buildExcludeShallow(t) {
