From a481e674283a077c09ac51290dce929b42c5e444 Mon Sep 17 00:00:00 2001 From: Andrej Babic Date: Thu, 12 Jul 2018 10:51:47 +0200 Subject: [PATCH] Reorder the repository --- Makefile => lib/Makefile | 0 {conda-recipe => lib}/build.sh | 2 +- {include => lib/include}/crow_all.h | 0 {include => lib/include}/date.h | 0 {conda-recipe => lib}/meta.yaml | 0 {src => lib/src}/H5Format.cpp | 0 {src => lib/src}/H5Format.hpp | 0 {src => lib/src}/H5Writer.cpp | 0 {src => lib/src}/H5Writer.hpp | 0 {src => lib/src}/ProcessManager.cpp | 0 {src => lib/src}/ProcessManager.hpp | 0 {src => lib/src}/RestApi.cpp | 0 {src => lib/src}/RestApi.hpp | 0 {src => lib/src}/RingBuffer.cpp | 0 {src => lib/src}/RingBuffer.hpp | 0 {src => lib/src}/WriterManager.cpp | 0 {src => lib/src}/WriterManager.hpp | 0 {src => lib/src}/ZmqReceiver.cpp | 0 {src => lib/src}/ZmqReceiver.hpp | 0 {src => lib/src}/config.cpp | 0 {src => lib/src}/config.hpp | 0 {test => lib/test}/test_ZmqReceiver.cpp | 0 {test => lib/test}/test_main.cpp | 0 {impl/sf_alvra => sf_alvra}/AlvraFormat.cpp | 0 {impl/sf_alvra => sf_alvra}/Makefile | 2 +- {impl/sf_alvra => sf_alvra}/alvra_h5_writer.cpp | 0 {impl/sf_alvra => sf_alvra}/conda-recipe/build.sh | 0 {impl/sf_alvra => sf_alvra}/conda-recipe/meta.yaml | 0 {impl/sf_bernina => sf_bernina}/BerninaFormat.cpp | 0 {impl/sf_bernina => sf_bernina}/Makefile | 0 {impl/sf_bernina => sf_bernina}/bernina_h5_writer.cpp | 0 {impl/sf_bernina => sf_bernina}/conda-recipe/build.sh | 0 {impl/sf_bernina => sf_bernina}/conda-recipe/meta.yaml | 0 33 files changed, 2 insertions(+), 2 deletions(-) rename Makefile => lib/Makefile (100%) rename {conda-recipe => lib}/build.sh (93%) rename {include => lib/include}/crow_all.h (100%) rename {include => lib/include}/date.h (100%) rename {conda-recipe => lib}/meta.yaml (100%) rename {src => lib/src}/H5Format.cpp (100%) rename {src => lib/src}/H5Format.hpp (100%) rename {src => lib/src}/H5Writer.cpp (100%) rename {src => lib/src}/H5Writer.hpp (100%) rename {src => lib/src}/ProcessManager.cpp (100%) rename {src => lib/src}/ProcessManager.hpp (100%) rename {src => lib/src}/RestApi.cpp (100%) rename {src => lib/src}/RestApi.hpp (100%) rename {src => lib/src}/RingBuffer.cpp (100%) rename {src => lib/src}/RingBuffer.hpp (100%) rename {src => lib/src}/WriterManager.cpp (100%) rename {src => lib/src}/WriterManager.hpp (100%) rename {src => lib/src}/ZmqReceiver.cpp (100%) rename {src => lib/src}/ZmqReceiver.hpp (100%) rename {src => lib/src}/config.cpp (100%) rename {src => lib/src}/config.hpp (100%) rename {test => lib/test}/test_ZmqReceiver.cpp (100%) rename {test => lib/test}/test_main.cpp (100%) rename {impl/sf_alvra => sf_alvra}/AlvraFormat.cpp (100%) rename {impl/sf_alvra => sf_alvra}/Makefile (88%) rename {impl/sf_alvra => sf_alvra}/alvra_h5_writer.cpp (100%) rename {impl/sf_alvra => sf_alvra}/conda-recipe/build.sh (100%) rename {impl/sf_alvra => sf_alvra}/conda-recipe/meta.yaml (100%) rename {impl/sf_bernina => sf_bernina}/BerninaFormat.cpp (100%) rename {impl/sf_bernina => sf_bernina}/Makefile (100%) rename {impl/sf_bernina => sf_bernina}/bernina_h5_writer.cpp (100%) rename {impl/sf_bernina => sf_bernina}/conda-recipe/build.sh (100%) rename {impl/sf_bernina => sf_bernina}/conda-recipe/meta.yaml (100%) diff --git a/Makefile b/lib/Makefile similarity index 100% rename from Makefile rename to lib/Makefile diff --git a/conda-recipe/build.sh b/lib/build.sh similarity index 93% rename from conda-recipe/build.sh rename to lib/build.sh index 8b2a655..a032b4a 100644 --- a/conda-recipe/build.sh +++ b/lib/build.sh @@ -1,4 +1,4 @@ -make +make $1 cp bin/* ${PREFIX}/lib diff --git a/include/crow_all.h b/lib/include/crow_all.h similarity index 100% rename from include/crow_all.h rename to lib/include/crow_all.h diff --git a/include/date.h b/lib/include/date.h similarity index 100% rename from include/date.h rename to lib/include/date.h diff --git a/conda-recipe/meta.yaml b/lib/meta.yaml similarity index 100% rename from conda-recipe/meta.yaml rename to lib/meta.yaml diff --git a/src/H5Format.cpp b/lib/src/H5Format.cpp similarity index 100% rename from src/H5Format.cpp rename to lib/src/H5Format.cpp diff --git a/src/H5Format.hpp b/lib/src/H5Format.hpp similarity index 100% rename from src/H5Format.hpp rename to lib/src/H5Format.hpp diff --git a/src/H5Writer.cpp b/lib/src/H5Writer.cpp similarity index 100% rename from src/H5Writer.cpp rename to lib/src/H5Writer.cpp diff --git a/src/H5Writer.hpp b/lib/src/H5Writer.hpp similarity index 100% rename from src/H5Writer.hpp rename to lib/src/H5Writer.hpp diff --git a/src/ProcessManager.cpp b/lib/src/ProcessManager.cpp similarity index 100% rename from src/ProcessManager.cpp rename to lib/src/ProcessManager.cpp diff --git a/src/ProcessManager.hpp b/lib/src/ProcessManager.hpp similarity index 100% rename from src/ProcessManager.hpp rename to lib/src/ProcessManager.hpp diff --git a/src/RestApi.cpp b/lib/src/RestApi.cpp similarity index 100% rename from src/RestApi.cpp rename to lib/src/RestApi.cpp diff --git a/src/RestApi.hpp b/lib/src/RestApi.hpp similarity index 100% rename from src/RestApi.hpp rename to lib/src/RestApi.hpp diff --git a/src/RingBuffer.cpp b/lib/src/RingBuffer.cpp similarity index 100% rename from src/RingBuffer.cpp rename to lib/src/RingBuffer.cpp diff --git a/src/RingBuffer.hpp b/lib/src/RingBuffer.hpp similarity index 100% rename from src/RingBuffer.hpp rename to lib/src/RingBuffer.hpp diff --git a/src/WriterManager.cpp b/lib/src/WriterManager.cpp similarity index 100% rename from src/WriterManager.cpp rename to lib/src/WriterManager.cpp diff --git a/src/WriterManager.hpp b/lib/src/WriterManager.hpp similarity index 100% rename from src/WriterManager.hpp rename to lib/src/WriterManager.hpp diff --git a/src/ZmqReceiver.cpp b/lib/src/ZmqReceiver.cpp similarity index 100% rename from src/ZmqReceiver.cpp rename to lib/src/ZmqReceiver.cpp diff --git a/src/ZmqReceiver.hpp b/lib/src/ZmqReceiver.hpp similarity index 100% rename from src/ZmqReceiver.hpp rename to lib/src/ZmqReceiver.hpp diff --git a/src/config.cpp b/lib/src/config.cpp similarity index 100% rename from src/config.cpp rename to lib/src/config.cpp diff --git a/src/config.hpp b/lib/src/config.hpp similarity index 100% rename from src/config.hpp rename to lib/src/config.hpp diff --git a/test/test_ZmqReceiver.cpp b/lib/test/test_ZmqReceiver.cpp similarity index 100% rename from test/test_ZmqReceiver.cpp rename to lib/test/test_ZmqReceiver.cpp diff --git a/test/test_main.cpp b/lib/test/test_main.cpp similarity index 100% rename from test/test_main.cpp rename to lib/test/test_main.cpp diff --git a/impl/sf_alvra/AlvraFormat.cpp b/sf_alvra/AlvraFormat.cpp similarity index 100% rename from impl/sf_alvra/AlvraFormat.cpp rename to sf_alvra/AlvraFormat.cpp diff --git a/impl/sf_alvra/Makefile b/sf_alvra/Makefile similarity index 88% rename from impl/sf_alvra/Makefile rename to sf_alvra/Makefile index b47ce39..d817c2f 100644 --- a/impl/sf_alvra/Makefile +++ b/sf_alvra/Makefile @@ -4,7 +4,7 @@ BIN_DIR = ./bin MKDIR = mkdir -p CPP = g++ -CPPFLAGS = -Wall -Wfatal-errors -fPIC -pthread -std=c++11 -I../../src -I../../include -I${CONDA_PREFIX}/include +CPPFLAGS = -Wall -Wfatal-errors -std=c++11 -I../../src -I../../include -I${CONDA_PREFIX}/include LDLIBS = -L../../bin -L${CONDA_PREFIX}/lib -L/usr/lib64 -lcpp_h5_writer -lzmq -lhdf5 -lhdf5_hl -lhdf5_cpp -lhdf5_hl_cpp -lboost_system -lboost_regex -lboost_thread -lpthread LDLIBS_TEST = -lgtest_main -lgtest diff --git a/impl/sf_alvra/alvra_h5_writer.cpp b/sf_alvra/alvra_h5_writer.cpp similarity index 100% rename from impl/sf_alvra/alvra_h5_writer.cpp rename to sf_alvra/alvra_h5_writer.cpp diff --git a/impl/sf_alvra/conda-recipe/build.sh b/sf_alvra/conda-recipe/build.sh similarity index 100% rename from impl/sf_alvra/conda-recipe/build.sh rename to sf_alvra/conda-recipe/build.sh diff --git a/impl/sf_alvra/conda-recipe/meta.yaml b/sf_alvra/conda-recipe/meta.yaml similarity index 100% rename from impl/sf_alvra/conda-recipe/meta.yaml rename to sf_alvra/conda-recipe/meta.yaml diff --git a/impl/sf_bernina/BerninaFormat.cpp b/sf_bernina/BerninaFormat.cpp similarity index 100% rename from impl/sf_bernina/BerninaFormat.cpp rename to sf_bernina/BerninaFormat.cpp diff --git a/impl/sf_bernina/Makefile b/sf_bernina/Makefile similarity index 100% rename from impl/sf_bernina/Makefile rename to sf_bernina/Makefile diff --git a/impl/sf_bernina/bernina_h5_writer.cpp b/sf_bernina/bernina_h5_writer.cpp similarity index 100% rename from impl/sf_bernina/bernina_h5_writer.cpp rename to sf_bernina/bernina_h5_writer.cpp diff --git a/impl/sf_bernina/conda-recipe/build.sh b/sf_bernina/conda-recipe/build.sh similarity index 100% rename from impl/sf_bernina/conda-recipe/build.sh rename to sf_bernina/conda-recipe/build.sh diff --git a/impl/sf_bernina/conda-recipe/meta.yaml b/sf_bernina/conda-recipe/meta.yaml similarity index 100% rename from impl/sf_bernina/conda-recipe/meta.yaml rename to sf_bernina/conda-recipe/meta.yaml