# HG changeset patch # User Ludovic Chabant # Date 1435528823 25200 # Node ID 6b9f59b19db7d8a51b6185f876806aaedf39532f # Parent 171dde4f61dcb64f43309e36f2df0f95c5715b34 cm: Move build directory to util to avoid conflicts with pip. diff -r 171dde4f61dc -r 6b9f59b19db7 .hgignore --- a/.hgignore Sun Jun 28 14:52:58 2015 -0700 +++ b/.hgignore Sun Jun 28 15:00:23 2015 -0700 @@ -3,8 +3,8 @@ venv tags build/lib -build/messages/_cache -build/messages/_counter +util/messages/_cache +util/messages/_counter dist docs/_cache docs/_counter @@ -13,3 +13,4 @@ piecrust.egg-info piecrust/__version__.py +docs diff -r 171dde4f61dc -r 6b9f59b19db7 build/generate_messages.cmd --- a/build/generate_messages.cmd Sun Jun 28 14:52:58 2015 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -@echo off -setlocal - -set CUR_DIR=%~dp0 -set CHEF=%CUR_DIR%..\bin\chef -set OUT_DIR=%CUR_DIR%..\piecrust\resources\messages -set ROOT_DIR=%CUR_DIR%messages - -%CHEF% --root=%ROOT_DIR% bake -o %OUT_DIR% -del %OUT_DIR%\index.html - diff -r 171dde4f61dc -r 6b9f59b19db7 build/generate_messages.sh --- a/build/generate_messages.sh Sun Jun 28 14:52:58 2015 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -#!/bin/sh - -CUR_DIR="$( cd "$( dirname "$0" )" && pwd )" -CHEF=${CUR_DIR}/../bin/chef -OUT_DIR=${CUR_DIR}/../piecrust/resources/messages -ROOT_DIR=${CUR_DIR}/messages - -$CHEF --root=$ROOT_DIR bake -o $OUT_DIR -rm ${OUT_DIR}/index.html diff -r 171dde4f61dc -r 6b9f59b19db7 build/messages/config.yml --- a/build/messages/config.yml Sun Jun 28 14:52:58 2015 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -site: - title: PieCrust System Messages diff -r 171dde4f61dc -r 6b9f59b19db7 build/messages/pages/_index.html --- a/build/messages/pages/_index.html Sun Jun 28 14:52:58 2015 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ ---- -title: PieCrust System Messages ---- - -Here are the **PieCrust** system message pages: - -* [Requirements Not Met]({{ pcurl('requirements') }}) -* [Error]({{ pcurl('error') }}) -* [Not Found]({{ pcurl('error404') }}) -* [Critical Error]({{ pcurl('critical') }}) - -This very page you're reading, however, is only here for convenience. diff -r 171dde4f61dc -r 6b9f59b19db7 build/messages/pages/critical.html --- a/build/messages/pages/critical.html Sun Jun 28 14:52:58 2015 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ ---- -title: The Whole Kitchen Burned Down! -layout: error ---- -Something critically bad happened, and **PieCrust** needs to shut down. It's probably our fault. - diff -r 171dde4f61dc -r 6b9f59b19db7 build/messages/pages/error.html --- a/build/messages/pages/error.html Sun Jun 28 14:52:58 2015 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ ---- -title: The Cake Just Burned! -layout: error ---- - diff -r 171dde4f61dc -r 6b9f59b19db7 build/messages/pages/error404.html --- a/build/messages/pages/error404.html Sun Jun 28 14:52:58 2015 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ ---- -title: Can't find the sugar! -layout: error ---- -It looks like the page you were trying to access does not exist around here. Try going somewhere else. - diff -r 171dde4f61dc -r 6b9f59b19db7 build/messages/templates/default.html --- a/build/messages/templates/default.html Sun Jun 28 14:52:58 2015 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,70 +0,0 @@ - - - - {{ page.title }} - - - - - -

- -

- {% block content %} - {{ content|safe }} - {% endblock %} -

- {% block footer %}{% endblock %} -

