.gitignore local.json.template @@ -67,7 +67,7 @@ exports.readPackages = function readPackages(packageDirectory, packagesData) { } if (!packageDirectory.join('package.json').isFile()) { - system.log.warn('No package.json in ' + packageDirectory); + //system.log.warn('No package.json in ' + packageDirectory); continue; } @@ -91,15 +91,22 @@ exports.readPackages = function readPackages(packageDirectory, packagesData) { packageDatum.directory = packageDirectory.join(''); /* enqueue sub packages */ - var packagesDirectory = packageDirectory.join(packageDatum.packages || 'packages'); - if (packagesDirectory.isDirectory()) { - packagesDirectory.list().forEach(function (packageName) { - var packageDirectory = packagesDirectory.join(packageName); - if (packageDirectory.isDirectory()) { - queue.push(packageDirectory); - } - }); - } + var packagesDirectories = packageDatum.packages; + if (typeof packagesDirectories == "string") + packagesDirectories = [packagesDirectories]; + if (packagesDirectories === undefined) + packagesDirectories = ["packages"]; + packagesDirectories.forEach(function (packagesDirectory) { + packagesDirectory = packageDirectory.join(packagesDirectory); + if (packagesDirectory.isDirectory()) { + packagesDirectory.list().forEach(function (packageName) { + var packageDirectory = packagesDirectory.join(packageName); + if (packageDirectory.isDirectory()) { + queue.push(packageDirectory); + } + }); + } + }); /* enqueue parent package root */ var parent = packageDirectory.join(packageDatum.parent || 'parent'); lib/packages.js packages/chiron packages/jack packages/nitro d7e8e1ed861bffd2252110517d6c18138aefd4b3 kriskowal kris.kowal@cixar.com http://github.com/tlrobinson/narwhal/commit/1bfa32ac3b4a56811f8fc123acaf816f18c867d4 1bfa32ac3b4a56811f8fc123acaf816f18c867d4 2009-05-04T17:31:38-07:00 2009-05-04T17:31:38-07:00 Added support for an array of sub-packages-directories, and a template for local.json that makes all Narwhal projects checked out in the narwhal parent directory load. f94727ab909b0ca31291ff037f84d1b9cfbcd1db kriskowal kris.kowal@cixar.com