From 213d898b1b1019cb86e36563b5eedd60b66d100f Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Sat, 16 Apr 2016 10:39:05 -0700
Subject: [PATCH] Special treatment of src/main confused Windows and was
 needlessly complex.

---
 Makefile                                         | 14 +++++++-------
 src/{main => config}/Config.coffee               |  2 +-
 src/{main/Config.usercss.css => config/user.css} |  0
 src/{main => globals}/globals.js                 |  0
 src/{main => meta}/eventPage.coffee              |  0
 tools/globalize.js                               |  6 ++----
 6 files changed, 10 insertions(+), 12 deletions(-)
 rename src/{main => config}/Config.coffee (99%)
 rename src/{main/Config.usercss.css => config/user.css} (100%)
 rename src/{main => globals}/globals.js (100%)
 rename src/{main => meta}/eventPage.coffee (100%)

diff --git a/Makefile b/Makefile
index c4a6965c2..b426dd2b0 100644
--- a/Makefile
+++ b/Makefile
@@ -26,29 +26,29 @@ cat_deps := tools/cat.js
 capitalized = $(filter-out a,$(foreach x,$1,$(subst a $(x),,$(sort a $(x)))))
 
 parts := \
- globals Config css platform classes \
+ globals config css platform classes \
  $(sort $(call capitalized, \
   $(subst src/,,$(wildcard src/*)) \
  )) \
- Main
+ main
 
 lang = $(if $(filter globals css,$1),js,coffee)
 
 # remove extension when sorting so X.coffee comes before X.Y.coffee
 sources_lang = \
  $(subst !,.$2,$(sort $(subst .$2,!, \
-  $(wildcard src/$1/*.$2 src/main/$1.$2))))
+  $(wildcard src/$1/*.$2))))
 
 sources = $(call sources_lang,$1,$(call lang,$1))
 
 imports = \
- $(filter-out %.coffee %.js,$(wildcard src/$1/*.* src/$1/*/*.* src/$1/*/*/*.* src/main/$1.*)) \
+ $(filter-out %.coffee %.js,$(wildcard src/$1/*.* src/$1/*/*.* src/$1/*/*/*.*)) \
  .tests_enabled \
  $(imports_$1)
 
 imports_globals := \
  version.json
-imports_Config := \
+imports_config := \
  src/Archive/archives.json
 imports_css := \
  tools/style.js \
@@ -140,8 +140,8 @@ $(foreach p, \
  $(eval $(call compile,$(p))) \
 )
 
-tmp/eventPage.js : src/main/eventPage.coffee $(coffee_deps) | tmp
-	$(coffee) -o tmp src/main/eventPage.coffee
+tmp/eventPage.js : src/meta/eventPage.coffee $(coffee_deps) | tmp
+	$(coffee) -o tmp src/meta/eventPage.coffee
 
 define rules_channel
 
diff --git a/src/main/Config.coffee b/src/config/Config.coffee
similarity index 99%
rename from src/main/Config.coffee
rename to src/config/Config.coffee
index ff50ac4ec..89f514fc8 100644
--- a/src/main/Config.coffee
+++ b/src/config/Config.coffee
@@ -796,7 +796,7 @@ Config =
 
   favicon: 'ferongr'
 
-  usercss: `<%= multiline(read('src/main/Config.usercss.css')) %>`
+  usercss: `<%= multiline(read('src/config/user.css')) %>`
 
   hotkeys:
     # QR & Options
diff --git a/src/main/Config.usercss.css b/src/config/user.css
similarity index 100%
rename from src/main/Config.usercss.css
rename to src/config/user.css
diff --git a/src/main/globals.js b/src/globals/globals.js
similarity index 100%
rename from src/main/globals.js
rename to src/globals/globals.js
diff --git a/src/main/eventPage.coffee b/src/meta/eventPage.coffee
similarity index 100%
rename from src/main/eventPage.coffee
rename to src/meta/eventPage.coffee
diff --git a/tools/globalize.js b/tools/globalize.js
index 1f747e2cf..566835576 100644
--- a/tools/globalize.js
+++ b/tools/globalize.js
@@ -1,10 +1,8 @@
 var fs = require('fs');
 
-var basename = process.argv[2].split('_')[0]; // e.g. template_crx -> template
 var filename = `tmp/${process.argv[2]}.js`;
-
-// If it's not a collection of files in src/, it's a single file in src/main/
-var sources = (fs.readdirSync('src').indexOf(basename) >= 0) ? fs.readdirSync(`src/${basename}`) : [`${basename}.coffee`];
+var basename = process.argv[2].split('_')[0]; // e.g. template_crx -> template
+var sources  = fs.readdirSync(`src/${basename}`);
 
 // Extract variables to be made global from source file list
 // e.g. ImageExpand from src/Images/ImageExpand.coffee