Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

bumped version and some Makefile tweaks

Browse source 
git-svn-id: https://zerberus.eonerc.rwth-aachen.de:8443/svn/s2ss/trunk@214 8ec27952-4edc-4aab-86aa-e87bb2611832
This commit is contained in:
Steffen Vogel 2014-09-07 16:29:01 +00:00
parent 26a50004a3
commit 9d0d4423d0
6 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
server/Makefile
View file

@ -13,24 +13,24 @@ test: node.o msg.o utils.o
VPATH = src
CC = gcc
RM = rm -f
DOXY = doxygen
# Debug level (if not set via 'make V=?')
# Default debug level
V ?= 2
# Some details about the compiled version
GIT_TAG = $(shell git describe --tags --abbrev=0)
GIT_REV = $(shell git rev-parse --short HEAD)
# Compiler and linker flags
LDFLAGS = -pthread -lrt -lm -lconfig
CFLAGS = -g -std=c99 -Iinclude/ -MMD -Wall
CFLAGS = -std=c99 -Iinclude/ -MMD -Wall
CFLAGS += -D_XOPEN_SOURCE=500 -D_GNU_SOURCE -DV=$(V)
CFLAGS += -D__GIT_REV__='"$(GIT_REV)"' -D__GIT_TAG__='"$(GIT_TAG)"'
CFLAGS += -D__GIT_REV__='"-$(shell git rev-parse --short HEAD)"'
# Conditional flags
ifdef DEBUG
CFLAGS += -g
else
CFLAGS += -O3
endif
.PHONY: all clean doc
.PHONY: all clean
clean:

2
server/include/config.h
View file

@ -12,7 +12,7 @@
#define _CONFIG_H_
/** The version number of the s2ss server */
#define VERSION __GIT_TAG__ "-" __GIT_REV__
#define VERSION "v0.4" __GIT_REV__
/** Maximum number of double values in a struct msg */
#define MAX_VALUES 16

2
server/src/random.c
View file

@ -35,7 +35,7 @@ int main(int argc, char *argv[])
printf("Usage: %s VALUES RATE\n", argv[0]);
printf(" VALUES is the number of values a message contains\n");
printf(" RATE how many messages per second\n\n");
printf("s2ss Simulator2Simulator Server v%s\n", VERSION);
printf("Simulator2Simulator Server %s (built on %s %s)\n", BLU(VERSION), MAG(__DATE__), MAG(__TIME__));
printf("Copyright 2014, Institute for Automation of Complex Power Systems, EONERC\n");
exit(EXIT_FAILURE);
}

2
server/src/receive.c
View file

@ -34,7 +34,7 @@ int main(int argc, char *argv[])
if (argc != 2) {
printf("Usage: %s LOCAL\n", argv[0]);
printf(" LOCAL is a IP:PORT combination of the local host\n\n");
printf("s2ss Simulator2Simulator Server v%s\n", VERSION);
printf("Simulator2Simulator Server %s (built on %s %s)\n", BLU(VERSION), MAG(__DATE__), MAG(__TIME__));
printf("Copyright 2014, Institute for Automation of Complex Power Systems, EONERC\n");
exit(EXIT_FAILURE);
}

2
server/src/send.c
View file

@ -36,7 +36,7 @@ int main(int argc, char *argv[])
printf(" REMOTE is a IP:PORT combination of the remote host\n");
printf(" LOCAL is an optional IP:PORT combination of the local host\n");
printf(" VALUES is the number of values to be read from stdin\n\n");
printf("s2ss Simulator2Simulator Server v%s\n", VERSION);
printf("Simulator2Simulator Server %s (built on %s %s)\n", BLU(VERSION), MAG(__DATE__), MAG(__TIME__));
printf("Copyright 2014, Institute for Automation of Complex Power Systems, EONERC\n");
exit(EXIT_FAILURE);
}

2
server/src/test.c
View file

@ -33,7 +33,7 @@ int main(int argc, char *argv[])
printf(" TEST has to be 'latency' for now\n");
printf(" LOCAL is a IP:PORT combination of the local host\n");
printf(" REMOTE is a IP:PORT combination of the remote host\n\n");
printf("s2ss Simulator2Simulator Server v%s\n", VERSION);
printf("Simulator2Simulator Server %s (built on %s %s)\n", BLU(VERSION), MAG(__DATE__), MAG(__TIME__));
printf("Copyright 2014, Institute for Automation of Complex Power Systems, EONERC\n");
exit(EXIT_FAILURE);
}