Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove extension when sorting so X.coffee comes before X.Y.coffee.

Browse Source
This commit is contained in:
ccd0 2016-04-15 08:52:21 -07:00
parent 12c04fa12d
commit c6b4569824
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -27,9 +27,8 @@ parts := Config API classes General Filtering Quotelinks Posting Images Linkific
intermediate := LICENSE src/meta/fbegin.js tmp/declaration.js tmp/globals.js $(foreach p,$(parts),tmp/$(p).js) src/meta/fend.js intermediate := LICENSE src/meta/fbegin.js tmp/declaration.js tmp/globals.js $(foreach p,$(parts),tmp/$(p).js) src/meta/fend.js
define sorted_dir # remove extension when sorting so X.coffee comes before X.Y.coffee
sources_$1 := $$(sort $$(wildcard src/$1/*.coffee)) sort_dir = $(subst !,.coffee,$(sort $(subst .coffee,!,$(wildcard src/$1/*.coffee))))
endef
sources_Config := \ sources_Config := \
src/General/Config.coffee src/General/Config.coffee
@ -52,7 +51,7 @@ sources_General := \
$(foreach d, \ $(foreach d, \
Filtering Quotelinks \ Filtering Quotelinks \
,$(eval $(call sorted_dir,$(d)))) ,$(eval sources_$(d) := $(call sort_dir,$(d))))
sources_Posting := \ sources_Posting := \
src/Posting/QR.coffee \ src/Posting/QR.coffee \
@ -63,11 +62,11 @@ sources_Posting := \
$(sort $(wildcard src/Posting/QR.*.coffee)) $(sort $(wildcard src/Posting/QR.*.coffee))
sources_Images := \ sources_Images := \
$(sort $(filter-out %/ImageCommon.coffee,$(wildcard src/Images/*.coffee))) $(filter-out %/ImageCommon.coffee,$(call sort_dir,Images))
$(foreach d, \ $(foreach d, \
Linkification Menu Monitoring Archive Miscellaneous \ Linkification Menu Monitoring Archive Miscellaneous \
S ,$(eval $(call sorted_dir,$(d)))) S ,$(eval sources_$(d) := $(call sort_dir,$(d))))
sources_Main := \ sources_Main := \
src/General/Main.coffee src/General/Main.coffee