Reorganize org-publish-project-alist.

Commit
d45e77c65c2dfca154814595aad01e1d77aa968d
Author
Marius Peter <marius.peter@tutanota.com>
Author date
Committer
Marius Peter <marius.peter@tutanota.com>
Committer date
publish-mlnp.org
index 6c2dc1f1..6a121915 100644..100644
@@ -70,15 +70,21 @@
70 70
71 71 ** Components
72 72
73 Removed: #+NAME: org-publish-components
73 Added: We outline three components: the main site, the wiki, and the blog.
74 Added:
75 Added: #+NAME: org-publish-component
74 76 #+begin_src elisp
75 Removed: (setq org-publish-components
77 Added: (setq org-publish-component
76 78 (read-answer
77 79 "Which `org-publish-project-alist' component should be built? "
78 Removed: '(("content"
79 Removed: ?c "build content (html) website components")
80 Added: '(("mlnp.fr"
81 Added: ?m "build the main website")
82 Added: ("wiki.mlnp.fr"
83 Added: ?w "build the wiki")
84 Added: ("blog.mlnp.fr"
85 Added: ?b "build the blog")
80 86 ("all"
81 Removed: ?a "build all website components"))))
87 Added: ?a "build all websites"))))
82 88 #+end_src
83 89
84 90
@@ -129,91 +135,13 @@
129 135 =mlnp.fr/resources/= folder.
130 136
131 137 #+NAME: org-publish-project-alist
132 Removed: #+BEGIN_SRC elisp
138 Added: #+BEGIN_SRC elisp :noweb yes
133 139 (require 'ox-publish)
134 140 (setq org-publish-project-alist
135 Removed: `(
136 Removed: ;; Main site.
137 Removed: ("mlnp.fr"
138 Removed: :components ("mlnp-main-pages"
139 Removed: "mlnp-resources"
140 Removed: "resources-pages" ; Only hosted on the main website.
141 Removed: "mlnp-fonts"))
142 Removed: ("mlnp-main-pages"
143 Removed: :base-directory "./"
144 Removed: :base-extension "org"
145 Removed: :publishing-directory ,(concat org-publish-location "mlnp.fr/")
146 Removed: :recursive nil ; Main site pages are all in top-level org directory.
147 Removed: :publishing-function org-html-publish-to-html)
148 Removed: ("mlnp-resources"
149 Removed: :base-directory "resources/"
150 Removed: :base-extension "css\\|js"
151 Removed: :publishing-directory ,(concat org-publish-location "mlnp.fr/resources/")
152 Removed: :publishing-function org-publish-attachment)
153 Removed: ("resources-pages"
154 Removed: :base-directory "resources/"
155 Removed: :base-extension "org"
156 Removed: :publishing-directory ,(concat org-publish-location "mlnp.fr/resources/")
157 Removed: :publishing-function org-html-publish-to-html)
158 Removed: ("mlnp-fonts"
159 Removed: :base-directory "resources/fonts/"
160 Removed: :base-extension "ttf\\|otf"
161 Removed: :publishing-directory ,(concat org-publish-location "mlnp.fr/resources/fonts/")
162 Removed: :publishing-function org-publish-attachment)
163 Removed:
164 Removed: ;; Personal wiki.
165 Removed: ("wiki.mlnp.fr"
166 Removed: :components ("wiki-main-pages"
167 Removed: "wiki-resources"
168 Removed: "wiki-fonts"))
169 Removed: ("wiki-main-pages"
170 Removed: :base-directory "wiki/"
171 Removed: :base-extension "org"
172 Removed: :publishing-directory ,(concat org-publish-location "wiki.mlnp.fr/")
173 Removed: :recursive t
174 Removed: :html-head "<link rel='stylesheet' type='text/css' href='http://wiki.mlnp.fr/resources/mlnp.css'>"
175 Removed: :auto-sitemap t
176 Removed: :sitemap-filename "index.org"
177 Removed: :sitemap-title "Wiki"
178 Removed: :publishing-function org-html-publish-to-html)
179 Removed: ("wiki-resources"
180 Removed: :base-directory "resources/"
181 Removed: :base-extension "css\\|js"
182 Removed: :publishing-directory ,(concat org-publish-location "wiki.mlnp.fr/resources/")
183 Removed: :publishing-function org-publish-attachment)
184 Removed: ("wiki-fonts"
185 Removed: :base-directory "resources/fonts/"
186 Removed: :base-extension "ttf\\|otf"
187 Removed: :publishing-directory ,(concat org-publish-location "wiki.mlnp.fr/resources/fonts/")
188 Removed: :publishing-function org-publish-attachment)
189 Removed:
190 Removed: ;; Personal blog.
191 Removed: ("blog.mlnp.fr"
192 Removed: :components ("blog-main-pages"
193 Removed: "blog-resources"
194 Removed: "blog-fonts"))
195 Removed: ("blog-main-pages"
196 Removed: :base-directory "blog/"
197 Removed: :base-extension "org"
198 Removed: :publishing-directory ,(concat org-publish-location "blog.mlnp.fr/")
199 Removed: :recursive t
200 Removed: :html-head "<link rel='stylesheet' type='text/css' href='http://blog.mlnp.fr/resources/mlnp.css'>"
201 Removed: :auto-sitemap t
202 Removed: :sitemap-filename "index.org"
203 Removed: :sitemap-title "Blog"
204 Removed: :sitemap-sort-files anti-chronologically
205 Removed: :publishing-function org-html-publish-to-html)
206 Removed: ("blog-resources"
207 Removed: :base-directory "resources/"
208 Removed: :base-extension "css\\|js"
209 Removed: :publishing-directory ,(concat org-publish-location "blog.mlnp.fr/resources/")
210 Removed: :publishing-function org-publish-attachment)
211 Removed: ("blog-fonts"
212 Removed: :base-directory "resources/fonts/"
213 Removed: :base-extension "ttf\\|otf"
214 Removed: :publishing-directory ,(concat org-publish-location "blog.mlnp.fr/resources/fonts/")
215 Removed: :publishing-function org-publish-attachment)
216 Removed:
141 Added: `( ;; This line left blank to avoid noweb honoring `( prefix.
142 Added: <<mlnp.fr>>
143 Added: <<wiki.mlnp.fr>>
144 Added: <<blog.mlnp.fr>>
217 145 ("all"
218 146 :components ("mlnp.fr"
219 147 "wiki.mlnp.fr"
@@ -223,32 +151,119 @@
223 151
224 152 ** =mlnp.fr=
225 153
154 Added: #+NAME: mlnp.fr
155 Added: #+BEGIN_SRC emacs-lisp
156 Added: ("mlnp.fr"
157 Added: :components ("mlnp-main-pages"
158 Added: "mlnp-resources"
159 Added: "resources-pages" ; Only hosted on the main website.
160 Added: "mlnp-fonts"))
161 Added: ("mlnp-main-pages"
162 Added: :base-directory "./"
163 Added: :base-extension "org"
164 Added: :publishing-directory ,(concat org-publish-location "mlnp.fr/")
165 Added: :recursive nil ; Main site pages are all in top-level org directory.
166 Added: :publishing-function org-html-publish-to-html)
167 Added: ("mlnp-resources"
168 Added: :base-directory "resources/"
169 Added: :base-extension "css\\|js"
170 Added: :publishing-directory ,(concat org-publish-location "mlnp.fr/resources/")
171 Added: :publishing-function org-publish-attachment)
172 Added: ("resources-pages"
173 Added: :base-directory "resources/"
174 Added: :base-extension "org"
175 Added: :publishing-directory ,(concat org-publish-location "mlnp.fr/resources/")
176 Added: :publishing-function org-html-publish-to-html)
177 Added: ("mlnp-fonts"
178 Added: :base-directory "resources/fonts/"
179 Added: :base-extension "ttf\\|otf"
180 Added: :publishing-directory ,(concat org-publish-location "mlnp.fr/resources/fonts/")
181 Added: :publishing-function org-publish-attachment)
182 Added: #+END_SRC
226 183
184 Added:
227 185 ** =wiki.mlnp.fr=
228 186
187 Added: #+NAME: wiki.mlnp.fr
188 Added: #+BEGIN_SRC emacs-lisp
189 Added: ("wiki.mlnp.fr"
190 Added: :components ("wiki-main-pages"
191 Added: "wiki-resources"
192 Added: "wiki-fonts"))
193 Added: ("wiki-main-pages"
194 Added: :base-directory "wiki/"
195 Added: :base-extension "org"
196 Added: :publishing-directory ,(concat org-publish-location "wiki.mlnp.fr/")
197 Added: :recursive t
198 Added: :html-head "<link rel='stylesheet' type='text/css' href='http://wiki.mlnp.fr/resources/mlnp.css'>"
199 Added: :auto-sitemap t
200 Added: :sitemap-title "Sitemap for [[http://wiki.mlnp.fr][wiki.mlnp.fr]]"
201 Added: :publishing-function org-html-publish-to-html)
202 Added: ("wiki-resources"
203 Added: :base-directory "resources/"
204 Added: :base-extension "css\\|js"
205 Added: :publishing-directory ,(concat org-publish-location "wiki.mlnp.fr/resources/")
206 Added: :publishing-function org-publish-attachment)
207 Added: ("wiki-fonts"
208 Added: :base-directory "resources/fonts/"
209 Added: :base-extension "ttf\\|otf"
210 Added: :publishing-directory ,(concat org-publish-location "wiki.mlnp.fr/resources/fonts/")
211 Added: :publishing-function org-publish-attachment)
212 Added: #+END_SRC
229 213
214 Added:
230 215 ** =blog.mlnp.fr=
231 216
217 Added: #+NAME: blog.mlnp.fr
218 Added: #+BEGIN_SRC emacs-lisp
219 Added: ("blog.mlnp.fr"
220 Added: :components ("blog-main-pages"
221 Added: "blog-resources"
222 Added: "blog-fonts"))
223 Added: ("blog-main-pages"
224 Added: :base-directory "blog/"
225 Added: :base-extension "org"
226 Added: :publishing-directory ,(concat org-publish-location "blog.mlnp.fr/")
227 Added: :recursive t
228 Added: :html-head "<link rel='stylesheet' type='text/css' href='http://blog.mlnp.fr/resources/mlnp.css'>"
229 Added: :auto-sitemap t
230 Added: :sitemap-title "Sitemap for [[http://blog.mlnp.fr][blog.mlnp.fr]]"
231 Added: :sitemap-sort-files anti-chronologically
232 Added: :publishing-function org-html-publish-to-html)
233 Added: ("blog-resources"
234 Added: :base-directory "resources/"
235 Added: :base-extension "css\\|js"
236 Added: :publishing-directory ,(concat org-publish-location "blog.mlnp.fr/resources/")
237 Added: :publishing-function org-publish-attachment)
238 Added: ("blog-fonts"
239 Added: :base-directory "resources/fonts/"
240 Added: :base-extension "ttf\\|otf"
241 Added: :publishing-directory ,(concat org-publish-location "blog.mlnp.fr/resources/fonts/")
242 Added: :publishing-function org-publish-attachment)
243 Added: #+END_SRC
232 244
233 Removed: * TODO Main publishing logic
234 245
246 Added: * Main publishing logic :main:
247 Added:
235 248 This is the main publishing logic. Execute the following source block
236 249 to build the entire website.
237 250
238 251 #+NAME: main
239 252 #+BEGIN_SRC elisp :noweb no-export
240 253 <<org-publish-location>>
241 Removed: <<org-publish-components>>
242 Removed:
254 Added: <<org-publish-component>>
243 255 <<org-publish-project-alist>>
244 256
245 257 (org-babel-tangle-file "resources/css.org")
246 Removed:
247 258 (org-publish-remove-all-timestamps)
248 Removed: (org-publish org-publish-components)
259 Added:
260 Added: (org-publish org-publish-component)
261 Added: (format "Successfully built %s!" org-publish-component)
249 262 #+END_SRC
250 263
251 264 #+RESULTS: main
265 Added: : Successfully built wiki.mlnp.fr component!
266 Added:
252 267
253 268 Link to the locally built homepages:
254 269