Fixes #115 when this change is taken with the fix in #98.

Error if modules and name are used together.
requirejs · May 23, 2012 · af624b9 · af624b9
1 parent 6ddef04
commit af624b9
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/build/jslib/build.js b/build/jslib/build.js
@@ -792,6 +792,11 @@ function (lang,   logger,   file,          parse,    optimize,   pragma,
                             'should be a "dir" option set and "out" should ' +
                             'not be used since "out" is only for single file ' +
                             'optimization output.');
+        } else if (config.modules && config.name) {
+            throw new Error('"name" and "modules" options are incompatible. ' +
+                            'Either use "name" if doing a single file ' +
+                            'optimization, or "modules" if you want to target ' +
+                            'more than one file for optimization.');
         }
 
         if (config.out && !config.cssIn) {