udates to use npm instead of git submodules

prgsmall · Apr 18, 2012 · 98a0206 · 98a0206
1 parent 578ca97
commit 98a0206
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 29 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 datastore
 *.sublime*
 *.tmproj
+node_modules
diff --git a/.gitmodules b/.gitmodules
diff --git a/lib/acequia.js b/lib/acequia.js
@@ -31,7 +31,7 @@ require("./datastore").init(clients);
 var oscServer, wsServer, tcpServer, httpServer, clientCode = null;
 
 // Create a logger
-var logger = require('log4js-node').getLogger("acequia");
+var logger = require('log4js').getLogger("acequia");
 
 // Once we actually get our internal IP, we start the servers.
 function startServers() {
@@ -59,9 +59,12 @@ function startServers() {
         logger.debug("OSC Server is listening on [%s:%s]", oscServer.address().address, oscServer.address().port);
 
         if (!isWindows) {
+        	try {
             var mdns = require("mdns"),
             osc_ad = mdns.createAdvertisement(mdns.udp('acequia', 'osc'), oscServer.address().port, {name: "Acequia OSC Server"});
             osc_ad.start();
+            }catch(e){
+            }
         }
     });
 
@@ -176,9 +179,12 @@ function startServers() {
         logger.debug("TCP Server is listening on [%s:%s]", tcpServer.address().address, tcpServer.address().port);
 
         if (!isWindows) {
+        	try {
             var mdns = require("mdns");
             tcp_ad = mdns.createAdvertisement(mdns.tcp('acequia'), tcpServer.address().port, {name: "Acequia TCP Server"});
             tcp_ad.start();
+            }catch(e){
+            }
         }
     });
 

diff --git a/lib/client.js b/lib/client.js
@@ -16,7 +16,7 @@ var TYP_OSC = "OSC",
     TYP_WS = "WEBSOCKET",
     TYP_TCP = "TCP";
 
-var logger = require('log4js-node').getLogger("client");
+var logger = require('log4js').getLogger("client");
 
 var msgEmitter = new events.EventEmitter();
 msgEmitter.setMaxListeners(0);
@@ -434,4 +434,4 @@ exports.TYP_OSC = TYP_OSC;
 exports.TYP_TCP = TYP_TCP;
 exports.TYP_WS = TYP_WS;
 exports.AcequiaClients = AcequiaClients;
-exports.msgEmitter = msgEmitter;
+exports.msgEmitter = msgEmitter;
diff --git a/lib/osc.js b/lib/osc.js
@@ -1,6 +1,6 @@
 /*globals require exports */
 var Buffer = require('buffer').Buffer;
-var log4js = require('log4js-node');
+var log4js = require('log4js');
 
 var logger = log4js.getLogger("osc");
 
@@ -313,4 +313,4 @@ exports.jsonToOsc = function (jsonMessage) {
     }
 
     return new Osc(address, tt, data);
-};
+};
diff --git a/node_modules/log4js-node b/node_modules/log4js-node
diff --git a/node_modules/policyfile b/node_modules/policyfile
diff --git a/node_modules/socket.io b/node_modules/socket.io
diff --git a/node_modules/socket.io-client b/node_modules/socket.io-client
diff --git a/node_modules/uglify-js b/node_modules/uglify-js
diff --git a/package.json b/package.json
@@ -20,9 +20,9 @@
         "start": "node ." 
     },
     "dependencies" : {
-        "log4js" : ">0.4.1",
-        "socket-io": ">0.8.7",
-        "uglify-js": ">1.2.5",
-        "mdns": ">0.0.4"
+        "log4js" : ">=0.4.1",
+        "socket.io": ">=0.9.6",
+        "socket.io-client":">=0.9.6",
+        "uglify-js": ">=1.2.5"
     }
 }