Commit 419b6d29 authored by Greg Williams's avatar Greg Williams
Browse files

Merge commit '610ef4c8' into hotfix/0.8.2

parents 958c82cc 610ef4c8

Makefile

+24 −2
Original line number Diff line number Diff line
@@ -10,8 +10,9 @@ PUB_INC = ./include 
#===============================================================================

CC ?= gcc

OPTIMIZE = -O3

SYSTEM_TEST_HOST ?= \"localhost\"

WARN = -Wall -Wextra -Wstrict-prototypes -Wcast-align -pedantic -Wno-missing-field-initializers

CDEFS += -D_POSIX_C_SOURCE=199309L -D_C99_SOURCE=1

CDEFS += -D_POSIX_C_SOURCE=199309L -D_C99_SOURCE=1 -DSYSTEM_TEST_HOST=${SYSTEM_TEST_HOST}

CFLAGS += -std=c99 -fPIC -g $(WARN) $(CDEFS) $(OPTIMIZE)

LDFLAGS += -lm -lcrypto -lssl -lpthread
@@ -70,7 +71,7 @@ all: default test run examples 
clean: makedirs

	rm -rf ./bin/**/*

	rm -f $(OUT_DIR)/*.o *.core *.log

	rake clobber

	bundle exec rake clobber

	git submodule update --init

	-./vendor/kinetic-simulator/stopSimulator.sh &> /dev/null;
@@ -97,6 +98,8 @@ $(OUT_DIR)/protobuf-c.o: $(PROTOBUFC)/protobuf-c/protobuf-c.c $(PROTOBUFC)/proto 
	$(CC) -c -o $@ $< -std=c99 -fPIC -g -Wall -Wno-unused-parameter $(OPTIMIZE) -I$(PROTOBUFC)

${OUT_DIR}/kinetic_types.o: ${LIB_DIR}/kinetic_types_internal.h



${OUT_DIR}/*.o: src/lib/kinetic_types_internal.h





ci: uninstall all install

	@echo
@@ -256,6 +259,8 @@ run: $(UTIL_EXEC) start_simulator 
EXAMPLE_SRC = ./src/examples

EXAMPLE_LDFLAGS += -lm -l ssl $(KINETIC_LIB) -l crypto -l pthread

EXAMPLES = write_file_blocking

VALGRIND = valgrind

VALGRIND_ARGS = --track-origins=yes #--leak-check=full



example_sources = $(wildcard $(EXAMPLE_SRC)/*.c)

example_executables = $(patsubst $(EXAMPLE_SRC)/%.c,$(BIN_DIR)/examples/%,$(example_sources))
@@ -294,6 +299,15 @@ run_example_%: $(BIN_DIR)/examples/% 
	@echo ================================================================================

	@echo



valgrind_example_%: $(BIN_DIR)/examples/%

	@echo

	@echo ================================================================================

	@echo Executing example: '$<'

	@echo --------------------------------------------------------------------------------;

	${VALGRIND} ${VALGRIND_ARGS} $<

	@echo ================================================================================

	@echo



setup_examples: $(example_executables) \

	build_examples
@@ -304,3 +318,11 @@ examples: setup_examples \ 
	run_example_write_file_nonblocking \

	run_example_write_file_nonblocking_threads \

	stop_simulator



valgrind_examples: setup_examples \

	start_simulator \

	valgrind_example_write_file_blocking \

	valgrind_example_write_file_blocking_threads \

	valgrind_example_write_file_nonblocking \

	valgrind_example_write_file_nonblocking_threads \

	stop_simulator

RELEASE.md

+4 −0
Original line number Diff line number Diff line
@@ -31,3 +31,7 @@ v0.8.1 
* Still using Kinetic Protocol v3.0 (3.0.5)

    * NOT backwards compatible with earlier versions of Kinetic Protocol (< v3.0)

    * Kinetic device firmware must be updated to a release supporting v3.0 protocol!



v0.8.2

------

* Added FLUSHALLDATA operation.

Rakefile

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ compiler = ENV.fetch('CC', 'gcc') 
compiler_location = `which #{compiler}`.strip

compiler_info = `#{compiler} --version 2>&1`.strip



SYSTEM_TEST_HOST = ENV.fetch('SYSTEM_TEST_HOST', "localhost")



task :report_toolchain do

  report_banner("Toolchain Configuration")

config/VERSION

+1 −1
Original line number Diff line number Diff line 
0.8.1
 
0.8.2

config/project.yml

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
:defines:

  :commmon: &common_defines

    - TEST

    - SYSTEM_TEST_HOST=\"<%= ENV.fetch('SYSTEM_TEST_HOST', 'localhost') %>\"

  :test:

    - *common_defines

  :test_preprocess: