Merge branch 'release/v0.1.1'

mrtazz · mrtazz · commit ca2a523de26b · 2010-10-27T12:07:27.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 bin/*
 *.o
+lib*
diff --git a/Makefile b/Makefile
@@ -11,45 +11,68 @@ LOGFILE = test_server.log
 
 # binaries and folders
 BINDIR = bin
+LIBDIR = lib
 TEST = $(BINDIR)/test
+LIBNAME = librestclient-cpp.so
+LIB = $(LIBDIR)/$(LIBNAME)
+STATIC = $(LIBDIR)/librestclient-cpp.a
 
 # set library and include paths
 INCLUDE =  -I. -I/usr/local/include
 TESTLIBS = -lgtest -lcurl
 LIBS = -lcurl
 
 # set compiler and linker flags
-CCFLAGS = -O3 -W -Wall
+CCFLAGS = -fPIC -O3 -W -Wall
 LDFLAGS = -W -Wall -L/usr/local/lib
 
 # source files
 SRCS =  source/restclient.cpp
-SRCS += $(wildcard test/test*.cpp)
+
+# test source files
+TESTSRCS = $(SRCS)
+TESTSRCS += $(wildcard test/test*.cpp)
 
 # dependencies
 # object files
 OBJS = $(SRCS:.cpp=.o)
+TESTOBJS = $(TESTSRCS:.cpp=.o)
 
 # linking rule
-$(TEST): $(OBJS) $(BINDIR)
-	$(LD) $(LDFLAGS) $(OBJS) -o $(TEST) $(TESTLIBS)
+$(TEST): $(TESTOBJS) $(BINDIR)
+	$(LD) $(LDFLAGS) $(TESTOBJS) -o $(TEST) $(TESTLIBS)
+
+# dynamic lib rule
+$(LIB): $(OBJS) $(LIBDIR)
+	$(LD) $(LDFLAGS) -shared -soname,$(LIBNAME) -o $(LIB) $(OBJS) $(LIBS)
+
+# static lib rule
+$(STATIC): $(OBJS) $(LIBDIR)
+	ar rcs $(STATIC) $(OBJS)
 
 # compile rule
 .cpp.o:
 	$(CC) $(CCFLAGS) $(INCLUDE) -c $<  -o $@
 
-
 $(BINDIR):
 	@mkdir -p $(BINDIR)
 
+$(LIBDIR):
+	@mkdir -p $(LIBDIR)
+
 # tasks
-.PHONY:  clean all
+.PHONY:  clean
 
 clean:
 	@rm -rf test/*.o
 	@rm -rf source/*.o
 	@rm -rf bin
+	@rm -rf lib
 
-all: $(TEST)
+test: $(TEST)
 	@echo Running tests...
 	@./bin/test
+
+dynamiclibrary: $(LIB)
+
+staticlibrary: $(STATIC)
diff --git a/README.md b/README.md
@@ -1,8 +1,7 @@
 # REST client for C++
 
 ## About
-This is a simple REST client for C++. It wraps libcurl for HTTP requests
-and uses jsoncpp for parsing JSON responses.
+This is a simple REST client for C++. It wraps libcurl for HTTP requests.
 
 ## Usage
 I tried to keep usage close to the [ruby rest-client][]. So the basic usage is:
@@ -18,11 +17,17 @@ Examples:
     RestClient::put("http://url.com/put", "text/json", "{"foo": "bla"}")
     RestClient::del("http://url.com/delete")
 
+The response is of type RestClient::response and has two attributes:
+
+    RestClient::response.code // HTTP response code
+    RestClient::response.body // HTTP response body
+
+
 ## Dependencies
 - [libcurl][]
-- [jsoncpp][]
+- [gtest][] for development
 
 
 [libcurl]: http://curl.haxx.se/libcurl/
-[jsoncpp]: http://jsoncpp.sourceforge.net/
 [ruby rest-client]: http://github.com/archiloque/rest-client
+[gtest]: http://code.google.com/p/googletest/
diff --git a/include/meta.h b/include/meta.h
@@ -8,7 +8,7 @@
 #define INCLUDE_META_H_
 
 // version string normally set from makefile
-#define VERSION "0.1.0"
+#define VERSION "0.1.1"
 
 #endif  // INCLUDE_META_H_
 
diff --git a/include/restclient.h b/include/restclient.h
@@ -11,7 +11,7 @@
 
 #include <curl/curl.h>
 #include <string>
-#include "include/meta.h"
+#include "meta.h"
 
 class RestClient
 {

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`#include <curl/curl.h>`
`13`	`13`	`#include <string>`
`14`		`-#include "include/meta.h"`
	`14`	`+#include "meta.h"`
`15`	`15`
`16`	`16`	`class RestClient`
`17`	`17`	`{`