move sorce code to src dir

TamarLabs · Nov 23, 2016 · 3ca80e7 · 3ca80e7
1 parent 6497eb2
commit 3ca80e7
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 22 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,11 +2,11 @@ language: c
 compiler: gcc
 sudo: required
 install: make clean && make
-before_script: 
+before_script:
   - git clone https://github.com/antirez/redis.git
   - cd redis
   - make
   - sudo pip install redis
   - cd ..
   - ./redis/src/redis-server --loadmodule ./module.so &
-script: ./test.py --noload
+script: ./tests/test.py --noload
diff --git a/Makefile b/Makefile
@@ -7,30 +7,15 @@ ifndef RMUTIL_LIBDIR
 	RMUTIL_LIBDIR=rmutil
 endif
 
-# find the OS
-uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
+all: module.so
 
-# Compile flags for linux / osx
-ifeq ($(uname_S),Linux)
-	SHOBJ_CFLAGS ?=  -fno-common -g -ggdb
-	SHOBJ_LDFLAGS ?= -shared -Bsymbolic
-else
-	SHOBJ_CFLAGS ?= -dynamic -fno-common -g -ggdb
-	SHOBJ_LDFLAGS ?= -bundle -undefined dynamic_lookup
-endif
-CFLAGS = -I$(RM_INCLUDE_DIR) -Wall -g -fPIC -lc -lm -O3 -std=gnu99
-CC=gcc
-
-all:  rmutil module.so
-
-rmutil: FORCE
-	$(MAKE) -C $(RMUTIL_LIBDIR)
-
-module.so: module.o
-	$(LD) -o $@ module.o $(SHOBJ_LDFLAGS) $(LIBS) -L$(RMUTIL_LIBDIR) -lrmutil -lc
+module.so:
+	$(MAKE) -C ./src
+	cp ./src/module.so .
 
 clean: FORCE
 	rm -rf *.xo *.so *.o
+	rm -rf ./src/*.xo ./src/*.so ./src/*.o
 	rm -rf ./$(RMUTIL_LIBDIR)/*.so ./$(RMUTIL_LIBDIR)/*.o ./$(RMUTIL_LIBDIR)/*.a
 
 FORCE:
diff --git a/src/Makefile b/src/Makefile
@@ -0,0 +1,35 @@
+#set environment variable RM_INCLUDE_DIR to the location of redismodule.h
+ifndef RM_INCLUDE_DIR
+	RM_INCLUDE_DIR=../
+endif
+
+ifndef RMUTIL_LIBDIR
+	RMUTIL_LIBDIR=../rmutil
+endif
+
+# find the OS
+uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
+
+# Compile flags for linux / osx
+ifeq ($(uname_S),Linux)
+	SHOBJ_CFLAGS ?=  -fno-common -g -ggdb
+	SHOBJ_LDFLAGS ?= -shared -Bsymbolic
+else
+	SHOBJ_CFLAGS ?= -dynamic -fno-common -g -ggdb
+	SHOBJ_LDFLAGS ?= -bundle -undefined dynamic_lookup
+endif
+CFLAGS = -I$(RM_INCLUDE_DIR) -Wall -g -fPIC -lc -lm -O3 -std=gnu99
+CC=gcc
+
+all:  rmutil module.so
+
+rmutil: FORCE
+	$(MAKE) -C $(RMUTIL_LIBDIR)
+
+module.so: module.o
+	$(LD) -o $@ module.o $(SHOBJ_LDFLAGS) $(LIBS) -L$(RMUTIL_LIBDIR) -lrmutil -lc
+
+clean: FORCE
+	rm -rf *.xo *.so *.o
+
+FORCE:
diff --git a/khash.h → src/khash.h b/khash.h → src/khash.h
diff --git a/module.c → src/module.c b/module.c → src/module.c
diff --git a/helloworld.py → tests/helloworld.py b/helloworld.py → tests/helloworld.py
diff --git a/test.py → tests/test.py b/test.py → tests/test.py