Starts the server; make slight changes in server code
so that it understands qt's resource system (qrc)
we can use that to manage the html related files
(would be stored in app bundle for mac osx, and in
perhaps /usr/local/share for Linux by qt)
Change-Id: I8cc9e7bd99000d287bac5e6c8bd86008924351c6
diff --git a/wscript b/wscript
index 7fb7500..fd62ae7 100644
--- a/wscript
+++ b/wscript
@@ -139,18 +139,21 @@
http_server = bld (
target = "http_server",
- features = "cxx",
+ features = "qt4 cxx",
source = bld.path.ant_glob(['server/*.cpp']),
- includes = "server .",
- use = "BOOST"
+ includes = "server src .",
+ use = "BOOST QTCORE"
)
qt = bld (
target = "ChronoShare",
features = "qt4 cxx cxxprogram",
defines = "WAF",
- source = bld.path.ant_glob(['gui/*.cpp', 'gui/*.cc', 'gui/*.qrc']),
- includes = "ccnx scheduler executor fs-watcher gui src adhoc . ",
+ # do not include html.qrc as we don't want it to be compiled into binary
+ # qt seems to adopt a pattern of compiling every resource file into the
+ # executable; if things don't work, we can use that as last resort
+ source = bld.path.ant_glob(['gui/*.cpp', 'gui/*.cc', 'gui/images.qrc']),
+ includes = "ccnx scheduler executor fs-watcher gui src adhoc server . ",
use = "BOOST BOOST_FILESYSTEM SQLITE3 QTCORE QTGUI LOG4CXX fs_watcher ccnx database chronoshare http_server"
)