fix make and setup

Author: Markus Bergholz

mex/Makefile

@@ -5,6 +5,10 @@ build:
 	gcc -fPIC -std=c++11 -I /usr/include/octave-${octave_version}/octave/ -lm -I /usr/include/hiredis/ -lhiredis -shared -O2 -pedantic redis_.cpp -o redis_.mex
 	cp redis_.mex ../inst/redis_.mex
 
+gitlab_build:
+	echo "using ${octave_version}"	
+	mkoctfile -lhiredis -I/usr/include/hiredis --mex -fPIC -O3 -pedantic -std=c++11 -g redis_.cpp -o redis_.mex -o ../inst/redis_.mex
+	
 test:
 	echo "YES" | octave-cli --eval 'quit(or(0, mUnittest("test_redis")))'
 

mex/gitlabci.m

@@ -3,9 +3,7 @@
 OK = @(x) strcmp('OK', x);
 
 %% testing redis() class
-setup
 addpath('../inst/')
-addpath('../inst/private')
 r = redis('hostname', 'redis');
 % test basics
 assert(strcmp('PONG',r.ping()),

mex/setup.m

@@ -11,7 +11,7 @@
     %% setup for octave follows here
     if isunix
         try
-            eval(['mkoctfile -lhiredis -I' LIBPATH ' --mex -fPIC -O3 -pedantic -std=c++11 -g redis_.cpp -o redis_.mex -o ../inst/redis_.mex'])
+            eval(['mkoctfile -lhiredis -I'LIBPATH ' --mex -fPIC -O3 -pedantic -std=c++11 -g redis_.cpp -o redis_.mex -o ../inst/redis_.mex'])
         catch
             error('something went wrong\n Make sure you''ve installes octave dev tools and hiredis')
         end%try