Commit b40b0294 authored by Matteo Quintiliani's avatar Matteo Quintiliani
Browse files

Merge branch 'hotfix/1.10.2'

parents 0bb815ad 4f53d53d
Pipeline #3016 failed with stages
in 2 minutes and 10 seconds
......@@ -2,7 +2,7 @@
ew2openapi Release History
#########################
* Release 1.10.1 (2018/06/12)
* Release 1.10.2 (2018/06/11)
- Remove dependency from EW_LOG and logit() when run as stand-alone mode. Issue #15 (2018/04/24)
- Handle mutual use of sending messages to Webservice or RabbitMQ. Issue #16 (2018/04/24)
- Start developing error exception for RabbitMQ. Issue #17 (2018/04/24)
......@@ -11,6 +11,7 @@ ew2openapi Release History
- Add TYPE_STRONGMOTIONII JSON conversion. Issue #19 (2018/05/22)
- Upgrade json-c to 0.13.1. Issue #23 (2018/06/08)
- Hotfix 1.10.1: Fix curl LDFLAGS in makefile.unix. (2018/06/11)
- Hotfix 1.10.2: Improve and clean makefile.unix. (2018/06/11)
* Release 1.9.1 (2018/04/20)
- Add handler for classifying HTTP CODE and manage errors to retry or not to POST message. Issue #13 (2018/04/20)
......
1.10.1 - 2018-06-12
\ No newline at end of file
1.10.2 - 2018-06-11
\ No newline at end of file
......@@ -4,40 +4,31 @@
CC = gcc
# json-c directory
JSONCDIR = ./json-c
# rabbitmq-c directory
RABBITMQDIR = ./rabbitmq-c
LINUX_FLAGS=-lpthread -fstack-check -Wall -lm
SOLARIS_FLAGS=-mt -lposix4 -lthread -lpthread -lsocket -lnsl -lm
SPECIFIC_FLAGS_STATIC=$($(PLATFORM)_FLAGS)
SPECIFIC_FLAGS=$($(PLATFORM)_FLAGS) -lrabbitmq -ljson-c
LINUX_CFLAGS=-Wall
SOLARIS_CFLAGS=
SPECIFIC_CFLAGS=$($(PLATFORM)_CFLAGS)
SPECIFIC_FLAGS = $($(PLATFORM)_FLAGS) -lrabbitmq -ljson-c
SPECIFIC_FLAGS_STATIC = $(RABBITMQDIR)/build/librabbitmq/librabbitmq.a $(JSONCDIR)/build/lib/libjson-c.a $($(PLATFORM)_FLAGS)
CFLAGS = -D_REENTRANT $(GLOBALFLAGS) $(SPECIFIC_CFLAGS)
LINUX_CFLAGS = -Wall
SOLARIS_CFLAGS =
SPECIFIC_CFLAGS = $($(PLATFORM)_CFLAGS)
CFLAGS += -g
JSONCDIR = ./json-c
# RABBITMQDIR = /Users/mtheo/svnwork/rabbitmq-c-m32
# RABBITMQDIR = /space/devel/soft/rabbitmq-c-master-m32
# curl flags
CFLAGS_CURL = `curl-config --cflags`
LDFLAGS_CURL = `curl-config --libs`
RABBITMQDIR = ./rabbitmq-c
CFLAGS += -I$(RABBITMQDIR)/librabbitmq -I$(JSONCDIR)/build/include
CFLAGS += $(CFLAGS_CURL)
LDFLAGS += -L$(RABBITMQDIR)/build/librabbitmq -L$(JSONCDIR)/build/lib
LDFLAGS += $(LDFLAGS_CURL)
LDFLAGS_STATIC = $(LDFLAGS)
LDFLAGS_CURL_STATIC = `curl-config --static-libs`
# MYSQL_CONNECTOR_C_PATH_BUILD = $(EW_HOME)/$(EW_VERSION)/src/archiving/rabbit/mysql-connector-c-build
# In case of need, change MYSQL_CONNECTOR_C_PATH_BUILD with the appropriate path to 32bit mysql_config executable
# MYSQL_CONNECTOR_C_PATH_BUILD = /usr
# MYSQL_CONNECTOR_C_PATH_BUILD = /opt/local/lib/mysql5
# MYSQL_CONFIG_PROG_PATH = $(MYSQL_CONNECTOR_C_PATH_BUILD)/bin
# MYSQL_CONFIG_PROG = $(MYSQL_CONFIG_PROG_PATH)/mysql_config
CFLAGS = -D_REENTRANT $(GLOBALFLAGS) $(SPECIFIC_CFLAGS)
CFLAGS += -g
CFLAGS += -I$(RABBITMQDIR)/librabbitmq -I$(JSONCDIR)/build/include $(CFLAGS_CURL)
# CFLAGS += `$(MYSQL_CONFIG_PROG) --cflags`
LDFLAGS += -L$(RABBITMQDIR)/build/librabbitmq -L$(JSONCDIR)/build/lib
APP = ew2openapi
S = ./src
......@@ -85,10 +76,10 @@ all: dynamic
dynamic: $B/$(APP)
static: $(BINARIES) $(HEADERS)
$(CC) -o $B/ew2openapi $(CFLAGS) $(BINARIES) $(LDFLAGS_STATIC) $(RABBITMQDIR)/build/librabbitmq/librabbitmq.a $(JSONCDIR)/build/lib/libjson-c.a $(SPECIFIC_FLAGS_STATIC)
$(CC) -o $B/ew2openapi $(CFLAGS) $(BINARIES) $(LDFLAGS) $(LDFLAGS_CURL_STATIC) $(SPECIFIC_FLAGS_STATIC)
$B/$(APP): $(BINARIES) $(HEADERS)
$(CC) -o $B/ew2openapi $(CFLAGS) $(BINARIES) $(LDFLAGS) $(SPECIFIC_FLAGS)
$(CC) -o $B/ew2openapi $(CFLAGS) $(BINARIES) $(LDFLAGS) $(LDFLAGS_CURL) $(SPECIFIC_FLAGS)
$(S)/%.o : %.c
$(CC) $(CFLAGS) -c $<
......
/* DO NOT EDIT. Automatically generated. Change file HISTORY in ew2openapi_version main directory. */
#define EW2OPENAPI_VERSION "1.10.1 - 2018-06-12"
#define EW2OPENAPI_VERSION "1.10.2 - 2018-06-11"
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment