Skip to content

Commit

Permalink
WIP: More renaming + doc renaming
Browse files Browse the repository at this point in the history
  • Loading branch information
@michael-grunder
michael-grunder committed May 23, 2024
1 parent 8de1ead commit 612d9b6
Show file tree
Hide file tree
Showing 10 changed files with 197 additions and 255 deletions.
86 changes: 43 additions & 43 deletions libvalkey/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Hiredis Makefile
# Libvalkey Makefile
# Copyright (C) 2010-2011 Salvatore Sanfilippo <antirez at gmail dot com>
# Copyright (C) 2010-2011 Pieter Noordhuis <pcnoordhuis at gmail dot com>
# This file is released under the BSD license, see the COPYING file

OBJ=alloc.o net.o valkey.o sds.o async.o read.o sockcompat.o
EXAMPLES=hiredis-example libvalkey-example-libevent libvalkey-example-libev libvalkey-example-glib libvalkey-example-push libvalkey-example-poll
TESTS=libvalkey-test
EXAMPLES=valkey-example valkey-example-libevent valkey-example-libev valkey-example-glib valkey-example-push valkey-example-poll
TESTS=valkey-test
LIBNAME=libvalkey
PKGCONFNAME=hiredis.pc
PKGCONFNAME=valkey.pc

LIBVALKEY_MAJOR=$(shell grep LIBVALKEY_MAJOR valkey.h | awk '{print $$3}')
LIBVALKEY_MINOR=$(shell grep LIBVALKEY_MINOR valkey.h | awk '{print $$3}')
Expand All @@ -16,7 +16,7 @@ LIBVALKEY_SONAME=$(shell grep LIBVALKEY_SONAME valkey.h | awk '{print $$3}')

# Installation related variables and target
PREFIX?=/usr/local
INCLUDE_PATH?=include/hiredis
INCLUDE_PATH?=include/valkey
LIBRARY_PATH?=lib
PKGCONF_PATH?=pkgconfig
INSTALL_INCLUDE_PATH= $(DESTDIR)$(PREFIX)/$(INCLUDE_PATH)
Expand All @@ -28,10 +28,10 @@ VALKEY_PORT=56379
VALKEY_SERVER=valkey-server
define VALKEY_TEST_CONFIG
daemonize yes
pidfile /tmp/libvalkey-test-valkey.pid
pidfile /tmp/valkey-test-valkey.pid
port $(VALKEY_PORT)
bind 127.0.0.1
unixsocket /tmp/libvalkey-test-valkey.sock
unixsocket /tmp/valkey-test-valkey.sock
endef
export VALKEY_TEST_CONFIG

Expand Down Expand Up @@ -73,7 +73,7 @@ USE_SSL?=0
ifeq ($(USE_SSL),1)
# This is required for test.c only
CFLAGS+=-DVALKEY_TEST_SSL
EXAMPLES+=libvalkey-example-ssl libvalkey-example-libevent-ssl
EXAMPLES+=valkey-example-ssl valkey-example-libevent-ssl
SSL_STLIB=$(SSL_STLIBNAME)
SSL_DYLIB=$(SSL_DYLIBNAME)
SSL_PKGCONF=$(SSL_PKGCONFNAME)
Expand Down Expand Up @@ -146,7 +146,7 @@ ifeq ($(uname_S),Darwin)
DYLIB_PLUGIN=-Wl,-undefined -Wl,dynamic_lookup
endif

all: dynamic static libvalkey-test pkgconfig
all: dynamic static valkey-test pkgconfig

dynamic: $(DYLIBNAME) $(SSL_DYLIB)

Expand Down Expand Up @@ -182,69 +182,69 @@ $(SSL_OBJ): ssl.c valkey.h read.h sds.h alloc.h async.h win32.h async_private.h
#################### SSL building rules end ####################

# Binaries:
libvalkey-example-libevent: examples/example-libevent.c adapters/libevent.h $(STLIBNAME)
valkey-example-libevent: examples/example-libevent.c adapters/libevent.h $(STLIBNAME)
$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< -levent $(STLIBNAME) $(REAL_LDFLAGS)

libvalkey-example-libevent-ssl: examples/example-libevent-ssl.c adapters/libevent.h $(STLIBNAME) $(SSL_STLIBNAME)
valkey-example-libevent-ssl: examples/example-libevent-ssl.c adapters/libevent.h $(STLIBNAME) $(SSL_STLIBNAME)
$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< -levent $(STLIBNAME) $(SSL_STLIBNAME) $(REAL_LDFLAGS) $(SSL_LDFLAGS)

libvalkey-example-libev: examples/example-libev.c adapters/libev.h $(STLIBNAME)
valkey-example-libev: examples/example-libev.c adapters/libev.h $(STLIBNAME)
$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< -lev $(STLIBNAME) $(REAL_LDFLAGS)

libvalkey-example-libhv: examples/example-libhv.c adapters/libhv.h $(STLIBNAME)
valkey-example-libhv: examples/example-libhv.c adapters/libhv.h $(STLIBNAME)
$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< -lhv $(STLIBNAME) $(REAL_LDFLAGS)

