modify directory structure

puritys · May 22, 2015 · 04ab571 · 04ab571
1 parent 8880285
commit 04ab571
Show file tree

Hide file tree

Showing 89 changed files with 102 additions and 138 deletions.
diff --git a/binding.gyp b/binding.gyp
@@ -3,17 +3,17 @@
     {
       "target_name": "phplike",
       "sources": [ 
-          "system/exec/src/exec.cc",
-          "system/curl/src/util.cc",
-          "system/curl/src/phplikeCppCurl.cc",
-          "system/md5/src/md5.cc",
-          "system/basic/src/string.cc",
-          "system/xml/src/tinyxml2.cpp",
-          "system/socket/src/socket.cc",
-          "nodejs/phplikeSocket.cc",
-          "nodejs/phplikeXml.cc",
-          "nodejs/phplikeCurl.cc",
-          "nodejs/phplike.cc"
+          "src/cpp/exec/src/exec.cc",
+          "src/cpp/curl/src/util.cc",
+          "src/cpp/curl/src/phplikeCppCurl.cc",
+          "src/cpp/md5/src/md5.cc",
+          "src/cpp/basic/src/string.cc",
+          "src/cpp/xml/src/tinyxml2.cpp",
+          "src/cpp/socket/src/socket.cc",
+          "src/nodeExt/phplikeSocket.cc",
+          "src/nodeExt/phplikeXml.cc",
+          "src/nodeExt/phplikeCurl.cc",
+          "src/nodeExt/phplike.cc"
       ],
       "cflags_cc": ["-fexceptions"],
       "conditions": [
@@ -27,7 +27,8 @@
                 "LINUX_DEFINE", "OS_LINUX"
               ],
               "include_dirs": [
-                "include/linux"
+                "include/linux",
+                "src/nodeExt/includes"
               ]
             }
           ],
@@ -41,7 +42,8 @@
                 "LINUX_DEFINE", "OS_LINUX"
               ],
               "include_dirs": [
-                "include/linux"
+                "include/linux",
+                "src/nodeExt/includes"
               ]
             }
           ],
@@ -57,7 +59,8 @@
                 "LINUX_DEFINE", "OS_LINUX", "OS_MAC"
               ],
               "include_dirs": [
-                "include/linux"
+                "include/linux",
+                "src/nodeExt/includes"
               ]
             }
           ],
@@ -70,6 +73,7 @@
                 "OS_WIN"
               ],
               "include_dirs": [
+                "src/nodeExt/includes"
               ]
             }
           ]

diff --git a/install.js b/install.js
@@ -23,7 +23,7 @@ if (fs.existsSync(nativeModule) && !devMode) {
 }
 
 if (isNative == false) {
-    var fileHandle = require('./nodejs/file.js');
+    var fileHandle = require('./src/js/file.js');
     var isForce = true;
 
     if (!devMode) fileHandle.rmdir('./binary', isForce);

diff --git a/module.js b/module.js
@@ -5,15 +5,15 @@ var fs = require("fs");
 var _Directory = require("fs").Directory;
 var File = require("fs").File;
 
-var casting = require("./nodejs/casting_type.js");
-var str = require("./nodejs/string.js");
-var file = require("./nodejs/file.js");
-var core = require("./nodejs/core.js");
-var curl = require("./nodejs/curl.js");
-var array = require("./nodejs/array.js");
-var xml = require("./nodejs/DOMDocument.js");
-var socket = require("./nodejs/socket.js");
-var mysql = require("./nodejs/mysql.js");
+var casting = require("./src/js/casting_type.js");
+var str = require("./src/js/string.js");
+var file = require("./src/js/file.js");
+var core = require("./src/js/core.js");
+var curl = require("./src/js/curl.js");
+var array = require("./src/js/array.js");
+var xml = require("./src/js/DOMDocument.js");
+var socket = require("./src/js/socket.js");
+var mysql = require("./src/js/mysql.js");
 
 
 

diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
         "build": "node-gyp rebuild"
     },
     "dependencies": {
-       "node-gyp": "^1.0.2",
+       "node-gyp": ">=1.0.2",
        "bindings": ">=1.2.1"
     },
     "gypfile": true,

