try to get book build working outside submodule

hjwp · hjwp · commit fd4f9d4465c5 · 2020-03-16T16:04:39.000Z
diff --git a/Makefile b/Makefile
@@ -7,9 +7,7 @@ build:
 watch-build:
 	ls **/*.md **/*.html *.py | entr ./generate-html.py
 
-update-book:
-	cd book && make html
+update-book:  ## assumes book repo is at ../book
+	cd ../book && make html
 	./copy-and-fix-book-html.py
-	rsync -a -v book/images/ _site/book/images/
-
-
+	rsync -a -v ../book/images/ _site/book/images/
diff --git a/_site/book/appendix_csvs.html b/_site/book/appendix_csvs.html
@@ -412,7 +412,7 @@ <h3 id="_implementing_a_repository_and_unit_of_work_for_csvs">Implementing a Rep
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-03-16 11:03:29 UTC
+Last updated 2020-03-10 17:15:49 UTC
 </div>
 </div>
 <style>
diff --git a/_site/book/appendix_django.html b/_site/book/appendix_django.html
@@ -654,7 +654,7 @@ <h3 id="_steps_along_the_way">Steps Along the Way</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-03-16 11:03:29 UTC
+Last updated 2020-03-10 17:16:05 UTC
 </div>
 </div>
 <style>
diff --git a/_site/book/appendix_ds1_table.html b/_site/book/appendix_ds1_table.html
@@ -220,7 +220,7 @@ <h2 id="appendix_ds1_table">Appendix A: Summary Diagram and Table</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-03-16 11:03:29 UTC
+Last updated 2020-03-10 12:41:58 UTC
 </div>
 </div>
 <div><div id="disqus_thread" style="margin: 10px"></div>
diff --git a/_site/book/appendix_project_structure.html b/_site/book/appendix_project_structure.html
@@ -642,7 +642,7 @@ <h3 id="_wrap_up">Wrap-Up</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-03-16 11:03:29 UTC
+Last updated 2020-03-10 12:41:58 UTC
 </div>
 </div>
 <style>
diff --git a/_site/book/appendix_validation.html b/_site/book/appendix_validation.html
@@ -721,7 +721,7 @@ <h3 id="_validating_pragmatics">Validating Pragmatics</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-03-16 11:03:29 UTC
+Last updated 2020-03-10 12:41:58 UTC
 </div>
 </div>
 <style>
diff --git a/_site/book/chapter_01_domain_model.html b/_site/book/chapter_01_domain_model.html
@@ -1221,7 +1221,7 @@ <h4 id="_exceptions_can_express_domain_concepts_too">Exceptions Can Express Doma
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-03-16 11:03:29 UTC
+Last updated 2020-03-10 17:16:05 UTC
 </div>
 </div>
 <style>
diff --git a/_site/book/chapter_02_repository.html b/_site/book/chapter_02_repository.html
@@ -1220,7 +1220,7 @@ <h3 id="_wrap_up">Wrap-Up</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-03-16 11:03:29 UTC
+Last updated 2020-03-10 17:16:05 UTC
 </div>
 </div>
 <style>
diff --git a/_site/book/chapter_03_abstractions.html b/_site/book/chapter_03_abstractions.html
@@ -999,7 +999,7 @@ <h3 id="_wrap_up">Wrap-Up</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-03-16 11:03:29 UTC
+Last updated 2020-03-10 17:16:05 UTC
 </div>
 </div>
 <style>
diff --git a/_site/book/chapter_04_service_layer.html b/_site/book/chapter_04_service_layer.html
@@ -1147,7 +1147,7 @@ <h4 id="_the_dip_in_action">The DIP in Action</h4>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-03-16 11:03:29 UTC
+Last updated 2020-03-10 17:16:05 UTC
 </div>
 </div>
 <style>
diff --git a/_site/book/chapter_05_high_gear_low_gear.html b/_site/book/chapter_05_high_gear_low_gear.html
@@ -714,7 +714,7 @@ <h3 id="_wrap_up">Wrap-Up</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-03-16 11:03:29 UTC
+Last updated 2020-03-10 17:16:05 UTC
 </div>
 </div>
 <style>
diff --git a/_site/book/chapter_06_uow.html b/_site/book/chapter_06_uow.html
@@ -979,7 +979,7 @@ <h3 id="_wrap_up">Wrap-Up</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-03-16 11:03:29 UTC
+Last updated 2020-03-10 17:15:49 UTC
 </div>
 </div>
 <style>
diff --git a/_site/book/chapter_07_aggregate.html b/_site/book/chapter_07_aggregate.html
@@ -1354,7 +1354,7 @@ <h3 id="_part_i_recap">Part I Recap</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-03-16 11:03:29 UTC
+Last updated 2020-03-10 17:16:05 UTC
 </div>
 </div>
 <style>
diff --git a/_site/book/chapter_08_events_and_message_bus.html b/_site/book/chapter_08_events_and_message_bus.html
@@ -1103,7 +1103,7 @@ <h3 id="_wrap_up">Wrap-Up</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-03-16 11:03:29 UTC
+Last updated 2020-03-10 17:15:49 UTC
 </div>
 </div>
 <style>
