merge "default" into JSON-59

server/json-adapter.cc

@@ -15,6 +15,7 @@
 
 #include <mutex>
 
+#include "main.hh"
 #include "json-adapter.hh"
 #include "function_map.hh"
 #include "pep-types.hh"
@@ -23,7 +24,6 @@
 #include "security-token.hh"
 #include "pep-utils.hh"
 #include "gpg_environment.hh"
-#include "prefix-config.hh"
 
 #include <pEp/message_api.h>
 #include <pEp/blacklist.h>
@@ -343,8 +343,6 @@ void sendFile( evhttp_request* req, const std::string& mimeType, const fs::path&
 }
 
 
-static const boost::filesystem::path  path_to_html = fs::path(html_directory);
-
 struct FileRequest
 {
 	std::string mimeType;

server/main.cc

@@ -1,3 +1,5 @@
+#include "main.hh"
+#include "prefix-config.hh"
 #include "json-adapter.hh"
 #include "daemonize.hh"
 
@@ -13,6 +15,8 @@ std::string address = "127.0.0.1";
 unsigned start_port = 4223;
 unsigned end_port   = 9999;
 
+boost::filesystem::path path_to_html = boost::filesystem::path(html_directory);
+
 void print_version()
 {
 	std::cout << "pEp JSON Adapter.\n"
@@ -35,6 +39,7 @@ try
 		("start-port,s", po::value<unsigned>(&start_port)->default_value(start_port),  "First port to bind on")
 		("end-port,e",   po::value<unsigned>(&end_port)->default_value(end_port),      "Last port to bind on")
 		("address,a",    po::value<std::string>(&address)->default_value(address),     "Address to bind on")
+		("html-directory,H", po::value<boost::filesystem::path>(&path_to_html)->default_value(path_to_html), "Path to the HTML and JavaScript files")
 	;
 	
 	po::variables_map vm;

server/main.hh

@@ -1 +1,3 @@
-// intentionally left blank
+#include <boost/filesystem/path.hpp>
+
+extern boost::filesystem::path path_to_html;