Browse Source

Fix iterating

pull/1785/head
jlukic 9 years ago
parent
commit
a70ce06f4a
2 changed files with 10 additions and 7 deletions
  1. 15
      tasks/config/project/config.js
  2. 2
      tasks/config/user.js

15
tasks/config/project/config.js

@ -57,23 +57,26 @@ module.exports = {
var
configPath = this.getPath(),
path,
folder
;
console.log('start extend' , defaults.paths.source);
console.log('start extend' , defaults.paths);
// full path is (config location + base + path)
// resolve source paths
for(folder in config.paths.source) {
if(config.paths.source[folder]) {
if(config.paths.source.hasOwnProperty(folder)) {
// full path is (config location + base + path)
config.paths.source[folder] = path.resolve(path.join(configPath, config.base, config.paths.source[folder]));
}
}
// resolve output paths
for(folder in config.paths.output) {
if(config.paths.output[folder]) {
if(config.paths.output.hasOwnProperty(folder)) {
// full path is (config location + base + path)
config.paths.output[folder] = path.resolve(path.join(configPath, config.base, config.paths.output[folder]));
}
}
console.log('end extend' , defaults.paths.source);
console.log('end extend' , defaults.paths);
// resolve "clean" command path
config.paths.clean = path.resolve( path.join(configPath, config.base, config.paths.clean) );

2
tasks/config/user.js

@ -35,7 +35,7 @@ catch(error) {
if(!userConfig) {
// No semantic.json file use tasks/config/defaults.js
console.error('Using default values for gulp');
userConfig = defaults;
//userConfig = defaults;
}
else {
// extend defaults using shallow copy

Loading…
Cancel
Save