libvalkey-example-glib: examples/example-glib.c adapters/glib.h $(STLIBNAME)
valkey-example-glib: examples/example-glib.c adapters/glib.h $(STLIBNAME)
$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< $(shell pkg-config --cflags --libs glib-2.0) $(STLIBNAME) $(REAL_LDFLAGS)

libvalkey-example-ivykis: examples/example-ivykis.c adapters/ivykis.h $(STLIBNAME)
valkey-example-ivykis: examples/example-ivykis.c adapters/ivykis.h $(STLIBNAME)
$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< -livykis $(STLIBNAME) $(REAL_LDFLAGS)

libvalkey-example-macosx: examples/example-macosx.c adapters/macosx.h $(STLIBNAME)
valkey-example-macosx: examples/example-macosx.c adapters/macosx.h $(STLIBNAME)
$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< -framework CoreFoundation $(STLIBNAME) $(REAL_LDFLAGS)

libvalkey-example-ssl: examples/example-ssl.c $(STLIBNAME) $(SSL_STLIBNAME)
valkey-example-ssl: examples/example-ssl.c $(STLIBNAME) $(SSL_STLIBNAME)
$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< $(STLIBNAME) $(SSL_STLIBNAME) $(REAL_LDFLAGS) $(SSL_LDFLAGS)

libvalkey-example-poll: examples/example-poll.c adapters/poll.h $(STLIBNAME)
valkey-example-poll: examples/example-poll.c adapters/poll.h $(STLIBNAME)
$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< $(STLIBNAME) $(REAL_LDFLAGS)

ifndef AE_DIR
libvalkey-example-ae:
valkey-example-ae:
@echo "Please specify AE_DIR (e.g. <redis repository>/src)"
@false
else
libvalkey-example-ae: examples/example-ae.c adapters/ae.h $(STLIBNAME)
valkey-example-ae: examples/example-ae.c adapters/ae.h $(STLIBNAME)
$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. -I$(AE_DIR) $< $(AE_DIR)/ae.o $(AE_DIR)/zmalloc.o $(AE_DIR)/../deps/jemalloc/lib/libjemalloc.a -pthread $(STLIBNAME)
endif

ifndef LIBUV_DIR
# dynamic link libuv.so
libvalkey-example-libuv: examples/example-libuv.c adapters/libuv.h $(STLIBNAME)
valkey-example-libuv: examples/example-libuv.c adapters/libuv.h $(STLIBNAME)
$(CC) -o examples/$@ $(REAL_CFLAGS) -I. -I$(LIBUV_DIR)/include $< -luv -lpthread -lrt $(STLIBNAME) $(REAL_LDFLAGS)
else
# use user provided static lib
libvalkey-example-libuv: examples/example-libuv.c adapters/libuv.h $(STLIBNAME)
valkey-example-libuv: examples/example-libuv.c adapters/libuv.h $(STLIBNAME)
$(CC) -o examples/$@ $(REAL_CFLAGS) -I. -I$(LIBUV_DIR)/include $< $(LIBUV_DIR)/.libs/libuv.a -lpthread -lrt $(STLIBNAME) $(REAL_LDFLAGS)
endif

ifeq ($(and $(QT_MOC),$(QT_INCLUDE_DIR),$(QT_LIBRARY_DIR)),)
libvalkey-example-qt:
valkey-example-qt:
@echo "Please specify QT_MOC, QT_INCLUDE_DIR AND QT_LIBRARY_DIR"
@false
else
libvalkey-example-qt: examples/example-qt.cpp adapters/qt.h $(STLIBNAME)
valkey-example-qt: examples/example-qt.cpp adapters/qt.h $(STLIBNAME)
$(QT_MOC) adapters/qt.h -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore | \
$(CXX) -x c++ -o qt-adapter-moc.o -c - $(REAL_CFLAGS) -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore
$(QT_MOC) examples/example-qt.h -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore | \
$(CXX) -x c++ -o qt-example-moc.o -c - $(REAL_CFLAGS) -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore
$(CXX) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore -L$(QT_LIBRARY_DIR) qt-adapter-moc.o qt-example-moc.o $< -pthread $(STLIBNAME) -lQtCore
endif

libvalkey-example: examples/example.c $(STLIBNAME)
valkey-example: examples/example.c $(STLIBNAME)
$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< $(STLIBNAME) $(REAL_LDFLAGS)

libvalkey-example-push: examples/example-push.c $(STLIBNAME)
valkey-example-push: examples/example-push.c $(STLIBNAME)
$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< $(STLIBNAME) $(REAL_LDFLAGS)

examples: $(EXAMPLES)
Expand All @@ -258,23 +258,23 @@ ifeq ($(TEST_ASYNC),1)
TEST_LDFLAGS += -levent
endif

