decouple sourceMapIn from sourceMap.url

fixes #487

Author: alexlamsl

Gruntfile.js

@@ -256,6 +256,20 @@ module.exports = function(grunt) {
           }
         }
       },
+      sourcemapin_customUrl: {
+        files: {
+          'tmp/sourcemapin_customUrl.js': ['test/fixtures/src/simple2.js']
+        },
+        options: {
+          sourceMap: {
+            includeSources: true,
+            url: 'sourcemapin_customUrl.js.map'
+          },
+          sourceMapIn: function() {
+            return 'test/fixtures/src/simple2.map';
+          }
+        }
+      },
       expression_json: {
         files: {
           'tmp/expression.json': ['test/fixtures/src/simple.json']

tasks/uglify.js

@@ -118,18 +118,18 @@ module.exports = function(grunt) {
         }
       }
 
-      if (options.sourceMap && generateSourceMapURL) {
+      if (options.sourceMap) {
         if (typeof options.sourceMap !== 'object') {
           options.sourceMap = {};
         }
-        if (generateSourceMapFilename) {
-          options.sourceMap.filename = path.basename(f.dest);
-        }
         if (options.sourceMapIn) {
           options.sourceMap.content = grunt.file.read(options.sourceMapIn);
         }
         // Calculate the path from the dest file to the sourcemap for sourceMap.url
         if (generateSourceMapURL) {
+          if (generateSourceMapFilename) {
+            options.sourceMap.filename = path.basename(f.dest);
+          }
           var destToSourceMapPath = relativePath(f.dest, options.generatedSourceMapName);
           var sourceMapBasename = path.basename(options.generatedSourceMapName);
           options.sourceMap.url = uriPath(path.join(destToSourceMapPath, sourceMapBasename));

test/fixtures/expected/sourcemapin_customUrl.js

@@ -41,6 +41,8 @@ exports.contrib_uglify = {
       'sourcemapin.js',
       'sourcemapin.js.map',
       'sourcemap_sources.js.map',
+      'sourcemapin_customUrl.js',
+      'sourcemapin_customUrl.js.map',
       'sourcemapin_sources.js',
       'sourcemapin_sources.js.map',
       'sourcemaps_multiple1.js',