Skip to content
Browse files

Merge pull request #79 from derek/buildcopy-fix

Fix to obey --build-dir when copying files
  • Loading branch information...
2 parents dd997ee + 14d6d91 commit dda1a7735ef82237bbfe2aea9fad2c0934da0dfd @reid reid committed May 8, 2013
Showing with 4 additions and 3 deletions.
  1. +1 −1 lib/module.js
  2. +2 −1 tests/3-copy.js
  3. +1 −1 tests/assets/yql/src/uploader/build.json
View
2 lib/module.js
@@ -582,7 +582,7 @@ var buildCopy = function (mod, name, callback) {
mod.copy.forEach(function (value, key) {
mod.copy[key] = [
path.join(shifter.cwd(), value[0]),
- path.join(shifter.cwd(), value[1])
+ path.join(mod.buildDir, name, value[1])
];
});
View
3 tests/3-copy.js
@@ -31,7 +31,8 @@ var tests = {
'should copy': {
topic: function() {
shifter.add({
- cwd: srcBase
+ cwd: srcBase,
+ 'global-config': false
}, this.callback);
},
'should create out/1 and': {
View
2 tests/assets/yql/src/uploader/build.json
@@ -7,7 +7,7 @@
"builds": {
"uploader": {
"copy": [
- [ "swf/flashuploader.swf", "../../../../assets-global/uploader/assets/flashuploader.swf" ]
+ [ "swf/flashuploader.swf", "assets/flashuploader.swf" ]
],
"jsfiles": [
"uploader.js"

0 comments on commit dda1a77

Please sign in to comment.
Something went wrong with that request. Please try again.