From 9df2693744a69a3f239f21e4e6e94d643289cd94 Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Mon, 26 Jan 2015 17:17:59 -0800 Subject: [PATCH] Fixed file references to match moved files --- src/node/binding.gyp | 22 +++++++++++----------- src/node/index.js | 4 ++-- src/node/package.json | 2 +- src/node/test/client_server_test.js | 6 +++--- src/node/test/server_test.js | 2 +- src/node/test/surface_test.js | 4 ++-- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/node/binding.gyp b/src/node/binding.gyp index fe4b5da9c8f..cf2a6acb04f 100644 --- a/src/node/binding.gyp +++ b/src/node/binding.gyp @@ -28,17 +28,17 @@ }, "target_name": "grpc", "sources": [ - "byte_buffer.cc", - "call.cc", - "channel.cc", - "completion_queue_async_worker.cc", - "credentials.cc", - "event.cc", - "node_grpc.cc", - "server.cc", - "server_credentials.cc", - "tag.cc", - "timeval.cc" + "ext/byte_buffer.cc", + "ext/call.cc", + "ext/channel.cc", + "ext/completion_queue_async_worker.cc", + "ext/credentials.cc", + "ext/event.cc", + "ext/node_grpc.cc", + "ext/server.cc", + "ext/server_credentials.cc", + "ext/tag.cc", + "ext/timeval.cc" ], 'conditions' : [ ['no_install=="yes"', { diff --git a/src/node/index.js b/src/node/index.js index 751c3525d37..0627e7f5576 100644 --- a/src/node/index.js +++ b/src/node/index.js @@ -35,9 +35,9 @@ var _ = require('underscore'); var ProtoBuf = require('protobufjs'); -var surface_client = require('./surface_client.js'); +var surface_client = require('./src/surface_client.js'); -var surface_server = require('./surface_server.js'); +var surface_server = require('./src/surface_server.js'); var grpc = require('bindings')('grpc'); diff --git a/src/node/package.json b/src/node/package.json index 5f3c6fa3455..8a0b51dda8e 100644 --- a/src/node/package.json +++ b/src/node/package.json @@ -17,5 +17,5 @@ "mocha": "~1.21.0", "minimist": "^1.1.0" }, - "main": "main.js" + "main": "index.js" } diff --git a/src/node/test/client_server_test.js b/src/node/test/client_server_test.js index 11cc511dc94..d657ef41a46 100644 --- a/src/node/test/client_server_test.js +++ b/src/node/test/client_server_test.js @@ -35,9 +35,9 @@ var assert = require('assert'); var fs = require('fs'); var path = require('path'); var grpc = require('bindings')('grpc.node'); -var Server = require('../server'); -var client = require('../client'); -var common = require('../common'); +var Server = require('../src/server'); +var client = require('../src/client'); +var common = require('../src/common'); var _ = require('highland'); var ca_path = path.join(__dirname, 'data/ca.pem'); diff --git a/src/node/test/server_test.js b/src/node/test/server_test.js index d0ec1555c6d..5fad9a5564e 100644 --- a/src/node/test/server_test.js +++ b/src/node/test/server_test.js @@ -33,7 +33,7 @@ var assert = require('assert'); var grpc = require('bindings')('grpc.node'); -var Server = require('../server'); +var Server = require('../src/server'); /** * This is used for testing functions with multiple asynchronous calls that diff --git a/src/node/test/surface_test.js b/src/node/test/surface_test.js index 16e4869d83e..85f4841d4bc 100644 --- a/src/node/test/surface_test.js +++ b/src/node/test/surface_test.js @@ -33,9 +33,9 @@ var assert = require('assert'); -var surface_server = require('../surface_server.js'); +var surface_server = require('../src/surface_server.js'); -var surface_client = require('../surface_client.js'); +var surface_client = require('../src/surface_client.js'); var ProtoBuf = require('protobufjs');