Skip to content

Commit 461b69b

Browse files
author
Sam Kleinman
committed
build: simplifying table building
1 parent 90a3ab2 commit 461b69b

File tree

6 files changed

+14
-68
lines changed

6 files changed

+14
-68
lines changed

bin/builder_data.py

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
.. code-block:: makefile
1212
1313
-include $(output)/makefile.pdfs
14-
-include $(output)/makefile.tables
1514
-include $(output)/makefile.links
1615
-include $(output)/makefile.sphinx
1716
-include $(output)/makefile.releases
@@ -80,27 +79,6 @@
8079
# The elements in the ``texinfo`` list are the texinfo filenames generated by Sphinx.
8180
texinfo = [ 'mongodb-reference', 'mongodb-crud', 'mongodb-manual' ]
8281

83-
tables = [
84-
# The elements of the tuples in the ``pdfs`` list are:
85-
# 0. ``name``: the name of the source, without the .yaml extenison.
86-
# 1. ``makefile_block``: the name block of the makefile, which
87-
# captures which group of charts this file contributes to.
88-
#
89-
# (name, makefile_block),
90-
('$(rst-include)/table-sql-to-agg-terms', 'agg'),
91-
('$(rst-include)/table-sql-to-agg-examples', 'agg'),
92-
('$(rst-include)/table-sql-to-mongo-executables', 'sql'),
93-
('$(rst-include)/table-sql-to-mongo-terms', 'sql'),
94-
('$(rst-include)/table-sql-to-mongo-schema-examples', 'sql'),
95-
('$(rst-include)/table-sql-to-mongo-insert-examples', 'sql'),
96-
('$(rst-include)/table-sql-to-mongo-select-examples', 'sql'),
97-
('$(rst-include)/table-sql-to-mongo-update-examples', 'sql'),
98-
('$(rst-include)/table-sql-to-mongo-delete-examples', 'sql'),
99-
('$(rst-include)/table-lock-behavior-per-operation', 'concurrency'),
100-
('$(rst-include)/table-mongodb-extended-json', 'json'),
101-
('$(rst-include)/table-index-nav', 'struct'),
102-
]
103-
10482
sphinx = [
10583
# The items in the ``sphinx`` list are the name of the sphinx builder.
10684
#

bin/makefile-builder/tables.py

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

bin/makefile.content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
sphinx-content += manual-pdfs
22
sphinx-content += manual-info
3-
sphinx-content += $(public-branch-output)
3+
sphinx-content += $(public-branch-output)
44
sphinx-content += $(public-branch-output)/single
55
sphinx-content += $(public-branch-output)/single/index.html
66
sphinx-content += $(public-branch-output)/MongoDB-Manual.epub

bin/makefile.dynamic

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
-include $(output)/makefile.pdfs
55
-include $(output)/makefile.texinfo
6-
-include $(output)/makefile.tables
76
-include $(output)/makefile.links
87
-include $(output)/makefile.intersphinx
98
-include $(output)/makefile.sphinx

bin/makefile.tables

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
table-output = $(subst yaml,rst,$(shell find $(rst-include)/ -name "table-*.yaml"))
2+
3+
$(rst-include)/table-%.rst:$(rst-include)/table-%.yaml
4+
@$(PYTHONBIN) bin/table_builder.py $< $@
5+
@echo [table-builder]: generated $@ table for inclusion
6+
7+
.PHONY:tables clean-tables
8+
tables:$(table-output)
9+
@-git update-index --assume-unchanged
10+
@echo [tables]: cleansing git index of compiled tables
11+
clean-tables:
12+
@-rm -rf $(table-output)

makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ help:
3333
include bin/makefile.dynamic
3434
include bin/makefile.clean
3535
include bin/makefile.content
36+
include bin/makefile.tables
3637
include bin/makefile.push
3738

3839
############# Meta targets that control the build and publication process. #############

0 commit comments

Comments
 (0)