Refactors cmake out and uses make in its stead

This replaces the previously-used build system with something that
is supposed to play nicer with Mac OSX.

.travis.yml

@@ -1,29 +1,36 @@
 language: c
-compiler: gcc
-dist: trusty
+
+os:
+  - linux
+  - osx
+
+compiler:
+  - gcc
+  - clang
+
+matrix:
+  allow_failures:
+    - os: osx
+  include:
+    - os: linux
+      dist: trusty
+      sudo: required
+    - os: osx
+      osx_image: xcode8.3
 
 branches:
   only:
     - master
 
-addons:
-    packages:
-      - cmake
-      - cmake-data
-
 before_install:
-  - sudo apt-get install cmake
   - git clone --depth 1 https://github.com/antirez/redis.git
   - cd redis
   - make
   - cd ..
   - pip install redis rmtest
 
 install:
-  - ./bootstrap.sh
-  - cmake -DREDIS_SERVER_PATH:FILEPATH=$PWD/redis/src/redis-server --build build
-  - cmake --build build --target all --config Release
+  - make all
 
 script:
-  - cd build
-  - ctest -VV
+  - make test

Makefile

@@ -0,0 +1,10 @@
+all:
+	$(MAKE) -C ./src all
+
+test:
+	$(MAKE) -C ./test all
+.PHONY: test
+
+clean:
+	find ./ -name "*.[oa]" -exec rm {} \; -print
+	find ./ -name "*.so" -exec rm {} \; -print

deps/RedisModuleSDK/rmutil/Makefile

@@ -3,10 +3,16 @@ ifndef RM_INCLUDE_DIR
 	RM_INCLUDE_DIR=../
 endif
 
-CFLAGS = -g -fPIC -lc -lm -O3 -std=gnu99 -I$(RM_INCLUDE_DIR) -Wall -Wno-unused-function
-CC=gcc
+CFLAGS ?= -g -fPIC -lc -lm -O3 -std=gnu99 -I$(RM_INCLUDE_DIR) -Wall -Wno-unused-function
+uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
+ifneq ($(uname_S),Linux)
+	CFLAGS += -mmacosx-version-min=10.6
+endif
+export CFLAGS
+
+CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
 
-OBJS=util.o strings.o sds.o vector.o heap.o priority_queue.o
+OBJS=util.o strings.o sds.o vector.o heap.o priority_queue.o alloc.o
 
 all: librmutil.a
 

deps/RedisModuleSDK/rmutil/alloc.c

@@ -22,7 +22,7 @@ char *rmalloc_strndup(const char *s, size_t n) {
  * replaces all malloc functions in redis with the RM_Alloc family of functions,
  * when running that code outside of redis, your app will crash. This function
  * patches the RM_Alloc functions back to the original mallocs. */
-void RMUTil_InitAlloc() {
+void RMUtil_InitAlloc() {
 
   RedisModule_Alloc = malloc;
   RedisModule_Realloc = realloc;

deps/RedisModuleSDK/rmutil/alloc.h

@@ -27,13 +27,14 @@ char *rmalloc_strndup(const char *s, size_t n);
 #define calloc(count, size) RedisModule_Calloc(count, size)
 #define realloc(ptr, size) RedisModule_Realloc(ptr, size)
 #define free(ptr) RedisModule_Free(ptr)
+
 #ifdef strdup
 #undef strdup
 #endif
 #define strdup(ptr) RedisModule_Strdup(ptr)
 
-// /* More overriding */
-// // needed to avoid calling strndup->malloc
+/* More overriding */
+// needed to avoid calling strndup->malloc
 #ifdef strndup
 #undef strndup
 #endif
@@ -43,7 +44,7 @@ char *rmalloc_strndup(const char *s, size_t n);
 /* This function shold be called if you are working with malloc-patched code
  * ouside of redis, usually for unit tests. Call it once when entering your unit
  * tests' main() */
-void RMUTil_InitAlloc();
+void RMUtil_InitAlloc();
 #endif /* REDIS_MODULE_TARGET */
 
 #endif /* __RMUTIL_ALLOC__ */