Skip to content

Commit be7ecac

Browse files
author
Kasper Peeters
committed
Update for current clay version.
1 parent 58ab55a commit be7ecac

File tree

6 files changed

+45
-36
lines changed

6 files changed

+45
-36
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ webup:
1414
cd build; make -f web2/Makefile
1515
doxygen config/Doxyfile
1616
rsync -avz --chmod=+rx doxygen/ cadabra_web:/var/www/cadabra2/doxygen/
17-
cd web2/cadabra2; clay build; rsync -avz --chmod=+rx build/ cadabra_web:/var/www/cadabra2/; rsync -avz --chmod=+rx source/static/styles/ cadabra_web:/var/www/cadabra2/static/styles; rsync -avz --chmod=+rx source/static/fonts/ cadabra_web:/var/www/cadabra2/static/fonts; rsync -avz --chmod=+rx source/static/images/ cadabra_web:/var/www/cadabra2/static/images/; rsync -avz --chmod=+rx source/static/icons/ cadabra_web:/var/www/cadabra2/static/icons/; rsync -avz --chmod=+rx source/static/pdf/ cadabra_web:/var/www/cadabra2/static/pdf/; rsync -avz --chmod=+rx source/static/scripts/ cadabra_web:/var/www/cadabra2/static/scripts/; rsync -avz --chmod=+r robots.txt cadabra_web:/var/www/cadabra2
17+
cd web2/cadabra2/source; clay build; rsync -avz --chmod=+rx build/ cadabra_web:/var/www/cadabra2/; rsync -avz --chmod=+rx static/styles/ cadabra_web:/var/www/cadabra2/static/styles; rsync -avz --chmod=+rx static/fonts/ cadabra_web:/var/www/cadabra2/static/fonts; rsync -avz --chmod=+rx static/images/ cadabra_web:/var/www/cadabra2/static/images/; rsync -avz --chmod=+rx static/icons/ cadabra_web:/var/www/cadabra2/static/icons/; rsync -avz --chmod=+rx static/pdf/ cadabra_web:/var/www/cadabra2/static/pdf/; rsync -avz --chmod=+rx static/scripts/ cadabra_web:/var/www/cadabra2/static/scripts/; rsync -avz --chmod=+r static/robots.txt cadabra_web:/var/www/cadabra2
1818

1919
format:
2020
astyle --style=k/r --indent=tab=3 --recursive --attach-classes --attach-namespaces --indent-classes --indent-namespaces --indent-switches --break-closing-braces '*.hh'

cmake/version.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
set(CADABRA_VERSION_MAJOR 2)
22
set(CADABRA_VERSION_MINOR 3)
33
set(CADABRA_VERSION_PATCH 9)
4-
set(CADABRA_VERSION_TWEAK 2)
4+
set(CADABRA_VERSION_TWEAK 3)
55
set(COPYRIGHT_YEARS "2001-2022")
66
math(EXPR SYSTEM_BITS "${CMAKE_SIZEOF_VOID_P} * 8")
77
find_program(GIT git PATHS ${GIT_DIR})

doc/the_cadabra_book.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ \section{Metrics and bundles}
252252

253253
\input{eliminate_kronecker}
254254
\input{eliminate_metric}
255-
\input{eliminate_vielbein }
255+
\input{eliminate_vielbein}
256256
\input{einsteinify}
257257
\input{epsilon_to_delta}
258258
\input{expand_delta}

web2/README.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ directory. This web site is built using 'Clay', available from
77

88
http://lucuma.github.io/Clay/
99

10+
and installable with
11+
12+
pip install clay
13+
14+
You also need
15+
16+
sudo apt install doxygen
17+
1018
Clay builds the static site from the template files in
1119
cadabra2/source. To do this,
1220

web2/cadabra2/settings.py

Lines changed: 0 additions & 33 deletions
This file was deleted.

web2/cadabra2/source/clay.yaml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
---
2+
# Shell-style patterns files/folders that must not be copied.
3+
# Use quotes.
4+
exclude:
5+
- ".DS_Store"
6+
- "build/*"
7+
- "webassets-cache/*"
8+
- ".webassets-cache"
9+
- "layout.html"
10+
- "*.nb.html"
11+
- "README.txt"
12+
- "static/*"
13+
- "notebooks/README*"
14+
- "notebooks/.gitignore"
15+
- "notebooks/*~"
16+
- "notebooks/*.cnb"
17+
- "notebooks/*segment.html"
18+
- "*~"
19+
20+
# Shell-style patterns files/folders that *must be* copied, even if
21+
# they are in the exclude list.
22+
# Use quotes.
23+
#include:
24+
# - "robots.txt"
25+
# - "humans.txt"
26+
27+
# Jinja extensions to use
28+
jinja_extensions:
29+
30+
# Shell-style patterns of files outside `static/` that must be copied
31+
# as-is instead of trying to interpret them as Jinja templates.
32+
# Use quotes.
33+
#binaries:
34+
# - "favicon.ico"

0 commit comments

Comments
 (0)