From 0488f30197fab31c338fb4992b2ebf21c89b8083 Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Fri, 15 Apr 2016 22:09:38 -0700
Subject: [PATCH] Break up src/General.

---
 Makefile                                     | 44 ++++++--------------
 src/{General => main}/Config.coffee          |  0
 src/{General => main}/Main.coffee            |  0
 src/{General => main}/eventPage.coffee       |  0
 src/{General => main}/globals.js             |  0
 src/{General => platform}/$$.coffee          |  0
 src/{General => platform}/$.coffee           |  0
 src/{General => platform}/CrossOrigin.coffee |  0
 8 files changed, 12 insertions(+), 32 deletions(-)
 rename src/{General => main}/Config.coffee (100%)
 rename src/{General => main}/Main.coffee (100%)
 rename src/{General => main}/eventPage.coffee (100%)
 rename src/{General => main}/globals.js (100%)
 rename src/{General => platform}/$$.coffee (100%)
 rename src/{General => platform}/$.coffee (100%)
 rename src/{General => platform}/CrossOrigin.coffee (100%)

diff --git a/Makefile b/Makefile
index 61dbdecfd..7e750102b 100644
--- a/Makefile
+++ b/Makefile
@@ -28,29 +28,9 @@ parts := Config platform classes General Archive Filtering Images Linkification
 intermediate := LICENSE src/meta/fbegin.js tmp/declaration.js tmp/globals.js $(foreach p,$(parts),tmp/$(p).js) src/meta/fend.js
 
 # remove extension when sorting so X.coffee comes before X.Y.coffee
-sort_dir = $(subst !,.coffee,$(sort $(subst .coffee,!,$(wildcard src/$1/*.coffee))))
-
-sources_Config := \
- src/General/Config.coffee
-
-sources_platform := \
- src/General/$$.coffee \
- src/General/$$$$.coffee \
- src/General/CrossOrigin.coffee
-
-sources_classes := $(call sort_dir,classes)
-
-sources_General := \
- $(filter-out \
-  %/$$.coffee %/$$$$.coffee %/Config.coffee %/CrossOrigin.coffee %/Main.coffee %/eventPage.coffee \
-  ,$(call sort_dir,General))
-
-$(foreach d, \
- Archive Filtering Images Linkification Menu Miscellaneous Monitoring Posting Quotelinks \
- ,$(eval sources_$(d) := $(call sort_dir,$(d))))
-
-sources_Main := \
- src/General/Main.coffee
+sources = \
+ $(subst !,.coffee,$(sort $(subst .coffee,!, \
+  $(wildcard src/$1/*.coffee src/main/$1.coffee))))
 
 imports_Config := \
  src/Archive/archives.json \
@@ -116,37 +96,37 @@ tmp/style.css : src/css/style.css $(imports_style) $(template_deps) | tmp
 tmp/declaration.js : .events/declare
 	
 
-tmp/globals.js : src/General/globals.js version.json $(template_deps) | tmp
+tmp/globals.js : src/main/globals.js version.json $(template_deps) | tmp
 	$(template) $< $@
 
 define rules_part
 
-tmp/$1.jst : $$(sources_$1) $(cat_deps) | tmp
-	$(cat) $$(sources_$1) $$@
+tmp/$1.jst : $$(call sources,$1) $(cat_deps) | tmp
+	$(cat) $$(call sources,$1) $$@
 
 tmp/$1.coffee : tmp/$1.jst $$(filter-out %.coffee,$$(wildcard src/$1/*.* src/$1/*/*.* src/$1/*/*/*.*)) $$(imports_$1) .tests_enabled $(template_deps)
 	$(template) $$< $$@
 
 tmp/$1.js : tmp/$1.coffee $(coffee_deps) tools/globalize.js
 	$(coffee) $$<
-	node tools/globalize.js $$@ $$(sources_$1)
+	node tools/globalize.js $$@ $$(call sources,$1)
 
 endef
 
 $(foreach i,$(filter-out platform,$(parts)),$(eval $(call rules_part,$(i))))
 
-tmp/platform.jst : $(sources_platform) $(cat_deps) | tmp
-	$(cat) $(subst $$,$(ESC_DOLLAR),$(sources_platform)) $@
+tmp/platform.jst : $(call sources,platform) $(cat_deps) | tmp
+	$(cat) $(subst $$,$(ESC_DOLLAR),$(call sources,platform)) $@
 
 tmp/platform_%.coffee : tmp/platform.jst $(template_deps)
 	$(template) $< $@ type=$*
 
 tmp/platform_%.js : tmp/platform_%.coffee $(coffee_deps)
 	$(coffee) $<
-	node tools/globalize.js $@ $(subst $$,$(ESC_DOLLAR),$(sources_platform))
+	node tools/globalize.js $@ $(subst $$,$(ESC_DOLLAR),$(call sources,platform))
 
-tmp/eventPage.js : src/General/eventPage.coffee $(coffee_deps) | tmp
-	$(coffee) -o tmp src/General/eventPage.coffee
+tmp/eventPage.js : src/main/eventPage.coffee $(coffee_deps) | tmp
+	$(coffee) -o tmp src/main/eventPage.coffee
 
 define rules_channel
 
diff --git a/src/General/Config.coffee b/src/main/Config.coffee
similarity index 100%
rename from src/General/Config.coffee
rename to src/main/Config.coffee
diff --git a/src/General/Main.coffee b/src/main/Main.coffee
similarity index 100%
rename from src/General/Main.coffee
rename to src/main/Main.coffee
diff --git a/src/General/eventPage.coffee b/src/main/eventPage.coffee
similarity index 100%
rename from src/General/eventPage.coffee
rename to src/main/eventPage.coffee
diff --git a/src/General/globals.js b/src/main/globals.js
similarity index 100%
rename from src/General/globals.js
rename to src/main/globals.js
diff --git a/src/General/$$.coffee b/src/platform/$$.coffee
similarity index 100%
rename from src/General/$$.coffee
rename to src/platform/$$.coffee
diff --git a/src/General/$.coffee b/src/platform/$.coffee
similarity index 100%
rename from src/General/$.coffee
rename to src/platform/$.coffee
diff --git a/src/General/CrossOrigin.coffee b/src/platform/CrossOrigin.coffee
similarity index 100%
rename from src/General/CrossOrigin.coffee
rename to src/platform/CrossOrigin.coffee