smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #90 from kiwix/fix_resource_script 

[resource_compiler] Make the exception public.
This commit is contained in:
Matthieu Gautier 2017-10-10 14:17:44 +02:00 committed by GitHub
parent 5623fedfd0 d801ff36f6
commit 41e3707f1b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/kiwix-compile-resources
View File

@ -106,16 +106,8 @@ master_c_template = """//This file is automaically generated. Do not modify it.
#include <stdlib.h> #include <stdlib.h>
#include <fstream> #include <fstream>
#include <stdexcept>
#include "{include_file}" #include "{include_file}"
class ResourceNotFound : public std::runtime_error {{
public:
ResourceNotFound(const std::string& what_arg):
std::runtime_error(what_arg)
{{ }};
}};
static std::string init_resource(const char* name, const unsigned char* content, int len) static std::string init_resource(const char* name, const unsigned char* content, int len)
{{ {{
char * resPath = getenv(name); char * resPath = getenv(name);
@ -153,11 +145,19 @@ master_h_template = """//This file is automaically generated. Do not modify it.
#define KIWIX_{BASENAME} #define KIWIX_{BASENAME}
#include <string> #include <string>
#include <stdexcept>
namespace RESOURCE {{ namespace RESOURCE {{
{RESOURCES} {RESOURCES}
}}; }};
class ResourceNotFound : public std::runtime_error {{
public:
ResourceNotFound(const std::string& what_arg):
std::runtime_error(what_arg)
{{ }};
}};
const std::string& getResource_{basename}(const std::string& name); const std::string& getResource_{basename}(const std::string& name);
#define getResource(a) (getResource_{basename}(a)) #define getResource(a) (getResource_{basename}(a))