Make sure there are no requirejs build artifacts, and show an example…

… that turns off closure minification.

util/build.js

@@ -48,12 +48,14 @@ load('util/requirejs/build/jslib/fileUtil.js');
             buildDoc: 'Builds a version of XUI. Example commands:\n' +
                       '\t\tThis build uses the build profile util/profiles/enchilada.js\n' +
                       '\t\t> build.sh build profile=enchilda\n\n' +
+                      '\t\tThis build uses a profile with Closure minification off\n' +
+                      '\t\t> build.sh build profile=enchilda optimize=none\n\n' +
                       '\t\tThis build defines a name for the build file and what files to include\n' +
                       '\t\t> build.sh build out=lib/xui-basedom.js include=base,core/dom',
             build: function (args) {
                 //See if there is a profile arg, and if so get it and remove
                 //the option from the other build options.
-                var profile, hasBaseUrl = false, i, arg;
+                var profile, hasBaseUrl = false, hasSkipModuleInsertion = false, i, arg;
                 //Go backwards because when the slice happens do not want to
                 //mess up traversing the options.
                 for (i = args.length - 1; i > -1 && (arg = args[i]); i--) {
@@ -62,6 +64,8 @@ load('util/requirejs/build/jslib/fileUtil.js');
                         args.splice(i, 1);
                     } else if (arg.indexOf("baseUrl=") === 0) {
                         hasBaseUrl = true;
+                    } else if (arg.indexOf("skipModuleInsertion=") === 0) {
+                        hasSkipModuleInsertion = true;
                     }
                 }
 
@@ -73,7 +77,15 @@ load('util/requirejs/build/jslib/fileUtil.js');
                 args.unshift('util/requirejs/build');
 
                 //If no baseUrl, add it on now.
-                args.push('baseUrl=src/');
+                if (!hasBaseUrl) {
+                    args.push('baseUrl=src/');
+                }
+
+                //Do not want requirejs to insert placeholder modules for ones
+                //that do not use require syntax
+                if (!hasSkipModuleInsertion) {
+                    args.push('skipModuleInsertion=true');
+                }
 
                 //Call RequireJS build
                 build(args);

util/requirejs/build/jslib/build.js

@@ -387,7 +387,7 @@ var build;
         }
         if (includeRequire) {
             requireContents = pragma.process(config.requireUrl, fileUtil.readFile(config.requireUrl), context.config);
-            if (require.buildFilePaths.length) {
+            if (require.buildFilePaths.length && !config.skipModuleInsertion) {
                 requireContents += "require.pause();\n";
             }
             buildFileContents += "require.js\n";
@@ -434,7 +434,7 @@ var build;
             //If this is the first file, and require() is not part of the file
             //and require() is not added later at the end to the top of the file,
             //need to start off with a require.pause() call.
-            if (i === 0 && require.existingRequireUrl !== path && !includeRequire) {
+            if (i === 0 && require.existingRequireUrl !== path && !includeRequire && !config.skipModuleInsertion) {
                 fileContents += "require.pause()\n";
             }
 
@@ -446,7 +446,7 @@ var build;
             //after the module is processed.
             placeHolderModName = require.buildFileToModule[path];
             //If we have a name, but no defined module, then add in the placeholder.
-            if (placeHolderModName && !require.modulesWithNames[placeHolderModName]) {
+            if (placeHolderModName && !require.modulesWithNames[placeHolderModName] && !config.skipModuleInsertion) {
                 fileContents += 'require.def("' + placeHolderModName + '", function(){});\n';
             }
 
@@ -457,19 +457,21 @@ var build;
                 fileContents += pluginContents;
                 buildFileContents += pluginBuildFileContents;
                 pluginContents = "";
-                fileContents += "require.pause();\n";
+                if (!config.skipModuleInsertion) {
+                    fileContents += "require.pause();\n";
+                }
             }
 
             //If the file contents had a require.resume() we need to now pause
             //dependency resolution for the rest of the files. Multiple require.pause()
             //calls are OK.
-            if (needPause) {
+            if (needPause && !config.skipModuleInsertion) {
                 fileContents += "require.pause();\n";
             }
         }
 
         //Resume dependency resolution
-        if (require.buildFilePaths.length) {
+        if (require.buildFilePaths.length && !config.skipModuleInsertion) {
             fileContents += "\nrequire.resume();\n";
         }