From f645e498e78df88bb0f6abe304d064c72556a4a9 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Mon, 23 Nov 2015 17:39:01 +0100 Subject: [PATCH] restructured repository --- .gitignore | 10 +- Makefile | 141 ++++++++++++------ README.md | 4 +- server/include/config.h => config.h | 0 {server/etc => etc}/armo-demo.conf | 0 {server/etc => etc}/example.conf | 0 {server/etc => etc}/loopback.conf | 0 {server/include => include}/cfg.h | 0 {server/include => include}/checks.h | 0 {server/include => include}/file.h | 0 {server/include => include}/gtfpga.h | 0 {server/include => include}/hist.h | 0 {server/include => include}/hooks.h | 0 {server/include => include}/if.h | 0 {server/include => include}/list.h | 0 {server/include => include}/log.h | 0 {server/include => include}/msg.h | 0 {server/include => include}/msg_format.h | 0 {server/include => include}/ngsi.h | 0 {server/include => include}/nl.h | 0 {server/include => include}/node.h | 0 {server/include => include}/opal.h | 0 {server/include => include}/path.h | 0 {server/include => include}/socket.h | 0 {server/include => include}/tc.h | 0 {server/include => include}/timing.h | 0 {server/include => include}/utils.h | 0 {server/src => lib}/checks.c | 0 {server/src => lib}/file.c | 0 {server/src => lib}/gtfpga.c | 0 {server/src => lib}/if.c | 0 {server/src => lib}/list.c | 0 {server/src => lib}/log.c | 0 {server/src => lib}/msg.c | 0 {server/src => lib}/ngsi.c | 0 {server/src => lib}/nl.c | 0 {server/src => lib}/node.c | 0 {server/src => lib}/opal.c | 0 {server/src => lib}/socket.c | 0 {server/src => lib}/tc.c | 0 {server/src => lib}/utils.c | 0 server/.gitignore | 12 -- server/Makefile | 109 -------------- {server/src => src}/cfg.c | 0 {server/src => src}/hist.c | 0 {server/src => src}/hooks.c | 0 {server/src => src}/path.c | 0 {server/src => src}/random.c | 0 {server/src => src}/receive.c | 0 {server/src => src}/send.c | 0 {server/src => src}/server.c | 0 {server/src => src}/test.c | 0 {server/src => src}/timing.c | 0 thirdparty/Makefile | 27 ++++ {contrib => thirdparty}/opal/README.txt | 0 .../opal/example/AsyncProcess | Bin .../opal/example/AsyncProcess.c | 0 .../opal/example/AsyncProcess.mk | 0 .../opal/include_target/AsyncApi.h | 0 .../include_target/OpalGenAsyncParamCtrl.h | 0 .../opal/include_target/OpalPrint.h | 0 .../opal/include_target/OpalTypes.h | 0 .../opal/lib/redhawk/libOpalAsyncApiCore.a | Bin .../opal/lib/redhawk/libOpalCore.a | Bin .../opal/lib/redhawk/libOpalUtils.a | Bin .../opal/lib/redhawk/libirc.a | Bin {contrib => tools}/fiware/fiware-query.sh | 0 {contrib => tools}/fiware/fiware-update.sh | 0 {contrib => tools}/python/.gitignore | 0 {contrib => tools}/python/README.md | 0 {contrib => tools}/python/file-filter.py | 0 {contrib => tools}/python/file-merge.py | 0 {contrib => tools}/python/s2ss/__init__.py | 0 {contrib => tools}/python/s2ss/msg.py | 0 {contrib => tools}/python/s2ss/ocb.py | 0 {contrib => tools}/python/s2ss/ts.py | 0 {contrib => tools}/tc/tc-dump.sh | 0 {contrib => tools}/tc/tc-netem.sh | 0 {contrib => tools}/tests.sh | 0 79 files changed, 133 insertions(+), 170 deletions(-) rename server/include/config.h => config.h (100%) rename {server/etc => etc}/armo-demo.conf (100%) rename {server/etc => etc}/example.conf (100%) rename {server/etc => etc}/loopback.conf (100%) rename {server/include => include}/cfg.h (100%) rename {server/include => include}/checks.h (100%) rename {server/include => include}/file.h (100%) rename {server/include => include}/gtfpga.h (100%) rename {server/include => include}/hist.h (100%) rename {server/include => include}/hooks.h (100%) rename {server/include => include}/if.h (100%) rename {server/include => include}/list.h (100%) rename {server/include => include}/log.h (100%) rename {server/include => include}/msg.h (100%) rename {server/include => include}/msg_format.h (100%) rename {server/include => include}/ngsi.h (100%) rename {server/include => include}/nl.h (100%) rename {server/include => include}/node.h (100%) rename {server/include => include}/opal.h (100%) rename {server/include => include}/path.h (100%) rename {server/include => include}/socket.h (100%) rename {server/include => include}/tc.h (100%) rename {server/include => include}/timing.h (100%) rename {server/include => include}/utils.h (100%) rename {server/src => lib}/checks.c (100%) rename {server/src => lib}/file.c (100%) rename {server/src => lib}/gtfpga.c (100%) rename {server/src => lib}/if.c (100%) rename {server/src => lib}/list.c (100%) rename {server/src => lib}/log.c (100%) rename {server/src => lib}/msg.c (100%) rename {server/src => lib}/ngsi.c (100%) rename {server/src => lib}/nl.c (100%) rename {server/src => lib}/node.c (100%) rename {server/src => lib}/opal.c (100%) rename {server/src => lib}/socket.c (100%) rename {server/src => lib}/tc.c (100%) rename {server/src => lib}/utils.c (100%) delete mode 100644 server/.gitignore delete mode 100644 server/Makefile rename {server/src => src}/cfg.c (100%) rename {server/src => src}/hist.c (100%) rename {server/src => src}/hooks.c (100%) rename {server/src => src}/path.c (100%) rename {server/src => src}/random.c (100%) rename {server/src => src}/receive.c (100%) rename {server/src => src}/send.c (100%) rename {server/src => src}/server.c (100%) rename {server/src => src}/test.c (100%) rename {server/src => src}/timing.c (100%) create mode 100644 thirdparty/Makefile rename {contrib => thirdparty}/opal/README.txt (100%) rename {contrib => thirdparty}/opal/example/AsyncProcess (100%) rename {contrib => thirdparty}/opal/example/AsyncProcess.c (100%) rename {contrib => thirdparty}/opal/example/AsyncProcess.mk (100%) rename {contrib => thirdparty}/opal/include_target/AsyncApi.h (100%) rename {contrib => thirdparty}/opal/include_target/OpalGenAsyncParamCtrl.h (100%) rename {contrib => thirdparty}/opal/include_target/OpalPrint.h (100%) rename {contrib => thirdparty}/opal/include_target/OpalTypes.h (100%) rename {contrib => thirdparty}/opal/lib/redhawk/libOpalAsyncApiCore.a (100%) rename {contrib => thirdparty}/opal/lib/redhawk/libOpalCore.a (100%) rename {contrib => thirdparty}/opal/lib/redhawk/libOpalUtils.a (100%) rename {contrib => thirdparty}/opal/lib/redhawk/libirc.a (100%) rename {contrib => tools}/fiware/fiware-query.sh (100%) rename {contrib => tools}/fiware/fiware-update.sh (100%) rename {contrib => tools}/python/.gitignore (100%) rename {contrib => tools}/python/README.md (100%) rename {contrib => tools}/python/file-filter.py (100%) rename {contrib => tools}/python/file-merge.py (100%) rename {contrib => tools}/python/s2ss/__init__.py (100%) rename {contrib => tools}/python/s2ss/msg.py (100%) rename {contrib => tools}/python/s2ss/ocb.py (100%) rename {contrib => tools}/python/s2ss/ts.py (100%) rename {contrib => tools}/tc/tc-dump.sh (100%) rename {contrib => tools}/tc/tc-netem.sh (100%) rename {contrib => tools}/tests.sh (100%) diff --git a/.gitignore b/.gitignore index d97a67800..cab687319 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,10 @@ +*.o +*.d +*.so *~ -thirdparty + +server +send +receive +test +random diff --git a/Makefile b/Makefile index 4fb56b87e..bedfed690 100644 --- a/Makefile +++ b/Makefile @@ -1,64 +1,111 @@ -# This Makefile is mainy used by Travis-CI +# Executables +TARGETS = server send random receive test -PREFIX=$(PWD)/thirdparty +# Libraries +LIBS = libs2ss.so -COMMIT=$(shell git rev-parse --short HEAD) +# Common objs +OBJS = path.o hooks.o cfg.o utils.o list.o hist.o log.o timing.o -.PHONY: dependencies build deploy test doc clean +# Object files for libs2ss +LIB_OBJS = msg.o node.o checks.o list.o -clean: - make -C server clean - rm -rf thirdparty - rm -rf documentation/{html,latex} +# Source directories +VPATH = src lib -# Install dependencies -dependencies: $(PREFIX)/libconfig-1.5 $(PREFIX)/libnl-3.2.25 $(PREFIX)/doxygen-1.8.10 $(PREFIX)/pciutils-3.4.0 +# Default debug level +V ?= 2 -# Download latest doxygen -$(PREFIX)/doxygen-1.8.10: - mkdir -p $(PREFIX) - wget -O- http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.10.linux.bin.tar.gz | tar xzC $(PREFIX) +GIT_REV=$(shell git rev-parse --short HEAD) -# Install & compile libconfig dependency -$(PREFIX)/libconfig-1.5: - mkdir -p $(PREFIX)/usr/ - wget -O- http://www.hyperrealm.com/libconfig/libconfig-1.5.tar.gz | tar -xzC $(PREFIX) - cd $(PREFIX)/libconfig-1.5 && ./configure --prefix=$(PREFIX)/usr/ --disable-examples && make install +# Compiler and linker flags +CC = gcc +LDLIBS = -pthread -lrt -lm -lconfig -ls2ss -# Install & compile libnl3 dependency -$(PREFIX)/libnl-3.2.25: - mkdir -p $(PREFIX)/usr/ - wget -O- http://www.infradead.org/~tgr/libnl/files/libnl-3.2.25.tar.gz | tar -xzC $(PREFIX) - cd $(PREFIX)/libnl-3.2.25 && ./configure --prefix=$(PREFIX)/usr/ --disable-cli && make install +CFLAGS += -std=gnu99 -Iinclude/ -I. -MMD -Wall -D_GIT_REV='"$(GIT_REV)"' -D_POSIX_C_SOURCE=200809L -D_GNU_SOURCE=1 -DV=$(V) +LDFLAGS += -Wl,-L.,-rpath,'$$ORIGIN' -# Install & compile libpci dependency -$(PREFIX)/pciutils-3.4.0: - mkdir -p $(PREFIX)/usr/ - wget -O- ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-3.4.0.tar.gz | tar -xzC $(PREFIX) - cd $(PREFIX)/pciutils-3.4.0 && make && make install-lib PREFIX=$(PREFIX)/usr/ +# Add more compiler flags +ifdef DEBUG + CFLAGS += -O0 -g +else + CFLAGS += -O3 +endif -# Compile S2SS server -build: dependencies - CFLAGS=-I$(PREFIX)/usr/include/ \ - LDFLAGS=-Wl,-L$(PREFIX)/usr/lib/ \ - NLDIR=$(PREFIX)/usr/include/libnl3/ \ - PCIDIR=$(PREFIX)/usr/include \ - make -C server +######## Node types ######## -# Test S2SS server by running it for 3 secs -test: build - LD_LIBRARY_PATH=$(PREFIX)/usr/lib/ \ - timeout --signal INT --preserve-status 3s \ - server/server server/etc/loopback.conf || true +# Enable file node type support +ifndef DISABLE_FILE + LIB_OBJS += file.o +endif -# Deploy -deploy: build +# Enable Socket node type when libnl3 is available +ifeq ($(shell pkg-config libnl-3.0; echo $$?),0) + LIB_OBJS += socket.o nl.o tc.o if.o + LIB_CFLAGS += $(shell pkg-config --cflags libnl-3.0) + LIB_LDLIBS += -lnl-3 -lnl-route-3 +endif + +# Enable GTFPGA support when libpci is available +ifeq ($(shell pkg-config libpci; echo $$?),0) + LIB_OBJS += gtfpga.o + LIB_CFLAGS += $(shell pkg-config --cflags libpci) + LIB_LDLIBS += $(shell pkg-config --libs libpci) +endif + +# Enable NGSI support +ifeq ($(shell pkg-config libcurl jansson uuid; echo $$?),0) + LIB_OBJS += ngsi.o + LIB_CFLAGS += $(shell pkg-config --cflags libcurl jansson uuid) + LIB_LDLIBS += $(shell pkg-config --libs libcurl jansson uuid) +endif + +# Enable OPAL-RT Asynchronous Process support (will result in 32bit binary!!!) +ifneq (,$(wildcard $(OPALDIR)/include_target/AsyncApi.h)) + LIB_OBJS += opal.o + LIB_CFLAGS += -m32 -I$(OPALDIR)/include_target + LIB_LDFLAGS += -m32 -Wl,-L/lib/i386-linux-gnu/,-L/usr/lib/i386-linux-gnu/,-L$(OPALDIR)/lib/redhawk/ + LIB_LDLIBS += -lOpalAsyncApiCore -lOpalCore -lOpalUtils -lirc +endif + +######## Targets ######## + +.PHONY: all clean install release + +# Default target: build everything +all: $(LIBS) $(TARGETS) + +# Dependencies for individual binaries +server: server.o $(OBJS) +send: send.o $(OBJS) +receive: receive.o $(OBJS) +test: test.o $(OBJS) +random: random.o msg.o utils.o timing.o log.o + +# Libraries +libs2ss.so: CFLAGS += -fPIC $(LIB_CFLAGS) +libs2ss.so: $(LIB_OBJS) + $(CC) $(LIB_LDFLAGS) $(LIB_LDLIBS) -shared -o $@ $^ + +# Common targets +install: $(TARGETS) + install -m 0644 libs2ss.so $(PREFIX)/lib + install -m 0755 server -T $(PREFIX)/bin/s2ss + install -m 0755 send $(PREFIX)/bin/s2ss-send + install -m 0755 receive $(PREFIX)/bin/s2ss-receive + install -m 0755 random $(PREFIX)/bin/s2ss-random + install -m 0755 test $(PREFIX)/bin/s2ss-test + +release: all tar czf s2ss-$(COMMIT)-docs.tar.gz documentation/html/ tar czf s2ss-$(COMMIT).tar.gz server/server server/test server/send server/receive server/random server/etc/ rsync *.tar.gz $(DEPLOY_USER)@$(DEPLOY_HOST):$(DEPLOY_PATH)/ rsync --archive --delete documentation/html/ $(DEPLOY_USER)@$(DEPLOY_HOST):$(DEPLOY_PATH)/doc/ -# Generate documentation -doc: $(PREFIX)/doxygen-1.8.10 - PATH=$(PREFIX)/doxygen-1.8.10/bin/:$(PATH) \ - doxygen +clean: + $(RM) *~ *.o *.d *.so + $(RM) $(TARGETS) + $(RM) -rf doc/{html,latex} + +# Include auto-generated dependencies +-include $(wildcard *.d) diff --git a/README.md b/README.md index 44449ab14..50a87a12a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ -# Simulator to Simulator Server [![Travis-CI](https://magnum.travis-ci.com/RWTH-ACS/S2SS.svg?token=9zFzh6dGWonz6LyBspW3&branch=master)](https://magnum.travis-ci.com/RWTH-ACS/S2SS) +# Simulator to Simulator Server + +[![Travis-CI](https://magnum.travis-ci.com/RWTH-ACS/S2SS.svg?token=9zFzh6dGWonz6LyBspW3&branch=master)](https://magnum.travis-ci.com/RWTH-ACS/S2SS) This is S2SS, a gateway to forward and process simulation data between real time simulators. diff --git a/server/include/config.h b/config.h similarity index 100% rename from server/include/config.h rename to config.h diff --git a/server/etc/armo-demo.conf b/etc/armo-demo.conf similarity index 100% rename from server/etc/armo-demo.conf rename to etc/armo-demo.conf diff --git a/server/etc/example.conf b/etc/example.conf similarity index 100% rename from server/etc/example.conf rename to etc/example.conf diff --git a/server/etc/loopback.conf b/etc/loopback.conf similarity index 100% rename from server/etc/loopback.conf rename to etc/loopback.conf diff --git a/server/include/cfg.h b/include/cfg.h similarity index 100% rename from server/include/cfg.h rename to include/cfg.h diff --git a/server/include/checks.h b/include/checks.h similarity index 100% rename from server/include/checks.h rename to include/checks.h diff --git a/server/include/file.h b/include/file.h similarity index 100% rename from server/include/file.h rename to include/file.h diff --git a/server/include/gtfpga.h b/include/gtfpga.h similarity index 100% rename from server/include/gtfpga.h rename to include/gtfpga.h diff --git a/server/include/hist.h b/include/hist.h similarity index 100% rename from server/include/hist.h rename to include/hist.h diff --git a/server/include/hooks.h b/include/hooks.h similarity index 100% rename from server/include/hooks.h rename to include/hooks.h diff --git a/server/include/if.h b/include/if.h similarity index 100% rename from server/include/if.h rename to include/if.h diff --git a/server/include/list.h b/include/list.h similarity index 100% rename from server/include/list.h rename to include/list.h diff --git a/server/include/log.h b/include/log.h similarity index 100% rename from server/include/log.h rename to include/log.h diff --git a/server/include/msg.h b/include/msg.h similarity index 100% rename from server/include/msg.h rename to include/msg.h diff --git a/server/include/msg_format.h b/include/msg_format.h similarity index 100% rename from server/include/msg_format.h rename to include/msg_format.h diff --git a/server/include/ngsi.h b/include/ngsi.h similarity index 100% rename from server/include/ngsi.h rename to include/ngsi.h diff --git a/server/include/nl.h b/include/nl.h similarity index 100% rename from server/include/nl.h rename to include/nl.h diff --git a/server/include/node.h b/include/node.h similarity index 100% rename from server/include/node.h rename to include/node.h diff --git a/server/include/opal.h b/include/opal.h similarity index 100% rename from server/include/opal.h rename to include/opal.h diff --git a/server/include/path.h b/include/path.h similarity index 100% rename from server/include/path.h rename to include/path.h diff --git a/server/include/socket.h b/include/socket.h similarity index 100% rename from server/include/socket.h rename to include/socket.h diff --git a/server/include/tc.h b/include/tc.h similarity index 100% rename from server/include/tc.h rename to include/tc.h diff --git a/server/include/timing.h b/include/timing.h similarity index 100% rename from server/include/timing.h rename to include/timing.h diff --git a/server/include/utils.h b/include/utils.h similarity index 100% rename from server/include/utils.h rename to include/utils.h diff --git a/server/src/checks.c b/lib/checks.c similarity index 100% rename from server/src/checks.c rename to lib/checks.c diff --git a/server/src/file.c b/lib/file.c similarity index 100% rename from server/src/file.c rename to lib/file.c diff --git a/server/src/gtfpga.c b/lib/gtfpga.c similarity index 100% rename from server/src/gtfpga.c rename to lib/gtfpga.c diff --git a/server/src/if.c b/lib/if.c similarity index 100% rename from server/src/if.c rename to lib/if.c diff --git a/server/src/list.c b/lib/list.c similarity index 100% rename from server/src/list.c rename to lib/list.c diff --git a/server/src/log.c b/lib/log.c similarity index 100% rename from server/src/log.c rename to lib/log.c diff --git a/server/src/msg.c b/lib/msg.c similarity index 100% rename from server/src/msg.c rename to lib/msg.c diff --git a/server/src/ngsi.c b/lib/ngsi.c similarity index 100% rename from server/src/ngsi.c rename to lib/ngsi.c diff --git a/server/src/nl.c b/lib/nl.c similarity index 100% rename from server/src/nl.c rename to lib/nl.c diff --git a/server/src/node.c b/lib/node.c similarity index 100% rename from server/src/node.c rename to lib/node.c diff --git a/server/src/opal.c b/lib/opal.c similarity index 100% rename from server/src/opal.c rename to lib/opal.c diff --git a/server/src/socket.c b/lib/socket.c similarity index 100% rename from server/src/socket.c rename to lib/socket.c diff --git a/server/src/tc.c b/lib/tc.c similarity index 100% rename from server/src/tc.c rename to lib/tc.c diff --git a/server/src/utils.c b/lib/utils.c similarity index 100% rename from server/src/utils.c rename to lib/utils.c diff --git a/server/.gitignore b/server/.gitignore deleted file mode 100644 index aff5c0002..000000000 --- a/server/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -logs/ - -*.d -*.o -*.so -*~ - -server -test -send -receive -random diff --git a/server/Makefile b/server/Makefile deleted file mode 100644 index de3cc2096..000000000 --- a/server/Makefile +++ /dev/null @@ -1,109 +0,0 @@ -# Executables -TARGETS = server send random receive test - -# Libraries -LIBS = libs2ss.so - -# Common objs -OBJS = path.o hooks.o cfg.o utils.o list.o hist.o log.o timing.o checks.o - -# Object files for libs2ss -LIB_OBJS = msg.o node.o checks.o list.o - -# Source directories -VPATH = src lib - -# Default debug level -V ?= 2 - -# Compiler and linker flags -CC = gcc -LDLIBS = -pthread -lrt -lm -lconfig -ls2ss -LDFLAGS = -Wl,-L. - -CFLAGS += -std=gnu99 -Iinclude/ -MMD -Wall -CFLAGS += -D_POSIX_C_SOURCE=200809L -D_GNU_SOURCE=1 -DV=$(V) - -# Add more compiler flags -ifdef DEBUG - CFLAGS += -O0 -g -else - CFLAGS += -O3 -endif - -ifneq (,$(shell which git)) - CFLAGS += -D_GIT_REV='"$(shell git rev-parse --short HEAD)"' -endif - -######## Node types ######## - -# Enable file node type support -ifndef DISABLE_FILE - LIB_OBJS += file.o -endif - -# Enable Socket node type when libnl3 is available -ifeq ($(shell pkg-config libnl-3.0; echo $$?),0) - LIB_OBJS += socket.o nl.o tc.o if.o - LIB_CFLAGS += $(shell pkg-config --cflags libnl-3.0) - LIB_LDLIBS += -lnl-3 -lnl-route-3 -endif - -# Enable GTFPGA support when libpci is available -ifeq ($(shell pkg-config libpci; echo $$?),0) - LIB_OBJS += gtfpga.o - LIB_CFLAGS += $(shell pkg-config --cflags libpci) - LIB_LDLIBS += $(shell pkg-config --libs libpci) -endif - -# Enable NGSI support -ifeq ($(shell pkg-config libcurl jansson uuid; echo $$?),0) - LIB_OBJS += ngsi.o - LIB_CFLAGS += $(shell pkg-config --cflags libcurl jansson uuid) - LIB_LDLIBS += $(shell pkg-config --libs libcurl jansson uuid) -endif - -# Enable OPAL-RT Asynchronous Process support (will result in 32bit binary!!!) -ifneq (,$(wildcard $(OPALDIR)/include_target/AsyncApi.h)) - LIB_OBJS += opal.o - LIB_CFLAGS += -m32 -I$(OPALDIR)/include_target - LIB_LDFLAGS += -m32 -Wl,-L/lib/i386-linux-gnu/,-L/usr/lib/i386-linux-gnu/,-L$(OPALDIR)/lib/redhawk/ - LIB_LDLIBS += -lOpalAsyncApiCore -lOpalCore -lOpalUtils -lirc -endif - -######## Targets ######## - -.PHONY: all clean install - -# Default target: build everything -all: $(LIBS) $(TARGETS) - -# Dependencies for individual binaries -server: server.o $(OBJS) -send: send.o $(OBJS) -receive: receive.o $(OBJS) -test: test.o $(OBJS) -random: random.o msg.o utils.o timing.o log.o - -lib/%.o: - $(CC) $(LIB_CFLAGS) -o $@ $^ - -libs2ss.so: CFLAGS += -fPIC $(LIB_CFLAGS) -libs2ss.so: $(LIB_OBJS) - $(CC) $(LIB_LDFLAGS) $(LIB_LDLIBS) -shared -o $@ $^ - -# Common targets -install: $(TARGETS) - install -m 0644 libs2ss.so $(PREFIX)/lib - install -m 0755 server -T $(PREFIX)/bin/s2ss - install -m 0755 send $(PREFIX)/bin/s2ss-send - install -m 0755 receive $(PREFIX)/bin/s2ss-receive - install -m 0755 random $(PREFIX)/bin/s2ss-random - install -m 0755 test $(PREFIX)/bin/s2ss-test - -clean: - $(RM) *~ *.o *.d *.so - $(RM) $(TARGETS) - -# Include auto-generated dependencies --include $(wildcard *.d) diff --git a/server/src/cfg.c b/src/cfg.c similarity index 100% rename from server/src/cfg.c rename to src/cfg.c diff --git a/server/src/hist.c b/src/hist.c similarity index 100% rename from server/src/hist.c rename to src/hist.c diff --git a/server/src/hooks.c b/src/hooks.c similarity index 100% rename from server/src/hooks.c rename to src/hooks.c diff --git a/server/src/path.c b/src/path.c similarity index 100% rename from server/src/path.c rename to src/path.c diff --git a/server/src/random.c b/src/random.c similarity index 100% rename from server/src/random.c rename to src/random.c diff --git a/server/src/receive.c b/src/receive.c similarity index 100% rename from server/src/receive.c rename to src/receive.c diff --git a/server/src/send.c b/src/send.c similarity index 100% rename from server/src/send.c rename to src/send.c diff --git a/server/src/server.c b/src/server.c similarity index 100% rename from server/src/server.c rename to src/server.c diff --git a/server/src/test.c b/src/test.c similarity index 100% rename from server/src/test.c rename to src/test.c diff --git a/server/src/timing.c b/src/timing.c similarity index 100% rename from server/src/timing.c rename to src/timing.c diff --git a/thirdparty/Makefile b/thirdparty/Makefile new file mode 100644 index 000000000..2245ede20 --- /dev/null +++ b/thirdparty/Makefile @@ -0,0 +1,27 @@ +.PHONY: dependencies + +# Install dependencies +dependencies: libconfig-1.5 libnl-3.2.25 doxygen-1.8.10 pciutils-3.4.0 + +# Download latest doxygen +doxygen-1.8.10: + mkdir -p $(PREFIX) + wget -O- http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.10.linux.bin.tar.gz | tar xzC $(PREFIX) + +# Install & compile libconfig dependency +libconfig-1.5: + mkdir -p $(PREFIX)/usr/ + wget -O- http://www.hyperrealm.com/libconfig/libconfig-1.5.tar.gz | tar -xzC $(PREFIX) + cd libconfig-1.5 && ./configure --prefix=$(PWD)/usr/ --disable-examples && make install + +# Install & compile libnl3 dependency +libnl-3.2.25: + mkdir -p $(PREFIX)/usr/ + wget -O- http://www.infradead.org/~tgr/libnl/files/libnl-3.2.25.tar.gz | tar -xzC $(PREFIX) + cd libnl-3.2.25 && ./configure --prefix=$(PWD)/usr/ --disable-cli && make install + +# Install & compile libpci dependency +pciutils-3.4.0: + mkdir -p $(PREFIX)/usr/ + wget -O- ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-3.4.0.tar.gz | tar -xzC $(PREFIX) + cd pciutils-3.4.0 && make && make install-lib PREFIX=$(PWD)/usr/ \ No newline at end of file diff --git a/contrib/opal/README.txt b/thirdparty/opal/README.txt similarity index 100% rename from contrib/opal/README.txt rename to thirdparty/opal/README.txt diff --git a/contrib/opal/example/AsyncProcess b/thirdparty/opal/example/AsyncProcess similarity index 100% rename from contrib/opal/example/AsyncProcess rename to thirdparty/opal/example/AsyncProcess diff --git a/contrib/opal/example/AsyncProcess.c b/thirdparty/opal/example/AsyncProcess.c similarity index 100% rename from contrib/opal/example/AsyncProcess.c rename to thirdparty/opal/example/AsyncProcess.c diff --git a/contrib/opal/example/AsyncProcess.mk b/thirdparty/opal/example/AsyncProcess.mk similarity index 100% rename from contrib/opal/example/AsyncProcess.mk rename to thirdparty/opal/example/AsyncProcess.mk diff --git a/contrib/opal/include_target/AsyncApi.h b/thirdparty/opal/include_target/AsyncApi.h similarity index 100% rename from contrib/opal/include_target/AsyncApi.h rename to thirdparty/opal/include_target/AsyncApi.h diff --git a/contrib/opal/include_target/OpalGenAsyncParamCtrl.h b/thirdparty/opal/include_target/OpalGenAsyncParamCtrl.h similarity index 100% rename from contrib/opal/include_target/OpalGenAsyncParamCtrl.h rename to thirdparty/opal/include_target/OpalGenAsyncParamCtrl.h diff --git a/contrib/opal/include_target/OpalPrint.h b/thirdparty/opal/include_target/OpalPrint.h similarity index 100% rename from contrib/opal/include_target/OpalPrint.h rename to thirdparty/opal/include_target/OpalPrint.h diff --git a/contrib/opal/include_target/OpalTypes.h b/thirdparty/opal/include_target/OpalTypes.h similarity index 100% rename from contrib/opal/include_target/OpalTypes.h rename to thirdparty/opal/include_target/OpalTypes.h diff --git a/contrib/opal/lib/redhawk/libOpalAsyncApiCore.a b/thirdparty/opal/lib/redhawk/libOpalAsyncApiCore.a similarity index 100% rename from contrib/opal/lib/redhawk/libOpalAsyncApiCore.a rename to thirdparty/opal/lib/redhawk/libOpalAsyncApiCore.a diff --git a/contrib/opal/lib/redhawk/libOpalCore.a b/thirdparty/opal/lib/redhawk/libOpalCore.a similarity index 100% rename from contrib/opal/lib/redhawk/libOpalCore.a rename to thirdparty/opal/lib/redhawk/libOpalCore.a diff --git a/contrib/opal/lib/redhawk/libOpalUtils.a b/thirdparty/opal/lib/redhawk/libOpalUtils.a similarity index 100% rename from contrib/opal/lib/redhawk/libOpalUtils.a rename to thirdparty/opal/lib/redhawk/libOpalUtils.a diff --git a/contrib/opal/lib/redhawk/libirc.a b/thirdparty/opal/lib/redhawk/libirc.a similarity index 100% rename from contrib/opal/lib/redhawk/libirc.a rename to thirdparty/opal/lib/redhawk/libirc.a diff --git a/contrib/fiware/fiware-query.sh b/tools/fiware/fiware-query.sh similarity index 100% rename from contrib/fiware/fiware-query.sh rename to tools/fiware/fiware-query.sh diff --git a/contrib/fiware/fiware-update.sh b/tools/fiware/fiware-update.sh similarity index 100% rename from contrib/fiware/fiware-update.sh rename to tools/fiware/fiware-update.sh diff --git a/contrib/python/.gitignore b/tools/python/.gitignore similarity index 100% rename from contrib/python/.gitignore rename to tools/python/.gitignore diff --git a/contrib/python/README.md b/tools/python/README.md similarity index 100% rename from contrib/python/README.md rename to tools/python/README.md diff --git a/contrib/python/file-filter.py b/tools/python/file-filter.py similarity index 100% rename from contrib/python/file-filter.py rename to tools/python/file-filter.py diff --git a/contrib/python/file-merge.py b/tools/python/file-merge.py similarity index 100% rename from contrib/python/file-merge.py rename to tools/python/file-merge.py diff --git a/contrib/python/s2ss/__init__.py b/tools/python/s2ss/__init__.py similarity index 100% rename from contrib/python/s2ss/__init__.py rename to tools/python/s2ss/__init__.py diff --git a/contrib/python/s2ss/msg.py b/tools/python/s2ss/msg.py similarity index 100% rename from contrib/python/s2ss/msg.py rename to tools/python/s2ss/msg.py diff --git a/contrib/python/s2ss/ocb.py b/tools/python/s2ss/ocb.py similarity index 100% rename from contrib/python/s2ss/ocb.py rename to tools/python/s2ss/ocb.py diff --git a/contrib/python/s2ss/ts.py b/tools/python/s2ss/ts.py similarity index 100% rename from contrib/python/s2ss/ts.py rename to tools/python/s2ss/ts.py diff --git a/contrib/tc/tc-dump.sh b/tools/tc/tc-dump.sh similarity index 100% rename from contrib/tc/tc-dump.sh rename to tools/tc/tc-dump.sh diff --git a/contrib/tc/tc-netem.sh b/tools/tc/tc-netem.sh similarity index 100% rename from contrib/tc/tc-netem.sh rename to tools/tc/tc-netem.sh diff --git a/contrib/tests.sh b/tools/tests.sh similarity index 100% rename from contrib/tests.sh rename to tools/tests.sh