diff --git a/_site/book/chapter_09_all_messagebus.html b/_site/book/chapter_09_all_messagebus.html
@@ -1230,7 +1230,7 @@ <h4 id="_why_have_we_achieved">Why Have We Achieved?</h4>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-03-16 11:03:29 UTC
+Last updated 2020-03-10 17:16:05 UTC
 </div>
 </div>
 <style>
diff --git a/_site/book/chapter_10_commands.html b/_site/book/chapter_10_commands.html
@@ -783,7 +783,7 @@ <h3 id="_wrap_up">Wrap-Up</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-03-16 11:03:29 UTC
+Last updated 2020-03-10 17:15:49 UTC
 </div>
 </div>
 <style>
diff --git a/_site/book/chapter_11_external_events.html b/_site/book/chapter_11_external_events.html
@@ -862,7 +862,7 @@ <h3 id="_wrap_up">Wrap-Up</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-03-16 11:03:29 UTC
+Last updated 2020-03-10 17:16:05 UTC
 </div>
 </div>
 <style>
diff --git a/_site/book/chapter_12_cqrs.html b/_site/book/chapter_12_cqrs.html
@@ -1169,7 +1169,7 @@ <h3 id="_wrap_up">Wrap-Up</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-03-16 11:03:29 UTC
+Last updated 2020-03-10 17:16:05 UTC
 </div>
 </div>
 <style>
diff --git a/_site/book/chapter_13_dependency_injection.html b/_site/book/chapter_13_dependency_injection.html
@@ -1374,7 +1374,7 @@ <h3 id="_wrap_up">Wrap-Up</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-03-16 11:03:29 UTC
+Last updated 2020-03-10 17:16:05 UTC
 </div>
 </div>
 <style>
diff --git a/_site/book/epilogue_1_how_to_get_there_from_here.html b/_site/book/epilogue_1_how_to_get_there_from_here.html
@@ -1210,7 +1210,7 @@ <h3 id="_wrap_up">Wrap-Up</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-03-16 11:03:29 UTC
+Last updated 2020-03-16 11:29:24 UTC
 </div>
 </div>
 <style>
diff --git a/_site/book/introduction.html b/_site/book/introduction.html
@@ -465,7 +465,7 @@ <h3 id="_a_place_for_all_our_business_logic_the_domain_model">A Place for All Ou
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-03-16 11:03:29 UTC
+Last updated 2020-03-10 17:16:05 UTC
 </div>
 </div>
 <style>
diff --git a/_site/book/part1.html b/_site/book/part1.html
@@ -210,7 +210,7 @@ <h2 id="part1">Building an Architecture to Support Domain Modeling</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-03-16 11:03:29 UTC
+Last updated 2020-03-10 12:41:58 UTC
 </div>
 </div>
 <div><div id="disqus_thread" style="margin: 10px"></div>
diff --git a/_site/book/part2.html b/_site/book/part2.html
@@ -183,7 +183,7 @@ <h2 id="part2">Event-Driven Architecture</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-03-16 11:03:29 UTC
+Last updated 2020-03-10 12:41:58 UTC
 </div>
 </div>
 <div><div id="disqus_thread" style="margin: 10px"></div>
diff --git a/_site/book/preface.html b/_site/book/preface.html
@@ -607,7 +607,7 @@ <h3 id="_acknowledgments">Acknowledgments</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-03-16 11:03:29 UTC
+Last updated 2020-03-10 17:16:05 UTC
 </div>
 </div>
 <div><div id="disqus_thread" style="margin: 10px"></div>
diff --git a/copy-and-fix-book-html.py b/copy-and-fix-book-html.py
@@ -5,11 +5,12 @@
 from lxml import html
 import subprocess
 
+BOOK_SOURCE = Path('../book')
 DEST = Path('_site/book')
 
 CHAPTERS = [
     c.replace('.asciidoc', '.html')
-    for c in json.loads(Path('book/atlas.json').read_text())['files']
+    for c in json.loads((BOOK_SOURCE / 'atlas.json').read_text())['files']
     if c.partition('.')[0] not in [
         'cover',
         'titlepage',
@@ -26,7 +27,7 @@
 
 def parse_chapters():
     for chapter in CHAPTERS:
-        path = Path('book') / chapter
+        path = BOOK_SOURCE / chapter
         yield chapter, html.fromstring(path.read_text())
 
 
@@ -126,7 +127,7 @@ def copy_chapters_across_with_fixes(chapter_info, fixed_toc):
     )
 
     for chapter in CHAPTERS:
-        old_contents = Path(f'book/{chapter}').read_text()
+        old_contents = (BOOK_SOURCE / chapter).read_text()
         new_contents = fix_xrefs(old_contents, chapter, chapter_info)
         new_contents = fix_title(new_contents, chapter, chapter_info)
         parsed = html.fromstring(new_contents)
@@ -147,7 +148,7 @@ def copy_chapters_across_with_fixes(chapter_info, fixed_toc):
 
 
 def extract_toc_from_book():
-    parsed = html.fromstring(Path('book/book.html').read_text())
+    parsed = html.fromstring((BOOK_SOURCE / 'book.html').read_text())
     return parsed.cssselect('#toc')[0]
 
 