diff --git a/system/basic/src/Makefile → src/cpp/basic/src/Makefile b/system/basic/src/Makefile → src/cpp/basic/src/Makefile
diff --git a/system/basic/src/binding.gyp → src/cpp/basic/src/binding.gyp b/system/basic/src/binding.gyp → src/cpp/basic/src/binding.gyp
diff --git a/system/basic/src/string.cc → src/cpp/basic/src/string.cc b/system/basic/src/string.cc → src/cpp/basic/src/string.cc
diff --git a/system/basic/src/string_cpp.h → src/cpp/basic/src/string_cpp.h b/system/basic/src/string_cpp.h → src/cpp/basic/src/string_cpp.h
diff --git a/system/basic/tests/Makefile → src/cpp/basic/tests/Makefile b/system/basic/tests/Makefile → src/cpp/basic/tests/Makefile
diff --git a/system/basic/tests/binding.gyp → src/cpp/basic/tests/binding.gyp b/system/basic/tests/binding.gyp → src/cpp/basic/tests/binding.gyp
diff --git a/system/basic/tests/string.cc → src/cpp/basic/tests/string.cc b/system/basic/tests/string.cc → src/cpp/basic/tests/string.cc
diff --git a/system/curl/Makefile → src/cpp/curl/Makefile b/system/curl/Makefile → src/cpp/curl/Makefile
diff --git a/system/curl/README.md → src/cpp/curl/README.md b/system/curl/README.md → src/cpp/curl/README.md
diff --git a/system/curl/bin/Makefile → src/cpp/curl/bin/Makefile b/system/curl/bin/Makefile → src/cpp/curl/bin/Makefile
diff --git a/system/curl/bin/binding.gyp → src/cpp/curl/bin/binding.gyp b/system/curl/bin/binding.gyp → src/cpp/curl/bin/binding.gyp
diff --git a/system/curl/bin/curl.cc → src/cpp/curl/bin/curl.cc b/system/curl/bin/curl.cc → src/cpp/curl/bin/curl.cc
diff --git a/system/curl/src/Makefile → src/cpp/curl/src/Makefile b/system/curl/src/Makefile → src/cpp/curl/src/Makefile
diff --git a/system/curl/src/binding.gyp → src/cpp/curl/src/binding.gyp b/system/curl/src/binding.gyp → src/cpp/curl/src/binding.gyp
diff --git a/system/curl/src/phplikeCppCurl.cc → src/cpp/curl/src/phplikeCppCurl.cc b/system/curl/src/phplikeCppCurl.cc → src/cpp/curl/src/phplikeCppCurl.cc
diff --git a/system/curl/src/phplikeCppCurl.h → src/cpp/curl/src/phplikeCppCurl.h b/system/curl/src/phplikeCppCurl.h → src/cpp/curl/src/phplikeCppCurl.h
diff --git a/system/curl/src/phplikeCppCurl_linux.cc → src/cpp/curl/src/phplikeCppCurl_linux.cc b/system/curl/src/phplikeCppCurl_linux.cc → src/cpp/curl/src/phplikeCppCurl_linux.cc
diff --git a/system/curl/src/phplikeCppCurl_win.cc → src/cpp/curl/src/phplikeCppCurl_win.cc b/system/curl/src/phplikeCppCurl_win.cc → src/cpp/curl/src/phplikeCppCurl_win.cc
diff --git a/system/curl/src/util.cc → src/cpp/curl/src/util.cc b/system/curl/src/util.cc → src/cpp/curl/src/util.cc
diff --git a/system/curl/src/util.h → src/cpp/curl/src/util.h b/system/curl/src/util.h → src/cpp/curl/src/util.h
diff --git a/system/exec/Makefile → src/cpp/exec/Makefile b/system/exec/Makefile → src/cpp/exec/Makefile
diff --git a/system/exec/bin/Makefile → src/cpp/exec/bin/Makefile b/system/exec/bin/Makefile → src/cpp/exec/bin/Makefile
diff --git a/system/exec/bin/binding.gyp → src/cpp/exec/bin/binding.gyp b/system/exec/bin/binding.gyp → src/cpp/exec/bin/binding.gyp
diff --git a/system/exec/bin/exec.cc → src/cpp/exec/bin/exec.cc b/system/exec/bin/exec.cc → src/cpp/exec/bin/exec.cc
diff --git a/system/exec/src/Makefile → src/cpp/exec/src/Makefile b/system/exec/src/Makefile → src/cpp/exec/src/Makefile
diff --git a/system/exec/src/binding.gyp → src/cpp/exec/src/binding.gyp b/system/exec/src/binding.gyp → src/cpp/exec/src/binding.gyp
diff --git a/system/exec/src/exec.cc → src/cpp/exec/src/exec.cc b/system/exec/src/exec.cc → src/cpp/exec/src/exec.cc
diff --git a/system/exec/src/exec.h → src/cpp/exec/src/exec.h b/system/exec/src/exec.h → src/cpp/exec/src/exec.h
diff --git a/system/md5/src/Makefile → src/cpp/md5/src/Makefile b/system/md5/src/Makefile → src/cpp/md5/src/Makefile
diff --git a/system/md5/src/binding.gyp → src/cpp/md5/src/binding.gyp b/system/md5/src/binding.gyp → src/cpp/md5/src/binding.gyp
diff --git a/system/md5/src/md5.cc → src/cpp/md5/src/md5.cc b/system/md5/src/md5.cc → src/cpp/md5/src/md5.cc
diff --git a/system/md5/src/md5.h → src/cpp/md5/src/md5.h b/system/md5/src/md5.h → src/cpp/md5/src/md5.h
diff --git a/system/socket/Makefile → src/cpp/socket/Makefile b/system/socket/Makefile → src/cpp/socket/Makefile
diff --git a/system/socket/bin/Makefile → src/cpp/socket/bin/Makefile b/system/socket/bin/Makefile → src/cpp/socket/bin/Makefile
diff --git a/system/socket/bin/binding.gyp → src/cpp/socket/bin/binding.gyp b/system/socket/bin/binding.gyp → src/cpp/socket/bin/binding.gyp
diff --git a/system/socket/bin/socket.cc → src/cpp/socket/bin/socket.cc b/system/socket/bin/socket.cc → src/cpp/socket/bin/socket.cc
diff --git a/system/socket/src/Makefile → src/cpp/socket/src/Makefile b/system/socket/src/Makefile → src/cpp/socket/src/Makefile
diff --git a/system/socket/src/binding.gyp → src/cpp/socket/src/binding.gyp b/system/socket/src/binding.gyp → src/cpp/socket/src/binding.gyp
diff --git a/system/socket/src/socket.cc → src/cpp/socket/src/socket.cc b/system/socket/src/socket.cc → src/cpp/socket/src/socket.cc
diff --git a/system/socket/src/socket.h → src/cpp/socket/src/socket.h b/system/socket/src/socket.h → src/cpp/socket/src/socket.h
diff --git a/system/xml/Makefile → src/cpp/xml/Makefile b/system/xml/Makefile → src/cpp/xml/Makefile
diff --git a/system/xml/bin/Makefile → src/cpp/xml/bin/Makefile b/system/xml/bin/Makefile → src/cpp/xml/bin/Makefile
diff --git a/system/xml/bin/binding.gyp → src/cpp/xml/bin/binding.gyp b/system/xml/bin/binding.gyp → src/cpp/xml/bin/binding.gyp
diff --git a/system/xml/bin/test.cc → src/cpp/xml/bin/test.cc b/system/xml/bin/test.cc → src/cpp/xml/bin/test.cc
diff --git a/system/xml/bin/test.xml → src/cpp/xml/bin/test.xml b/system/xml/bin/test.xml → src/cpp/xml/bin/test.xml
diff --git a/system/xml/binding.gyp → src/cpp/xml/binding.gyp b/system/xml/binding.gyp → src/cpp/xml/binding.gyp
diff --git a/system/xml/src/Makefile → src/cpp/xml/src/Makefile b/system/xml/src/Makefile → src/cpp/xml/src/Makefile
diff --git a/system/xml/src/binding.gyp → src/cpp/xml/src/binding.gyp b/system/xml/src/binding.gyp → src/cpp/xml/src/binding.gyp
diff --git a/system/xml/src/tinyxml2.cpp → src/cpp/xml/src/tinyxml2.cpp b/system/xml/src/tinyxml2.cpp → src/cpp/xml/src/tinyxml2.cpp
diff --git a/system/xml/src/tinyxml2.h → src/cpp/xml/src/tinyxml2.h b/system/xml/src/tinyxml2.h → src/cpp/xml/src/tinyxml2.h
diff --git a/system/xml/src/xmltest.cpp → src/cpp/xml/src/xmltest.cpp b/system/xml/src/xmltest.cpp → src/cpp/xml/src/xmltest.cpp
diff --git a/nodejs/DOMDocument.js → src/js/DOMDocument.js b/nodejs/DOMDocument.js → src/js/DOMDocument.js
@@ -1,25 +1,6 @@
-var fs = require("fs");
 var DOMElementMod = require("./xml/DOMElement");
