hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix building of server.html.h, move embed.js.h

Browse source
This commit is contained in:
Peter Wu 2012-08-30 11:05:19 +02:00
parent 45d9971aca
commit 8fd383115f
5 changed files with 27 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/Makefile.am
View file

@ -1,23 +1,3 @@
../lsp/uncompressed.js: ../lsp/jquery.js ../lsp/placeholder.js ../lsp/md5.js ../lsp/main.js ../lsp/functions.js
cat ../lsp/jquery.js ../lsp/placeholder.js ../lsp/md5.js ../lsp/main.js ../lsp/functions.js > ../lsp/uncompressed.js
../lsp/compressed.js: ../lsp/uncompressed.js
echo "<script>" > ../lsp/compressed.js
java -jar ../lsp/jscompiler.jar < ../lsp/uncompressed.js >> ../lsp/compressed.js
echo "</script>" >> ../lsp/compressed.js
../server.html: ../lsp/compressed.js
cat ../lsp/header.html ../lsp/compressed.js > ../server.html
echo "<style>" >> ../server.html
cat ../lsp/style.css >> ../server.html
echo "</style>" >> ../server.html
cat ../lsp/footer.html >> ../server.html
../server.html.h: ../server.html
xxd -i ../server.html ../server.html.h
./embed.js.h: ./embed.js
mv embed.js tmp.js
java -jar ../lsp/jscompiler.jar < tmp.js > embed.js
xxd -i embed.js embed.js.h
mv tmp.js embed.js
AM_CPPFLAGS = $(MIST_CFLAGS)
LDADD = $(MIST_LIBS)
SUBDIRS=converters analysers

2
src/controller.cpp
View file

@ -503,7 +503,7 @@ int main(int argc, char ** argv){
it->H.SetHeader("Content-Type", "text/html");
it->H.SetHeader("X-Info", "To force an API response, request the file /api");
it->H.SetHeader("Server", "mistserver/" PACKAGE_VERSION "/" + Util::Config::libver);
it->H.SetBody(std::string((char*)___server_html, (size_t)___server_html_len));
it->H.SetBody(std::string((char*)server_html, (size_t)server_html_len));
it->C.Send(it->H.BuildResponse("200", "OK"));
it->H.Clean();
}else{