diff --git a/grunt/config/compress.js b/grunt/config/compress.js index eb7db650..ab994db8 100644 --- a/grunt/config/compress.js +++ b/grunt/config/compress.js @@ -1,7 +1,8 @@ var standaloneLibDir = "lib/jasmine-" + jasmineVersion; function root(path) { return "./" + path; } -function lib(path) { return root("lib/jasmine-core/" + path); } +function libJasmineCore(path) { return root("lib/jasmine-core/" + path); } +function libConsole() { return "lib/console/" } function dist(path) { return root("dist/" + path); } module.exports = { @@ -26,13 +27,21 @@ module.exports = { ], dest: standaloneLibDir, expand: true, - cwd: lib("") + cwd: libJasmineCore("") + }, + { + src: [ + "console.js" + ], + dest: standaloneLibDir, + expand: true, + cwd: libConsole() }, { src: [ "boot.js" ], dest: standaloneLibDir, expand: true, - cwd: lib("boot") + cwd: libJasmineCore("boot") }, { src: [ "SpecRunner.html" ], @@ -44,13 +53,13 @@ module.exports = { src: [ "*.js" ], dest: "src", expand: true, - cwd: lib("example/src/") + cwd: libJasmineCore("example/src/") }, { src: [ "*.js" ], dest: "spec", expand: true, - cwd: lib("example/spec/") + cwd: libJasmineCore("example/spec/") } ] } diff --git a/grunt/config/concat.js b/grunt/config/concat.js index 78e14693..39770473 100644 --- a/grunt/config/concat.js +++ b/grunt/config/concat.js @@ -44,7 +44,7 @@ module.exports = { 'src/console/requireConsole.js', 'src/console/ConsoleReporter.js' ], - dest: 'src/console/console.js' + dest: 'lib/console/console.js' }, options: { banner: license(), diff --git a/src/console/console.js b/lib/console/console.js similarity index 100% rename from src/console/console.js rename to lib/console/console.js diff --git a/spec/node_suite.js b/spec/node_suite.js index cf13f14f..e2d3eeae 100644 --- a/spec/node_suite.js +++ b/spec/node_suite.js @@ -6,7 +6,7 @@ var path = require('path'); var jasmineRequire = require('../lib/jasmine-core/jasmine.js'); var jasmine = jasmineRequire.core(jasmineRequire); -var consoleFns = require('../src/console/console.js'); +var consoleFns = require('../lib/console/console.js'); extend(jasmineRequire, consoleFns); jasmineRequire.console(jasmineRequire, jasmine);