Move std/datetime.d into std/datetime/package.d.

This commit is contained in:
Jonathan M Davis 2017-03-18 01:24:22 -07:00 committed by Jonathan M Davis
parent 78acf07136
commit 8ceb2542e1
4 changed files with 19 additions and 15 deletions

View file

@ -164,7 +164,7 @@ P2MODULES=$(foreach P,$1,$(addprefix $P/,$(PACKAGE_$(subst /,_,$P))))
# xy/zz is in variable PACKAGE_xy_zz. This allows automation in iterating # xy/zz is in variable PACKAGE_xy_zz. This allows automation in iterating
# packages and their modules. # packages and their modules.
STD_PACKAGES = std $(addprefix std/,\ STD_PACKAGES = std $(addprefix std/,\
algorithm container digest experimental/allocator \ algorithm container datetime digest experimental/allocator \
experimental/allocator/building_blocks experimental/logger \ experimental/allocator/building_blocks experimental/logger \
net \ net \
experimental range regex) experimental range regex)
@ -172,7 +172,7 @@ STD_PACKAGES = std $(addprefix std/,\
# Modules broken down per package # Modules broken down per package
PACKAGE_std = array ascii base64 bigint bitmanip compiler complex concurrency \ PACKAGE_std = array ascii base64 bigint bitmanip compiler complex concurrency \
conv csv datetime demangle encoding exception file format \ conv csv demangle encoding exception file format \
functional getopt json math mathspecial meta mmfile numeric \ functional getopt json math mathspecial meta mmfile numeric \
outbuffer parallelism path process random signals socket stdint \ outbuffer parallelism path process random signals socket stdint \
stdio string system traits typecons typetuple uni \ stdio string system traits typecons typetuple uni \
@ -181,6 +181,7 @@ PACKAGE_std_experimental = checkedint typecons
PACKAGE_std_algorithm = comparison iteration mutation package searching setops \ PACKAGE_std_algorithm = comparison iteration mutation package searching setops \
sorting sorting
PACKAGE_std_container = array binaryheap dlist package rbtree slist util PACKAGE_std_container = array binaryheap dlist package rbtree slist util
PACKAGE_std_datetime = package
PACKAGE_std_digest = crc digest hmac md murmurhash ripemd sha PACKAGE_std_digest = crc digest hmac md murmurhash ripemd sha
PACKAGE_std_experimental_logger = core filelogger \ PACKAGE_std_experimental_logger = core filelogger \
nulllogger multilogger package nulllogger multilogger package
@ -557,7 +558,7 @@ publictests: $(LIB)
has_public_example: $(LIB) has_public_example: $(LIB)
# checks whether public function have public examples (for now some modules are excluded) # checks whether public function have public examples (for now some modules are excluded)
rm -rf ./out rm -rf ./out
DFLAGS="$(DFLAGS) $(LIB) -defaultlib= -debuglib= $(LINKDL)" $(DUB) --compiler=$${PWD}/$(DMD) --root=../tools/styles -c has_public_example -- --inputdir . --ignore "etc,array.d,allocator,base64.d,bitmanip.d,concurrency.d,conv.d,csv.d,datetime.d,demangle.d,digest/hmac.d,digest/sha.d,encoding.d,exception.d,file.d,format.d,getopt.d,index.d,internal,isemail.d,json.d,logger/core.d,logger/nulllogger.d,math.d,mathspecial.d,net/curl.d,numeric.d,parallelism.d,path.d,process.d,random.d,range,regex/package.d,socket.d,stdio.d,string.d,traits.d,typecons.d,uni.d,unittest.d,uri.d,utf.d,uuid.d,xml.d,zlib.d" DFLAGS="$(DFLAGS) $(LIB) -defaultlib= -debuglib= $(LINKDL)" $(DUB) --compiler=$${PWD}/$(DMD) --root=../tools/styles -c has_public_example -- --inputdir . --ignore "etc,array.d,allocator,base64.d,bitmanip.d,concurrency.d,conv.d,csv.d,datetime/package.d,demangle.d,digest/hmac.d,digest/sha.d,encoding.d,exception.d,file.d,format.d,getopt.d,index.d,internal,isemail.d,json.d,logger/core.d,logger/nulllogger.d,math.d,mathspecial.d,net/curl.d,numeric.d,parallelism.d,path.d,process.d,random.d,range,regex/package.d,socket.d,stdio.d,string.d,traits.d,typecons.d,uni.d,unittest.d,uri.d,utf.d,uuid.d,xml.d,zlib.d"
.PHONY : auto-tester-build .PHONY : auto-tester-build
auto-tester-build: all checkwhitespace auto-tester-build: all checkwhitespace

View file

@ -150,9 +150,6 @@ SRC_STD_3a= \
std\concurrency.d \ std\concurrency.d \
std\concurrencybase.d std\concurrencybase.d
SRC_STD_3b= \
std\datetime.d
SRC_STD_4= \ SRC_STD_4= \
std\uuid.d std\uuid.d
@ -175,7 +172,6 @@ SRC_STD= \
$(SRC_STD_2a) \ $(SRC_STD_2a) \
$(SRC_STD_3) \ $(SRC_STD_3) \
$(SRC_STD_3a) \ $(SRC_STD_3a) \
$(SRC_STD_3b) \
$(SRC_STD_4) \ $(SRC_STD_4) \
$(SRC_STD_6) \ $(SRC_STD_6) \
$(SRC_STD_7) $(SRC_STD_7)
@ -199,6 +195,9 @@ SRC_STD_CONTAINER= \
std\container\util.d \ std\container\util.d \
std\container\package.d std\container\package.d
SRC_STD_DATETIME= \
std\datetime\package.d
SRC_STD_DIGEST= \ SRC_STD_DIGEST= \
std\digest\crc.d \ std\digest\crc.d \
std\digest\sha.d \ std\digest\sha.d \
@ -342,6 +341,7 @@ SRC_TO_COMPILE= \
$(SRC_STD) \ $(SRC_STD) \
$(SRC_STD_ALGO) \ $(SRC_STD_ALGO) \
$(SRC_STD_CONTAINER) \ $(SRC_STD_CONTAINER) \
$(SRC_STD_DATETIME) \
$(SRC_STD_DIGEST) \ $(SRC_STD_DIGEST) \
$(SRC_STD_NET) \ $(SRC_STD_NET) \
$(SRC_STD_RANGE) \ $(SRC_STD_RANGE) \
@ -567,7 +567,7 @@ unittest : $(LIB)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest2a.obj $(SRC_STD_2a) $(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest2a.obj $(SRC_STD_2a)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest3.obj $(SRC_STD_3) $(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest3.obj $(SRC_STD_3)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest3a.obj $(SRC_STD_3a) $(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest3a.obj $(SRC_STD_3a)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest3b.obj $(SRC_STD_3b) $(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest3b.obj $(SRC_STD_DATETIME)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest4.obj $(SRC_STD_4) $(SRC_STD_DIGEST) $(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest4.obj $(SRC_STD_4) $(SRC_STD_DIGEST)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest5.obj $(SRC_STD_ALGO) $(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest5.obj $(SRC_STD_ALGO)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest6.obj $(SRC_STD_6) $(SRC_STD_CONTAINER) $(SRC_STD_EXP_ALLOC) $(SRC_STD_EXP_LOGGER) $(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest6.obj $(SRC_STD_6) $(SRC_STD_CONTAINER) $(SRC_STD_EXP_ALLOC) $(SRC_STD_EXP_LOGGER)
@ -628,7 +628,7 @@ cov : $(SRC_TO_COMPILE) $(LIB)
$(DMD) -conf= -cov=92 -unittest -main -run std\exception.d $(DMD) -conf= -cov=92 -unittest -main -run std\exception.d
$(DMD) -conf= -cov=73 -unittest -main -run std\concurrency.d $(DMD) -conf= -cov=73 -unittest -main -run std\concurrency.d
$(DMD) -conf= -cov=100 -unittest -main -run std\concurrencybase.d $(DMD) -conf= -cov=100 -unittest -main -run std\concurrencybase.d
$(DMD) -conf= -cov=95 -unittest -main -run std\datetime.d $(DMD) -conf= -cov=95 -unittest -main -run std\datetime\package.d
$(DMD) -conf= -cov=96 -unittest -main -run std\uuid.d $(DMD) -conf= -cov=96 -unittest -main -run std\uuid.d
$(DMD) -conf= -cov=100 -unittest -main -run std\digest\crc.d $(DMD) -conf= -cov=100 -unittest -main -run std\digest\crc.d
$(DMD) -conf= -cov=55 -unittest -main -run std\digest\sha.d $(DMD) -conf= -cov=55 -unittest -main -run std\digest\sha.d
@ -823,8 +823,8 @@ $(DOC)\std_range_interfaces.html : $(STDDOC) std\range\interfaces.d
$(DOC)\std_csv.html : $(STDDOC) std\csv.d $(DOC)\std_csv.html : $(STDDOC) std\csv.d
$(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_csv.html $(STDDOC) std\csv.d $(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_csv.html $(STDDOC) std\csv.d
$(DOC)\std_datetime.html : $(STDDOC) std\datetime.d $(DOC)\std_datetime.html : $(STDDOC) std\datetime\package.d
$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_datetime.html $(STDDOC) std\datetime.d $(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_datetime.html $(STDDOC) std\datetime\package.d
$(DOC)\std_demangle.html : $(STDDOC) std\demangle.d $(DOC)\std_demangle.html : $(STDDOC) std\demangle.d
$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_demangle.html $(STDDOC) std\demangle.d $(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_demangle.html $(STDDOC) std\demangle.d

View file

@ -157,7 +157,6 @@ SRC_STD_3c= \
std\concurrencybase.d std\concurrencybase.d
SRC_STD_3d= \ SRC_STD_3d= \
std\datetime.d \
std\bitmanip.d \ std\bitmanip.d \
std\typecons.d std\typecons.d
@ -221,6 +220,9 @@ SRC_STD_CONTAINER= \
std\container\util.d \ std\container\util.d \
std\container\package.d std\container\package.d
SRC_STD_DATETIME= \
std\datetime\package.d
SRC_STD_DIGEST= \ SRC_STD_DIGEST= \
std\digest\crc.d \ std\digest\crc.d \
std\digest\sha.d \ std\digest\sha.d \
@ -364,6 +366,7 @@ SRC_TO_COMPILE= \
$(SRC_STD) \ $(SRC_STD) \
$(SRC_STD_ALGO) \ $(SRC_STD_ALGO) \
$(SRC_STD_CONTAINER) \ $(SRC_STD_CONTAINER) \
$(SRC_STD_DATETIME) \
$(SRC_STD_DIGEST) \ $(SRC_STD_DIGEST) \
$(SRC_STD_NET) \ $(SRC_STD_NET) \
$(SRC_STD_RANGE) \ $(SRC_STD_RANGE) \
@ -601,7 +604,7 @@ unittest : $(LIB)
$(DMD) $(UDFLAGS) -c -unittest -ofunittest3a.obj $(SRC_STD_3a) $(DMD) $(UDFLAGS) -c -unittest -ofunittest3a.obj $(SRC_STD_3a)
$(DMD) $(UDFLAGS) -c -unittest -ofunittest3b.obj $(SRC_STD_3b) $(DMD) $(UDFLAGS) -c -unittest -ofunittest3b.obj $(SRC_STD_3b)
$(DMD) $(UDFLAGS) -c -unittest -ofunittest3c.obj $(SRC_STD_3c) $(DMD) $(UDFLAGS) -c -unittest -ofunittest3c.obj $(SRC_STD_3c)
$(DMD) $(UDFLAGS) -c -unittest -ofunittest3d.obj $(SRC_STD_3d) $(DMD) $(UDFLAGS) -c -unittest -ofunittest3d.obj $(SRC_STD_3d) $(SRC_STD_DATETIME)
$(DMD) $(UDFLAGS) -c -unittest -ofunittest4.obj $(SRC_STD_4) $(SRC_STD_DIGEST) $(DMD) $(UDFLAGS) -c -unittest -ofunittest4.obj $(SRC_STD_4) $(SRC_STD_DIGEST)
$(DMD) $(UDFLAGS) -c -unittest -ofunittest5a.obj $(SRC_STD_ALGO_1) $(DMD) $(UDFLAGS) -c -unittest -ofunittest5a.obj $(SRC_STD_ALGO_1)
$(DMD) $(UDFLAGS) -c -unittest -ofunittest5b.obj $(SRC_STD_ALGO_2) $(DMD) $(UDFLAGS) -c -unittest -ofunittest5b.obj $(SRC_STD_ALGO_2)
@ -800,8 +803,8 @@ $(DOC)\std_range_interfaces.html : $(STDDOC) std\range\interfaces.d
$(DOC)\std_csv.html : $(STDDOC) std\csv.d $(DOC)\std_csv.html : $(STDDOC) std\csv.d
$(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_csv.html $(STDDOC) std\csv.d $(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_csv.html $(STDDOC) std\csv.d
$(DOC)\std_datetime.html : $(STDDOC) std\datetime.d $(DOC)\std_datetime.html : $(STDDOC) std\datetime\package.d
$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_datetime.html $(STDDOC) std\datetime.d $(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_datetime.html $(STDDOC) std\datetime\package.d
$(DOC)\std_demangle.html : $(STDDOC) std\demangle.d $(DOC)\std_demangle.html : $(STDDOC) std\demangle.d
$(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_demangle.html $(STDDOC) std\demangle.d $(DMD) -c -o- $(DDOCFLAGS) -Df$(DOC)\std_demangle.html $(STDDOC) std\demangle.d