Skip to content
This repository has been archived by the owner on Aug 4, 2019. It is now read-only.

Commit

Permalink
Remove inline hiredis
Browse files Browse the repository at this point in the history
This was a failed experiment. It didn't link properly and caused other
issues upstream. Was trying to make it easier for people to install
librepsheet, but will just specify hiredis versions in the README
instead.
  • Loading branch information
abedra committed May 5, 2015
1 parent 71829d8 commit de84923
Show file tree
Hide file tree
Showing 40 changed files with 24 additions and 7,495 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: c
before_install:
- sudo apt-get update -qq
- sudo apt-get install -qq build-essential check
script: ./autogen.sh && ./configure && make && make check
script: sh ci.sh
compiler:
- clang
- gcc
Expand Down
17 changes: 17 additions & 0 deletions ci.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/bin/sh

# Install a supported version of hiredis
curl -O -L https://github.com/redis/hiredis/archive/v0.13.1.tar.gz
tar xzf v0.13.1.tar.gz
cd hiredis-0.13.1
./configure
make
sudo make install
sudo ldconfig
cd ..

# Build and run test suite
./autogen.sh
./configure
make
make check
4 changes: 1 addition & 3 deletions src/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
AUTOMAKE_OPTIONS = -Wno-override
SUBDIRS = hiredis
include_HEADERS = repsheet.h
lib_LTLIBRARIES = librepsheet.la
librepsheet_la_SOURCES = librepsheet.c \
Expand All @@ -9,7 +8,6 @@ librepsheet_la_SOURCES = librepsheet.c \
whitelist.c \
marked.c \
xff.c
librepsheet_la_LIBADD = hiredis/libhiredis.so
librepsheet_la_LDFLAGS = -lm
librepsheet_la_LDFLAGS = -lm -lhiredis
librepsheet_la_CFLAGS = -std=c99

7 changes: 0 additions & 7 deletions src/hiredis/.gitignore

This file was deleted.

16 changes: 0 additions & 16 deletions src/hiredis/.travis.yml

This file was deleted.

79 changes: 0 additions & 79 deletions src/hiredis/CHANGELOG.md

This file was deleted.

29 changes: 0 additions & 29 deletions src/hiredis/COPYING

This file was deleted.

194 changes: 0 additions & 194 deletions src/hiredis/Makefile

This file was deleted.

Loading

0 comments on commit de84923

Please sign in to comment.