service_packager now properly generates service and package files

pull/1574/head
murgatroid99 10 years ago
parent 43a75af0d0
commit f4b2832850
  1. 5
      src/node/cli/service_packager.js
  2. 3
      src/node/cli/service_packager/index.js
  3. 3
      src/node/cli/service_packager/package.json.template

@ -78,7 +78,9 @@ function copyFile(src_path, dest_path) {
function main(argv) { function main(argv) {
var args = parseArgs(argv, arg_format); var args = parseArgs(argv, arg_format);
var out_path = path.resolve(args.out); var out_path = path.resolve(args.out);
var include_dirs = _.map(path.resolve, args.include); var include_dirs = _.map(_.flatten([args.include]), function(p) {
return path.resolve(p);
});
args.grpc_version = package_json.version; args.grpc_version = package_json.version;
generatePackage(args, function(err, rendered) { generatePackage(args, function(err, rendered) {
if (err) throw err; if (err) throw err;
@ -97,6 +99,7 @@ function main(argv) {
'service.json')); 'service.json'));
var pbjs_args = _.flatten(['node', 'pbjs', var pbjs_args = _.flatten(['node', 'pbjs',
args._[0], args._[0],
'-legacy',
_.map(include_dirs, function(dir) { _.map(include_dirs, function(dir) {
return "-path=" + dir; return "-path=" + dir;
})]); })]);

@ -32,4 +32,5 @@
*/ */
var grpc = require('grpc'); var grpc = require('grpc');
module.exports = grpc.load(__dirname + '/service.json'); exports.client = grpc.load(__dirname + '/service.json', 'json');
exports.auth = require('google-auth-library');

@ -5,7 +5,8 @@
"description": "Client library for {{{name}}} built on gRPC", "description": "Client library for {{{name}}} built on gRPC",
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"grpc": "{{{grpc_version}}}" "grpc": "{{{grpc_version}}}",
"google-auth-library": "^0.9.2"
}, },
"main": "index.js", "main": "index.js",
"files": [ "files": [

Loading…
Cancel
Save