Prepare to split up std.algorithm into submodules.

This commit is contained in:
H. S. Teoh 2015-01-17 14:41:41 -08:00
parent 5103611d2c
commit 48040701a5
2 changed files with 9 additions and 3 deletions

View file

@ -91,7 +91,7 @@ DOCSRC = ../dlang.org
WEBSITE_DIR = ../web WEBSITE_DIR = ../web
DOC_OUTPUT_DIR = $(WEBSITE_DIR)/phobos-prerelease DOC_OUTPUT_DIR = $(WEBSITE_DIR)/phobos-prerelease
BIGDOC_OUTPUT_DIR = /tmp BIGDOC_OUTPUT_DIR = /tmp
SRC_DOCUMENTABLES = index.d $(addsuffix .d,$(STD_MODULES) $(STD_NET_MODULES) $(STD_DIGEST_MODULES) $(STD_CONTAINER_MODULES) $(STD_RANGE_MODULES) std/regex/package $(EXTRA_DOCUMENTABLES)) SRC_DOCUMENTABLES = index.d $(addsuffix .d,$(STD_MODULES) $(STD_NET_MODULES) $(STD_DIGEST_MODULES) $(STD_CONTAINER_MODULES) $(STD_RANGE_MODULES) $(STD_ALGO_MODULES) std/regex/package $(EXTRA_DOCUMENTABLES))
STDDOC = $(DOCSRC)/html.ddoc $(DOCSRC)/dlang.org.ddoc $(DOCSRC)/std_navbar-prerelease.ddoc $(DOCSRC)/std.ddoc $(DOCSRC)/macros.ddoc STDDOC = $(DOCSRC)/html.ddoc $(DOCSRC)/dlang.org.ddoc $(DOCSRC)/std_navbar-prerelease.ddoc $(DOCSRC)/std.ddoc $(DOCSRC)/macros.ddoc
BIGSTDDOC = $(DOCSRC)/std_consolidated.ddoc $(DOCSRC)/macros.ddoc BIGSTDDOC = $(DOCSRC)/std_consolidated.ddoc $(DOCSRC)/macros.ddoc
# Set DDOC, the documentation generator # Set DDOC, the documentation generator
@ -182,7 +182,7 @@ LINKCURL:=$(if $(LIBCURL_STUB),-L$(LIBCURL_STUB),-L-lcurl)
MAIN = $(ROOT)/emptymain.d MAIN = $(ROOT)/emptymain.d
# Stuff in std/ # Stuff in std/
STD_MODULES = $(addprefix std/, algorithm array ascii base64 bigint \ STD_MODULES = $(addprefix std/, array ascii base64 bigint \
bitmanip compiler complex concurrency conv \ bitmanip compiler complex concurrency conv \
cstream csv datetime demangle encoding exception \ cstream csv datetime demangle encoding exception \
file format functional getopt json math mathspecial \ file format functional getopt json math mathspecial \
@ -196,6 +196,8 @@ STD_NET_MODULES = $(addprefix std/net/, isemail curl)
STD_REGEX_MODULES = $(addprefix std/regex/, package $(addprefix internal/, \ STD_REGEX_MODULES = $(addprefix std/regex/, package $(addprefix internal/, \
generator ir parser backtracking kickstart tests thompson)) generator ir parser backtracking kickstart tests thompson))
STD_ALGO_MODULES = $(addprefix std/algorithm/, package)
STD_RANGE_MODULES = $(addprefix std/range/, package primitives interfaces) STD_RANGE_MODULES = $(addprefix std/range/, package primitives interfaces)
STD_DIGEST_MODULES = $(addprefix std/digest/, digest crc md ripemd sha) STD_DIGEST_MODULES = $(addprefix std/digest/, digest crc md ripemd sha)
@ -229,7 +231,8 @@ EXTRA_MODULES += $(EXTRA_DOCUMENTABLES) $(addprefix \
# Aggregate all D modules relevant to this build # Aggregate all D modules relevant to this build
D_MODULES = $(STD_MODULES) $(EXTRA_MODULES) $(STD_NET_MODULES) \ D_MODULES = $(STD_MODULES) $(EXTRA_MODULES) $(STD_NET_MODULES) \
$(STD_DIGEST_MODULES) $(STD_CONTAINER_MODULES) $(STD_REGEX_MODULES) $(STD_RANGE_MODULES) $(STD_DIGEST_MODULES) $(STD_CONTAINER_MODULES) $(STD_REGEX_MODULES) \
$(STD_RANGE_MODULES) $(STD_ALGO_MODULES)
# Add the .d suffix to the module names # Add the .d suffix to the module names
D_FILES = $(addsuffix .d,$(D_MODULES)) D_FILES = $(addsuffix .d,$(D_MODULES))
# Aggregate all D modules over all OSs (this is for the zip file) # Aggregate all D modules over all OSs (this is for the zip file)
@ -428,6 +431,9 @@ $(DOC_OUTPUT_DIR)/std_c_windows_%.html : std/c/windows/%.d $(STDDOC)
$(DOC_OUTPUT_DIR)/std_container_%.html : std/container/%.d $(STDDOC) $(DOC_OUTPUT_DIR)/std_container_%.html : std/container/%.d $(STDDOC)
$(DDOC) project.ddoc $(STDDOC) -Df$@ $< $(DDOC) project.ddoc $(STDDOC) -Df$@ $<
$(DOC_OUTPUT_DIR)/std_algorithm_%.html : std/algorithm/%.d $(STDDOC)
$(DDOC) project.ddoc $(STDDOC) -Df$@ $<
$(DOC_OUTPUT_DIR)/std_range_%.html : std/range/%.d $(STDDOC) $(DOC_OUTPUT_DIR)/std_range_%.html : std/range/%.d $(STDDOC)
$(DDOC) project.ddoc $(STDDOC) -Df$@ $< $(DDOC) project.ddoc $(STDDOC) -Df$@ $<