Merge pull request #81 from kiwix/no_ctpp2

Allow kiwix-lib to compile without ctpp2c.

include/searcher.h

@@ -93,7 +93,6 @@ class Searcher
   std::string searchPattern;
   std::string protocolPrefix;
   std::string searchProtocolPrefix;
-  std::string template_ct2;
   unsigned int resultCountPerPage;
   unsigned int estimatedResultCount;
   unsigned int resultStart;

src/searcher.cpp

@@ -85,7 +85,6 @@ Searcher::Searcher(const string& xapianDirectoryPath,
       resultStart(0),
       resultEnd(0)
 {
-  template_ct2 = RESOURCE::results_ct2;
   loadICUExternalTables();
   if (!reader || !reader->hasFulltextIndex()) {
     internal->_xapianSearcher = new XapianSearcher(xapianDirectoryPath, reader);
@@ -104,7 +103,6 @@ Searcher::Searcher()
       resultStart(0),
       resultEnd(0)
 {
-  template_ct2 = RESOURCE::results_ct2;
   loadICUExternalTables();
 }
 
@@ -375,6 +373,7 @@ string Searcher::getHtml()
   oData["searchProtocolPrefix"] = this->searchProtocolPrefix;
   oData["contentId"] = this->contentHumanReadableId;
 
+  std::string template_ct2 = RESOURCE::results_ct2;
   VMStringLoader oLoader(template_ct2.c_str(), template_ct2.size());
 
   FileLogger oLogger(stderr);

static/meson.build

@@ -1,19 +1,27 @@
 
 
-ctpp2c = find_program('ctpp2c')
+ctpp2c = find_program('ctpp2c', required:false)
+
+if ctpp2c.found()
   search_result_template = custom_target('result_template',
     input: 'results.tmpl',
     output: 'results.ct2',
     command: [intermediate_ctpp2c, ctpp2c, '@INPUT@', '@OUTPUT@']
  )
+ resources_list = 'resources_list_ctpp2.txt'
+ resources_depends = [search_result_template]
+else
+ resources_list = 'resources_list_noctpp2.txt'
+ resources_depends = []
+endif
 
 lib_resources = custom_target('resources',
-  input: 'resources_list.txt',
+  input: resources_list,
   output: ['kiwixlib-resources.cpp', 'kiwixlib-resources.h'],
   command:[res_compiler,
            '--cxxfile', '@OUTPUT0@',
            '--hfile', '@OUTPUT1@',
            '--source_dir', '@OUTDIR@',
            '@INPUT@'],
-  depends: [search_result_template]
+  depends: resources_depends
 )

static/resources_list_noctpp2.txt

@@ -0,0 +1,3 @@
+stopwords/en
+stopwords/he
+stopwords/fra