- - diff -r 171dde4f61dc -r 6b9f59b19db7 build/messages/templates/error.html --- a/build/messages/templates/error.html Sun Jun 28 14:52:58 2015 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -{% extends "default.html" %} - -{% block content %} -{{content|safe}} - -{# The following is `raw` because we want it to be in the - produced page, so it can then be templated on the fly - with the error messages #} -{% raw %} -{% if details %} -

Error details:

{{ desc }}

-{% endif %} -{% endraw %} -{% endblock %} - -{% block footer %} -{% pcformat 'textile' %} -p(note). You're seeing this because something wrong happend. To see detailed errors with callstacks, run chef with the @--debug@ parameter, append @?!debug@ to the URL, or initialize the @PieCrust@ object with @{'debug': true}@. On the other hand, to see you custom error pages, set the @site/display_errors@ setting to @false@. -{% endpcformat %} -{% endblock %} diff -r 171dde4f61dc -r 6b9f59b19db7 util/build/generate_messages.cmd --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util/build/generate_messages.cmd Sun Jun 28 15:00:23 2015 -0700 @@ -0,0 +1,11 @@ +@echo off +setlocal + +set CUR_DIR=%~dp0 +set CHEF=%CUR_DIR%..\bin\chef +set OUT_DIR=%CUR_DIR%..\piecrust\resources\messages +set ROOT_DIR=%CUR_DIR%messages + +%CHEF% --root=%ROOT_DIR% bake -o %OUT_DIR% +del %OUT_DIR%\index.html + diff -r 171dde4f61dc -r 6b9f59b19db7 util/build/generate_messages.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util/build/generate_messages.sh Sun Jun 28 15:00:23 2015 -0700 @@ -0,0 +1,9 @@ +#!/bin/sh + +CUR_DIR="$( cd "$( dirname "$0" )" && pwd )" +CHEF=${CUR_DIR}/../bin/chef +OUT_DIR=${CUR_DIR}/../piecrust/resources/messages +ROOT_DIR=${CUR_DIR}/messages + +$CHEF --root=$ROOT_DIR bake -o $OUT_DIR +rm ${OUT_DIR}/index.html diff -r 171dde4f61dc -r 6b9f59b19db7 util/build/messages/config.yml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util/build/messages/config.yml Sun Jun 28 15:00:23 2015 -0700 @@ -0,0 +1,2 @@ +site: + title: PieCrust System Messages diff -r 171dde4f61dc -r 6b9f59b19db7 util/build/messages/pages/_index.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util/build/messages/pages/_index.html Sun Jun 28 15:00:23 2015 -0700 @@ -0,0 +1,12 @@ +--- +title: PieCrust System Messages +--- + +Here are the **PieCrust** system message pages: + +* [Requirements Not Met]({{ pcurl('requirements') }}) +* [Error]({{ pcurl('error') }}) +* [Not Found]({{ pcurl('error404') }}) +* [Critical Error]({{ pcurl('critical') }}) + +This very page you're reading, however, is only here for convenience. diff -r 171dde4f61dc -r 6b9f59b19db7 util/build/messages/pages/critical.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util/build/messages/pages/critical.html Sun Jun 28 15:00:23 2015 -0700 @@ -0,0 +1,6 @@ +--- +title: The Whole Kitchen Burned Down! +layout: error +--- +Something critically bad happened, and **PieCrust** needs to shut down. It's probably our fault. + diff -r 171dde4f61dc -r 6b9f59b19db7 util/build/messages/pages/error.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util/build/messages/pages/error.html Sun Jun 28 15:00:23 2015 -0700 @@ -0,0 +1,5 @@ +--- +title: The Cake Just Burned! +layout: error +--- + diff -r 171dde4f61dc -r 6b9f59b19db7 util/build/messages/pages/error404.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util/build/messages/pages/error404.html Sun Jun 28 15:00:23 2015 -0700 @@ -0,0 +1,6 @@ +--- +title: Can't find the sugar! +layout: error +--- +It looks like the page you were trying to access does not exist around here. Try going somewhere else. + diff -r 171dde4f61dc -r 6b9f59b19db7 util/build/messages/templates/default.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util/build/messages/templates/default.html Sun Jun 28 15:00:23 2015 -0700 @@ -0,0 +1,70 @@ + + + + {{ page.title }} + + + + + +

+ +

+ {% block content %} + {{ content|safe }} + {% endblock %} +

+ {% block footer %}{% endblock %} +

+ + diff -r 171dde4f61dc -r 6b9f59b19db7 util/build/messages/templates/error.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util/build/messages/templates/error.html Sun Jun 28 15:00:23 2015 -0700 @@ -0,0 +1,27 @@ +{% extends "default.html" %} + +{% block content %} +{{content|safe}} + +{# The following is `raw` because we want it to be in the + produced page, so it can then be templated on the fly + with the error messages #} +{% raw %} +{% if details %} +

Error details:

{{ desc }}

+{% endif %} +{% endraw %} +{% endblock %} + +{% block footer %} +{% pcformat 'textile' %} +p(note). You're seeing this because something wrong happend. To see detailed errors with callstacks, run chef with the @--debug@ parameter, append @?!debug@ to the URL, or initialize the @PieCrust@ object with @{'debug': true}@. On the other hand, to see you custom error pages, set the @site/display_errors@ setting to @false@. +{% endpcformat %} +{% endblock %}