+var cpp = require('./requireNative.js');
 
-if (nativeModule === undefined) {
-    var path = require('path');
-    var parentPath = path.dirname(__filename) + '/..';
-    var nativeModule = parentPath + "/binary/" + process.platform + "_" + process.arch + "/";
-}
-
-if (fs.existsSync(nativeModule) && typeof(UNIT_TEST) == "undefined" ) {
-    try {
-        var cpp = require(nativeModule +'phplike' );
-    } catch (e) {
-        console.log("Got Exception. \nThis library could not be loaded, please recompile it.");
-    }
-} else {
-    try {
-        var cpp = require(parentPath + '/node_modules/bindings')({'bindings': 'phplike', 'module_root': parentPath + '/'});
-    } catch (e) {
-
-    }
-}
 
 /**
  * DOMDocument

diff --git a/nodejs/array.js → src/js/array.js b/nodejs/array.js → src/js/array.js
diff --git a/nodejs/casting_type.js → src/js/casting_type.js b/nodejs/casting_type.js → src/js/casting_type.js
diff --git a/nodejs/core.js → src/js/core.js b/nodejs/core.js → src/js/core.js
@@ -1,26 +1,5 @@
-var fs = require("fs");
-
-if (nativeModule === undefined) {
-    var path = require('path');
-    var parentPath = path.dirname(__filename) + '/..';
-    var nativeModule = parentPath + "/binary/" + process.platform + "_" + process.arch + "/";
-}
-
-if (fs.existsSync(nativeModule) && typeof(UNIT_TEST) == "undefined" ) {
-    try {
-        var cpp = require(nativeModule +'phplike' );
-    } catch (e) {
-        console.log("Got Exception. \nThis library could not be loaded, please recompile it.");
-    }
-} else {
-    try {
-        var cpp = require(parentPath + '/node_modules/bindings')({'bindings': 'phplike', 'module_root': parentPath + '/'});
-    } catch (e) {
-
-    }
-}
+var cpp = require('./requireNative.js');
 
-//var sprintf = require("sprintf").sprintf;
 var fs = require("fs");
 var _Directory = require("fs").Directory;
 var File = require("fs").File;

diff --git a/nodejs/curl.js → src/js/curl.js b/nodejs/curl.js → src/js/curl.js
@@ -1,25 +1,6 @@
-var fs = require("fs");
-
-if (nativeModule === undefined) {
-    var path = require('path');
-    var parentPath = path.dirname(__filename) + '/..';
-    var nativeModule = parentPath + "/binary/" + process.platform + "_" + process.arch + "/";
-}
-
-if (fs.existsSync(nativeModule) && typeof(UNIT_TEST) == "undefined" ) {
-    try {
-        var cpp = require(nativeModule +'phplike' );
-    } catch (e) {
-        console.log("Got Exception. \nThis library could not be loaded, please recompile it.");
-    }
-} else {
-    try {
-        var cpp = require(parentPath + '/node_modules/bindings')({'bindings': 'phplike', 'module_root': parentPath + '/'});
-    } catch (e) {
-
-    }
-}
+var cpp = require('./requireNative.js');
 
+var fs = require("fs");
 var casting = require("./casting_type.js");
 var core = require("./core.js");
 var phplikeArray = require("./array.js");

diff --git a/nodejs/file.js → src/js/file.js b/nodejs/file.js → src/js/file.js
diff --git a/nodejs/index.js → src/js/index.js b/nodejs/index.js → src/js/index.js
diff --git a/nodejs/mysql.js → src/js/mysql.js b/nodejs/mysql.js → src/js/mysql.js
@@ -1,6 +1,6 @@
 var socket;
 if (global.UNIT_TEST) {
-    socket = require('./../tests/mock/socket.js');
+    socket = require('./../../tests/mock/socket.js');
 } else {
     socket = require('./socket.js');
 }

diff --git a/nodejs/mysql/clientFlags.js → src/js/mysql/clientFlags.js b/nodejs/mysql/clientFlags.js → src/js/mysql/clientFlags.js
diff --git a/nodejs/mysql/commandFlags.js → src/js/mysql/commandFlags.js b/nodejs/mysql/commandFlags.js → src/js/mysql/commandFlags.js
diff --git a/nodejs/mysql/encrypt.js → src/js/mysql/encrypt.js b/nodejs/mysql/encrypt.js → src/js/mysql/encrypt.js
diff --git a/nodejs/mysql/packet.js → src/js/mysql/packet.js b/nodejs/mysql/packet.js → src/js/mysql/packet.js
diff --git a/nodejs/mysql/packetReader.js → src/js/mysql/packetReader.js b/nodejs/mysql/packetReader.js → src/js/mysql/packetReader.js
diff --git a/nodejs/mysql/packetWriter.js → src/js/mysql/packetWriter.js b/nodejs/mysql/packetWriter.js → src/js/mysql/packetWriter.js
diff --git a/src/js/requireNative.js b/src/js/requireNative.js
@@ -0,0 +1,23 @@
+var fs = require("fs");
+var cpp;
+if (nativeModule === undefined) {
+    var path = require('path');
+    var parentPath = path.dirname(__filename) + '/../..';
+    var nativeModule = parentPath + "/binary/" + process.platform + "_" + process.arch + "/";
+}
+
+if (fs.existsSync(nativeModule) && typeof(UNIT_TEST) == "undefined" ) {
+    try {
+        cpp = require(nativeModule +'phplike' );
+    } catch (e) {
+        console.log("Got Exception. \nThis library could not be loaded, please recompile it.");
+    }
+} else {
+    try {
+        cpp = require(parentPath + '/node_modules/bindings')({'bindings': 'phplike', 'module_root': parentPath + '/'});
+    } catch (e) {
+
+    }
+}
+
+module.exports = cpp;
diff --git a/nodejs/socket.js → src/js/socket.js b/nodejs/socket.js → src/js/socket.js
@@ -1,24 +1,4 @@
-var fs = require("fs");
-
-if (nativeModule === undefined) {
-    var path = require('path');
-    var parentPath = path.dirname(__filename) + '/..';
-    var nativeModule = parentPath + "/binary/" + process.platform + "_" + process.arch + "/";
-}
-
-if (fs.existsSync(nativeModule) && typeof(UNIT_TEST) == "undefined" ) {
-    try {
-        var cpp = require(nativeModule +'phplike' );
-    } catch (e) {
-        console.log("Got Exception. \nThis library could not be loaded, please recompile it.");
-    }
-} else {
-    try {
-        var cpp = require(parentPath + '/node_modules/bindings')({'bindings': 'phplike', 'module_root': parentPath + '/'});
-    } catch (e) {
-
-    }
-}
+var cpp = require('./requireNative.js');
 
 function fsockopen(hostname, port) {
     return cpp.nodeSocketConnet(hostname, port);

diff --git a/nodejs/string.js → src/js/string.js b/nodejs/string.js → src/js/string.js
diff --git a/nodejs/xml/DOMElement.js → src/js/xml/DOMElement.js b/nodejs/xml/DOMElement.js → src/js/xml/DOMElement.js
diff --git a/src/nodeExt/Makefile b/src/nodeExt/Makefile
@@ -1,2 +1,18 @@
+SRC_PATH=$(shell pwd)
+CC=g++
+CFLAGS= -I./includes/ -L/usr/local/lib/node 
+LIBS= -lexec -lphplikeCppCurl
+extlib = 
+CXXFILE= phplike.cc phplikeCurl.cc phplikeSocket.cc  phplikeXml.cc 
+SO = phplike
+#include ../conf/Makefile_exe_nodejs.global
+include ../../conf/Makefile_so_nodejs.global
 all:
-	xxxxxx
+	sudo mv  phplike.so ./phplike.node
+	sudo cp  phplike.node ./node_modules/
+	sudo mkdir -p /usr/local/lib/node_modules/phplike/node_modules
+	sudo cp phplike.node  /usr/local/lib/node_modules/phplike/node_modules
+
+gyp:
+	node-gyp configure
+	node-gyp build
diff --git a/nodejs/binding.gyp → src/nodeExt/binding.gyp b/nodejs/binding.gyp → src/nodeExt/binding.gyp
diff --git a/nodejs/common.h → src/nodeExt/includes/common.h b/nodejs/common.h → src/nodeExt/includes/common.h
diff --git a/nodejs/phplike.h → src/nodeExt/includes/phplike.h b/nodejs/phplike.h → src/nodeExt/includes/phplike.h
@@ -1,7 +1,7 @@
 #include "common.h"
 #include "phplikeXml.h"
-#include "../system/exec/src/exec.h"
-#include "../system/md5/src/md5.h"
+#include "../../cpp/exec/src/exec.h"
+#include "../../cpp/md5/src/md5.h"
 #include "phplikeSocket.h"
 
 

diff --git a/nodejs/phplikeSocket.h → src/nodeExt/includes/phplikeSocket.h b/nodejs/phplikeSocket.h → src/nodeExt/includes/phplikeSocket.h
@@ -1,4 +1,4 @@
-#include "../system/socket/src/socket.h"
+#include "../../cpp/socket/src/socket.h"
 
 
 Handle<Value> nodeSocketConnet(const Arguments &args);

diff --git a/nodejs/phplikeXml.h → src/nodeExt/includes/phplikeXml.h b/nodejs/phplikeXml.h → src/nodeExt/includes/phplikeXml.h
@@ -1,4 +1,4 @@
-#include "../system/xml/src/tinyxml2.h"
+#include "../../cpp/xml/src/tinyxml2.h"
 using namespace tinyxml2;
 
 

diff --git a/nodejs/phplike.cc → src/nodeExt/phplike.cc b/nodejs/phplike.cc → src/nodeExt/phplike.cc
diff --git a/nodejs/phplikeCurl.cc → src/nodeExt/phplikeCurl.cc b/nodejs/phplikeCurl.cc → src/nodeExt/phplikeCurl.cc
@@ -1,5 +1,5 @@
 #include "common.h"
-#include "../system/curl/src/phplikeCppCurl.h"
+#include "../cpp/curl/src/phplikeCppCurl.h"
 #include "node_buffer.h"
 
 string resHeader;

diff --git a/nodejs/phplikeSocket.cc → src/nodeExt/phplikeSocket.cc b/nodejs/phplikeSocket.cc → src/nodeExt/phplikeSocket.cc
diff --git a/nodejs/phplikeXml.cc → src/nodeExt/phplikeXml.cc b/nodejs/phplikeXml.cc → src/nodeExt/phplikeXml.cc