1.1 --- a/pair_cores/web/Makefile	Tue Mar 06 22:40:22 2012 +0400
     1.2 +++ b/pair_cores/web/Makefile	Fri Mar 09 00:11:16 2012 +0400
     1.3 @@ -30,7 +30,6 @@
     1.4  CXX = g++
     1.5  LINK = g++
     1.6  LIBS += -lboost_signals -lboost_system -lboost_thread -lboost_filesystem
     1.7 -LIBS += -lcurl -lssl
     1.8  LIBS += -lwt
     1.9  LIBS += -lwt$(WT_CONNECTOR)
    1.10  
    1.11 @@ -43,10 +42,12 @@
    1.12  	$(LINK) $(LFLAGS) $(LIBS) $(objects) -o $@
    1.13  
    1.14  wc:
    1.15 -	wget https://bitbucket.org/starius/wt-classes/get/1.3.3.tar.gz -O - | \
    1.16 +	wget https://bitbucket.org/starius/wt-classes/get/1.3.5.tar.gz -O - | \
    1.17  		tar -xz
    1.18  	mkdir -p wc
    1.19  	cp -a starius-wt-classes-*/* wc
    1.20  	rm -r starius-wt-classes-*
    1.21  	$(MAKE) -C wc js/jquery.countdown.js
    1.22 +	cd wc && ./for-wt-3.1.2.sh
    1.23 +	cd wc && ./no-openssl.sh
    1.24  

     2.1 --- a/pair_cores/web/README.rst	Tue Mar 06 22:40:22 2012 +0400
     2.2 +++ b/pair_cores/web/README.rst	Fri Mar 09 00:11:16 2012 +0400
     2.3 @@ -7,14 +7,11 @@
     2.4  ------------
     2.5  
     2.6   * pair-cores command (hg rev e8c9f0a3482e +)
     2.7 - * Wt library 3.1.10+
     2.8 - * boost library (>= 1.44 to include boost-filesystem v3)
     2.9 - * curl library
    2.10 - * ssl library
    2.11 + * Wt library 3.1.2+
    2.12 + * boost library (>= 1.42)
    2.13  
    2.14  Wt-classes library is included in this web ui, you do not need
    2.15 -to have it installed. However it is linked with curl and openssl libraries,
    2.16 -so these libraries should be installed.
    2.17 +to have it installed.
    2.18  
    2.19  Build
    2.20  -----
    2.21 @@ -28,6 +25,10 @@
    2.22  
    2.23   $ make environment
    2.24  
    2.25 +Since Wt 3.1.2 does not accept --approot option,
    2.26 +it can be passed through wt_config "approot" runtime property.
    2.27 +By default, current directory is used as approot.
    2.28 +
    2.29  Run test script:
    2.30  
    2.31   $ sh run.sh

     3.1 --- a/pair_cores/web/pair-cores.cpp	Tue Mar 06 22:40:22 2012 +0400
     3.2 +++ b/pair_cores/web/pair-cores.cpp	Fri Mar 09 00:11:16 2012 +0400
     3.3 @@ -11,6 +11,7 @@
     3.4  #include <Wt/WPushButton>
     3.5  
     3.6  #include "wc/src/Wbi.hpp"
     3.7 +#include "wc/src/util.hpp"
     3.8  
     3.9  using namespace Wt;
    3.10  using namespace Wt::Wc;
    3.11 @@ -60,10 +61,9 @@
    3.12  PairCoresApp::PairCoresApp(const WEnvironment& env):
    3.13      WApplication(env) {
    3.14      enableUpdates(true);
    3.15 -    messageResourceBundle().use(Wt::WApplication::appRoot() +
    3.16 -                                "wc-locales/wtclasses");
    3.17 -    messageResourceBundle().use(Wt::WApplication::appRoot() +
    3.18 -                                "locales/pair-cores-web");
    3.19 +    std::string approot = config_value("approot", "");
    3.20 +    messageResourceBundle().use(approot + "wc-locales/wtclasses");
    3.21 +    messageResourceBundle().use(approot + "locales/pair-cores-web");
    3.22      useStyleSheet("css/pair-cores.css");
    3.23      reset_contents();
    3.24  }

     4.1 --- a/pair_cores/web/run.sh	Tue Mar 06 22:40:22 2012 +0400
     4.2 +++ b/pair_cores/web/run.sh	Fri Mar 09 00:11:16 2012 +0400
     4.3 @@ -1,3 +1,3 @@
     4.4 -./pair-cores.wt --docroot docroot/ --approot approot/ \
     4.5 +cd approot && ../pair-cores.wt --docroot ../docroot/ \
     4.6      --http-port 56929 --http-address 127.0.0.1
     4.7