diff --git a/Makefile b/Makefile index 048b6be..bd7b19e 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,8 @@ gyp-test: node-gyp build # sudo cp build/Release/nodejs-phplike.node /usr/local/lib/node_modules/phplike/node_modules/phplike.node +test: mocha + mocha: mocha tests/*.js mocha tests/mysql/*.js diff --git a/src/cpp/Makefile b/src/cpp/Makefile index 51d3a40..a17d356 100644 --- a/src/cpp/Makefile +++ b/src/cpp/Makefile @@ -1,2 +1,22 @@ -all: - xxxxxxxxx +.PHONY: basic curl exec md5 xml socket + +all: basic curl exec md5 socket +#xml + +basic: + cd basic/src && make + +curl: + cd curl/src && make + +exec: + cd exec/src && make + +md5: + cd md5/src && make + +xml: + cd xml/src && make + +socket: + cd socket/src && make diff --git a/src/cpp/basic/src/Makefile b/src/cpp/basic/src/Makefile index 1c5556a..1cac8bd 100644 --- a/src/cpp/basic/src/Makefile +++ b/src/cpp/basic/src/Makefile @@ -8,9 +8,9 @@ CXXFILE= string.cc SO = phplikeCppBasic -include ../../../conf/Makefile_so.global +include ../../../../conf/Makefile_so.global all: - sudo cp phplikeCppCurl.so /usr/local/lib/node/libphplikeCppBasic.so + sudo cp phplikeCppBasic.so /usr/local/lib/node/libphplikeCppBasic.so diff --git a/src/cpp/curl/src/Makefile b/src/cpp/curl/src/Makefile index 89ce214..2079dc9 100644 --- a/src/cpp/curl/src/Makefile +++ b/src/cpp/curl/src/Makefile @@ -8,7 +8,7 @@ CXXFILE= util.cc phplikeCppCurl.cc SO = phplikeCppCurl -include ../../../conf/Makefile_so.global +include ../../../../conf/Makefile_so.global all: sudo cp phplikeCppCurl.so /usr/local/lib/node/libphplikeCppCurl.so diff --git a/src/cpp/exec/src/Makefile b/src/cpp/exec/src/Makefile index f80c035..95e966c 100644 --- a/src/cpp/exec/src/Makefile +++ b/src/cpp/exec/src/Makefile @@ -5,8 +5,7 @@ LIBS= -std=gnu++0x extlib = CXXFILE= exec.cc SO = exec -#include ../../../conf/Makefile_exe_nodejs.global -include ../../../conf/Makefile_so.global +include ../../../../conf/Makefile_so.global all: sudo cp exec.so /usr/local/lib/node/libexec.so diff --git a/src/cpp/md5/src/Makefile b/src/cpp/md5/src/Makefile index 3b4b5a3..3e99e14 100644 --- a/src/cpp/md5/src/Makefile +++ b/src/cpp/md5/src/Makefile @@ -1,3 +1,19 @@ +SRC_PATH=$(shell pwd) +CC=g++ +CFLAGS= -L/usr/lib -I/usr/lib +LIBS= +#-lcurlpp -I./curlpp/include/ +extlib = +CXXFILE= md5.cc +SO = phplikeCppMd5 + + +include ../../../../conf/Makefile_so.global +all: +# sudo cp phplikeCppBasic.so /usr/local/lib/node/libphplikeCppBasic.so + + + ifneq (, $(CYGWIN_PATH)) M_CYGWIN_PATH=$(CYGWIN_PATH) diff --git a/src/cpp/socket/src/Makefile b/src/cpp/socket/src/Makefile index 8fa2f32..0bbe4b9 100644 --- a/src/cpp/socket/src/Makefile +++ b/src/cpp/socket/src/Makefile @@ -4,13 +4,13 @@ CFLAGS= -L/usr/lib -I/usr/lib LIBS= -lcurl #-lcurlpp -I./curlpp/include/ extlib = -CXXFILE= phplikeSocket.cc -SO = phplikeSocket +CXXFILE= socket.cc +SO = phplikeCppSocket -include ../../../conf/Makefile_so.global +include ../../../../conf/Makefile_so.global all: -# sudo cp phplikeCppCurl.so /usr/local/lib/node/libphplikeCppCurl.so +# sudo cp phplikeCppSocket.so /usr/local/lib/node/libphplikeCppSocket.so diff --git a/src/cpp/xml/src/Makefile b/src/cpp/xml/src/Makefile index aab6293..93a9b36 100644 --- a/src/cpp/xml/src/Makefile +++ b/src/cpp/xml/src/Makefile @@ -1,6 +1,41 @@ -all: xmltest -xmltest: xmltest.cpp tinyxml2.cpp tinyxml2.h -test: clean xmltest - ./xmltest -clean: - rm -f *.o xmltest +SRC_PATH=$(shell pwd) +CC=g++ +CFLAGS= -L/usr/lib -I/usr/lib +LIBS= +extlib = +CXXFILE= tinyxml2.cpp +SO = phplikeCppXml + + +include ../../../../conf/Makefile_so.global + +all: + echo " xxxxxxx" + + +ifneq (, $(CYGWIN_PATH)) +M_CYGWIN_PATH=$(CYGWIN_PATH) +else +M_CYGWIN_PATH=C:/cygwin64 +endif + +CWD=`echo $(M_CYGWIN_PATH)$(shell pwd) | sed 's/\//\\\/g'` + + + +gyp: + node-gyp configure --CWD=$(CWD) + node-gyp build + +gyp-ins: + gmake gyp +# sudo cp build/Release/phplikeCppCurl.$(soExt) /usr/local/lib/node/libphplikeCppCurl.$(soExt) +# sudo ldconfig + #sudo cp build/Release/obj.target/phplikeCppCurl/phplikeCppCurl.o /usr/local/lib/node/libphplikeCppCurl.so + + +#xmltest: xmltest.cpp tinyxml2.cpp tinyxml2.h +#test: clean xmltest +# ./xmltest +#clean: +# rm -f *.o xmltest