libvalkey-test: test.o $(TEST_LIBS)
valkey-test: test.o $(TEST_LIBS)
$(CC) -o $@ $(REAL_CFLAGS) -I. $^ $(REAL_LDFLAGS) $(TEST_LDFLAGS)

libvalkey-%: %.o $(STLIBNAME)
valkey-%: %.o $(STLIBNAME)
$(CC) $(REAL_CFLAGS) -o $@ $< $(TEST_LIBS) $(REAL_LDFLAGS)

test: libvalkey-test
./libvalkey-test
test: valkey-test
./valkey-test

check: libvalkey-test
check: valkey-test
TEST_SSL=$(USE_SSL) ./test.sh

.c.o:
$(CC) -std=c99 -c $(REAL_CFLAGS) $<

clean:
rm -rf $(DYLIBNAME) $(STLIBNAME) $(SSL_DYLIBNAME) $(SSL_STLIBNAME) $(TESTS) $(PKGCONFNAME) examples/libvalkey-example* *.o *.gcda *.gcno *.gcov
rm -rf $(DYLIBNAME) $(STLIBNAME) $(SSL_DYLIBNAME) $(SSL_STLIBNAME) $(TESTS) $(PKGCONFNAME) examples/valkey-example* *.o *.gcda *.gcno *.gcov

dep:
$(CC) $(CPPFLAGS) $(CFLAGS) -MM *.c
Expand All @@ -289,25 +289,25 @@ $(PKGCONFNAME): valkey.h
@echo includedir=$(PREFIX)/include >> $@
@echo pkgincludedir=$(PREFIX)/$(INCLUDE_PATH) >> $@
@echo >> $@
@echo Name: hiredis >> $@
@echo Name: valkey >> $@
@echo Description: Minimalistic C client library for Redis. >> $@
@echo Version: $(LIBVALKEY_MAJOR).$(LIBVALKEY_MINOR).$(LIBVALKEY_PATCH) >> $@
@echo Libs: -L\$${libdir} -lhiredis >> $@
@echo Libs: -L\$${libdir} -lvalkey >> $@
@echo Cflags: -I\$${pkgincludedir} -I\$${includedir} -D_FILE_OFFSET_BITS=64 >> $@

$(SSL_PKGCONFNAME): hiredis_ssl.h
$(SSL_PKGCONFNAME): valkey_ssl.h
@echo "Generating $@ for pkgconfig..."
@echo prefix=$(PREFIX) > $@
@echo exec_prefix=\$${prefix} >> $@
@echo libdir=$(PREFIX)/$(LIBRARY_PATH) >> $@
@echo includedir=$(PREFIX)/include >> $@
@echo pkgincludedir=$(PREFIX)/$(INCLUDE_PATH) >> $@
@echo >> $@
@echo Name: hiredis_ssl >> $@
@echo Description: SSL Support for hiredis. >> $@
@echo Name: valkey_ssl >> $@
@echo Description: SSL Support for valkey. >> $@
@echo Version: $(LIBVALKEY_MAJOR).$(LIBVALKEY_MINOR).$(LIBVALKEY_PATCH) >> $@
@echo Requires: hiredis >> $@
@echo Libs: -L\$${libdir} -lhiredis_ssl >> $@
@echo Requires: valkey >> $@
@echo Libs: -L\$${libdir} -lvalkey_ssl >> $@
@echo Libs.private: -lssl -lcrypto >> $@

install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME) $(SSL_INSTALL)
Expand All @@ -322,7 +322,7 @@ install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME) $(SSL_INSTALL)

install-ssl: $(SSL_DYLIBNAME) $(SSL_STLIBNAME) $(SSL_PKGCONFNAME)
mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH)
$(INSTALL) hiredis_ssl.h $(INSTALL_INCLUDE_PATH)
$(INSTALL) valkey_ssl.h $(INSTALL_INCLUDE_PATH)
$(INSTALL) $(SSL_DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(SSL_DYLIB_MINOR_NAME)
cd $(INSTALL_LIBRARY_PATH) && ln -sf $(SSL_DYLIB_MINOR_NAME) $(SSL_DYLIBNAME) && ln -sf $(SSL_DYLIB_MINOR_NAME) $(SSL_DYLIB_MAJOR_NAME)
$(INSTALL) $(SSL_STLIBNAME) $(INSTALL_LIBRARY_PATH)
Expand All @@ -348,9 +348,9 @@ gcov:
coverage: gcov
make check
mkdir -p tmp/lcov
lcov -d . -c --exclude '/usr*' -o tmp/lcov/hiredis.info
lcov -q -l tmp/lcov/hiredis.info
genhtml --legend -q -o tmp/lcov/report tmp/lcov/hiredis.info
lcov -d . -c --exclude '/usr*' -o tmp/lcov/valkey.info
lcov -q -l tmp/lcov/valkey.info
genhtml --legend -q -o tmp/lcov/report tmp/lcov/valkey.info

noopt:
$(MAKE) OPTIMIZATION=""
Expand Down
Loading

0 comments on commit 612d9b6

Please sign in to comment.