Relates to #397, source map generation for bundled files

.gitignore

@@ -65,6 +65,7 @@ build/tests/lib/removeCombined/baseUrl-built
 build/tests/lib/requireHoist/perLayer/built
 build/tests/lib/rhino-186/built
 build/tests/lib/shimFakeDefine/main-built.js
+build/tests/lib/sourcemap/www-built
 build/tests/lib/stubModules/main-built.js
 build/tests/lib/stubModules/perModule/built
 build/tests/lib/transportBeforeMinify/www-built

build/jslib/build.js

@@ -1637,7 +1637,7 @@ define(function (require) {
                         //Add to the source map
                         if (sourceMapGenerator) {
                             if (module._buildPath === path) {
-                                sourceMapSrcSuffix = '.srcmap.js';
+                                sourceMapSrcSuffix = '.src.js';
                                 sourceMapPath = path.split('/').pop() + sourceMapSrcSuffix;
                             } else {
                                 sourceMapPath = build.makeRelativeFilePath(module._buildPath, path);

build/tests/builds.js

@@ -1835,4 +1835,29 @@ define(['build', 'env!env/file'], function (build, file) {
         ]
     );
     doh.run();
+
+    //Test source map generation for a bundled file,
+    //see https://github.com/jrburke/r.js/issues/397
+    doh.register("sourcemap",
+        [
+            function sourcemap(t) {
+                file.deleteFile("lib/sourcemap/www-built");
+
+                build(["lib/sourcemap/build.js"]);
+
+                t.is(nol(c("lib/sourcemap/expected/main.js")),
+                     nol(c("lib/sourcemap/www-built/js/main.js")));
+
+                t.is(nol(c("lib/sourcemap/expected/main.js.map")),
+                     nol(c("lib/sourcemap/www-built/js/main.js.map")));
+
+                t.is(nol(c("lib/sourcemap/expected/main.js.src.js")),
+                     nol(c("lib/sourcemap/www-built/js/main.js.src.js")));
+
+                require._buildReset();
+            }
+
+        ]
+    );
+    doh.run();
 });

build/tests/lib/sourcemap/expected/main.js.src.js

@@ -0,0 +1,7 @@
+/**
+ * A test of source maps on a concatenated, but not minified file.
+ */
+require(['a', 'b'], function (a, b) {
+    console.log('a name: ' + a.name);
+    console.log('b name: ' + b.name);
+});