kopia lustrzana https://github.com/ukhas/habitat-cpp-connector
Split sources and headers into two directories
rodzic
8a2e0891ad
commit
64c18110fd
6
Makefile
6
Makefile
|
@ -9,7 +9,7 @@ ssl_cflags := $(shell pkg-config --cflags openssl)
|
||||||
ssl_libs := $(shell pkg-config --libs openssl)
|
ssl_libs := $(shell pkg-config --libs openssl)
|
||||||
|
|
||||||
CFLAGS = -pthread -O2 -Wall -Werror -pedantic -Wno-long-long \
|
CFLAGS = -pthread -O2 -Wall -Werror -pedantic -Wno-long-long \
|
||||||
-Wno-variadic-macros -Isrc \
|
-Wno-variadic-macros -I. \
|
||||||
$(jsoncpp_cflags) $(curl_cflags) $(ssl_cflags)
|
$(jsoncpp_cflags) $(curl_cflags) $(ssl_cflags)
|
||||||
CFLAGS_JSONCPP = -pthread -O2 -Wall $(jsoncpp_cflags)
|
CFLAGS_JSONCPP = -pthread -O2 -Wall $(jsoncpp_cflags)
|
||||||
upl_libs = -pthread $(curl_libs) $(ssl_libs)
|
upl_libs = -pthread $(curl_libs) $(ssl_libs)
|
||||||
|
@ -17,9 +17,7 @@ ext_libs = $(jsoncpp_libs)
|
||||||
rfc_libs = $(jsoncpp_libs)
|
rfc_libs = $(jsoncpp_libs)
|
||||||
|
|
||||||
test_py_files = tests/test_uploader.py tests/test_extractor.py
|
test_py_files = tests/test_uploader.py tests/test_extractor.py
|
||||||
headers = src/CouchDB.h src/EZ.h src/RFC3339.h \
|
headers = $(wildcard habitat/*.h) \
|
||||||
src/Uploader.h src/UploaderThread.h \
|
|
||||||
src/Extractor.h src/UKHASExtractor.h \
|
|
||||||
tests/test_extractor_mocks.h
|
tests/test_extractor_mocks.h
|
||||||
rfc_cxxfiles = src/RFC3339.cxx tests/test_rfc3339_main.cxx
|
rfc_cxxfiles = src/RFC3339.cxx tests/test_rfc3339_main.cxx
|
||||||
rfc_binary = tests/rfc3339
|
rfc_binary = tests/rfc3339
|
||||||
|
|
|
@ -1,6 +1,13 @@
|
||||||
habitat cpp uploader (see habitat.uploader.Uploader)
|
habitat cpp uploader (see habitat.uploader.Uploader)
|
||||||
====================================================
|
====================================================
|
||||||
|
|
||||||
|
Directories
|
||||||
|
-----------
|
||||||
|
|
||||||
|
- jsoncpp: bundled library
|
||||||
|
- habitat: headers (i.e., #include "habitat/CouchDB.h")
|
||||||
|
- src: sources
|
||||||
|
|
||||||
License
|
License
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
#include <curl/curl.h>
|
#include <curl/curl.h>
|
||||||
#include "jsoncpp.h"
|
#include "jsoncpp.h"
|
||||||
|
|
||||||
#include "EZ.h"
|
#include "habitat/EZ.h"
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
|
@ -5,8 +5,8 @@
|
||||||
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include "jsoncpp.h"
|
#include "jsoncpp.h"
|
||||||
#include "UploaderThread.h"
|
#include "habitat/UploaderThread.h"
|
||||||
#include "EZ.h"
|
#include "habitat/EZ.h"
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#ifndef HABITAT_UKHAS_EXTRACTOR_H
|
#ifndef HABITAT_UKHAS_EXTRACTOR_H
|
||||||
#define HABITAT_UKHAS_EXTRACTOR_H
|
#define HABITAT_UKHAS_EXTRACTOR_H
|
||||||
|
|
||||||
#include "Extractor.h"
|
#include "habitat/Extractor.h"
|
||||||
|
|
||||||
namespace habitat {
|
namespace habitat {
|
||||||
|
|
|
@ -8,8 +8,8 @@
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include "jsoncpp.h"
|
#include "jsoncpp.h"
|
||||||
#include "EZ.h"
|
#include "habitat/EZ.h"
|
||||||
#include "CouchDB.h"
|
#include "habitat/CouchDB.h"
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
|
@ -3,10 +3,10 @@
|
||||||
#ifndef HABITAT_UPLOADERTHREAD_H
|
#ifndef HABITAT_UPLOADERTHREAD_H
|
||||||
#define HABITAT_UPLOADERTHREAD_H
|
#define HABITAT_UPLOADERTHREAD_H
|
||||||
|
|
||||||
#include "EZ.h"
|
|
||||||
#include "Uploader.h"
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include "jsoncpp.h"
|
#include "jsoncpp.h"
|
||||||
|
#include "habitat/EZ.h"
|
||||||
|
#include "habitat/Uploader.h"
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
/* Copyright 2011-2012 (C) Daniel Richman. License: GNU GPL 3; see LICENSE. */
|
/* Copyright 2011-2012 (C) Daniel Richman. License: GNU GPL 3; see LICENSE. */
|
||||||
|
|
||||||
#include "CouchDB.h"
|
#include "habitat/CouchDB.h"
|
||||||
#include <curl/curl.h>
|
#include <curl/curl.h>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include "EZ.h"
|
#include "habitat/EZ.h"
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/* Copyright 2011 (C) Daniel Richman. License: GNU GPL 3; see LICENSE. */
|
/* Copyright 2011 (C) Daniel Richman. License: GNU GPL 3; see LICENSE. */
|
||||||
|
|
||||||
#include "EZ.h"
|
#include "habitat/EZ.h"
|
||||||
#include <curl/curl.h>
|
#include <curl/curl.h>
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
/* Copyright 2011 (C) Daniel Richman. License: GNU GPL 3; see COPYING. */
|
/* Copyright 2011 (C) Daniel Richman. License: GNU GPL 3; see COPYING. */
|
||||||
|
|
||||||
#include "Extractor.h"
|
#include "habitat/Extractor.h"
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include "EZ.h"
|
#include "habitat/EZ.h"
|
||||||
|
|
||||||
namespace habitat {
|
namespace habitat {
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/* Copyright 2012 (C) Daniel Richman. License: GNU GPL 3; see LICENSE. */
|
/* Copyright 2012 (C) Daniel Richman. License: GNU GPL 3; see LICENSE. */
|
||||||
|
|
||||||
#include "RFC3339.h"
|
#include "habitat/RFC3339.h"
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/* Copyright 2011 (C) Daniel Richman. License: GNU GPL 3; see COPYING. */
|
/* Copyright 2011 (C) Daniel Richman. License: GNU GPL 3; see COPYING. */
|
||||||
|
|
||||||
#include "UKHASExtractor.h"
|
#include "habitat/UKHASExtractor.h"
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/* Copyright 2011-2012 (C) Daniel Richman. License: GNU GPL 3; see LICENSE. */
|
/* Copyright 2011-2012 (C) Daniel Richman. License: GNU GPL 3; see LICENSE. */
|
||||||
|
|
||||||
#include "Uploader.h"
|
#include "habitat/Uploader.h"
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
@ -9,9 +9,9 @@
|
||||||
#include <openssl/sha.h>
|
#include <openssl/sha.h>
|
||||||
#include <openssl/bio.h>
|
#include <openssl/bio.h>
|
||||||
#include <openssl/evp.h>
|
#include <openssl/evp.h>
|
||||||
#include "CouchDB.h"
|
#include "habitat/CouchDB.h"
|
||||||
#include "EZ.h"
|
#include "habitat/EZ.h"
|
||||||
#include "RFC3339.h"
|
#include "habitat/RFC3339.h"
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/* Copyright 2011-2012 (C) Daniel Richman. License: GNU GPL 3; see LICENSE. */
|
/* Copyright 2011-2012 (C) Daniel Richman. License: GNU GPL 3; see LICENSE. */
|
||||||
|
|
||||||
#include "UploaderThread.h"
|
#include "habitat/UploaderThread.h"
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
||||||
|
|
|
@ -5,8 +5,8 @@
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
#include "jsoncpp.h"
|
#include "jsoncpp.h"
|
||||||
#include "Extractor.h"
|
#include "habitat/Extractor.h"
|
||||||
#include "UKHASExtractor.h"
|
#include "habitat/UKHASExtractor.h"
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
#include <ctime>
|
#include <ctime>
|
||||||
|
|
||||||
#include "jsoncpp.h"
|
#include "jsoncpp.h"
|
||||||
#include "RFC3339.h"
|
#include "habitat/RFC3339.h"
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
|
|
|
@ -5,11 +5,11 @@
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <ctime>
|
#include <ctime>
|
||||||
|
|
||||||
#include "EZ.h"
|
#include "habitat/EZ.h"
|
||||||
#include "Uploader.h"
|
#include "habitat/Uploader.h"
|
||||||
|
|
||||||
#ifdef THREADED
|
#ifdef THREADED
|
||||||
#include "UploaderThread.h"
|
#include "habitat/UploaderThread.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
Ładowanie…
Reference in New Issue