Flatten structure

build/make.py

@@ -84,9 +84,11 @@ def wrapper(*args, **kw):
          "COPYING",
          "chrome.manifest",
          "components",
-         "chrome",
+         "content",
          "defaults",
+         "locale",
          "modules",
+         "skin",
          )
 EXCLUDED = ()
 PLAIN = ("*.png",

chrome.manifest

@@ -1,27 +1,26 @@
-content  dtaac                    chrome/content/
+content  dtaac                    content/
+content  dtaac-locale             locale/en-US/
 content  dtaac-icon               ./
-content  dtaac-pf                 chrome/content/ platform
-skin     dtaac        classic/1.0 chrome/skin/
-skin     dtaac-pf     classic/1.0 chrome/skin/
-locale   dtaac        en-US       chrome/locale/en-US/
-content  dtaac-locale             chrome/locale/en-US/
+content  dtaac-modules            modules/
+content  dtaac-pf                 content/ platform
+skin     dtaac        classic/1.0 skin/
+skin     dtaac-pf     classic/1.0 skin/
+locale   dtaac        en-US       locale/en-US/
 
 # REMEMBER dta -> dtaac
 # Semi-auto-generated
-locale dtaac cs chrome/locale/cs/
-locale dtaac de chrome/locale/de/
-locale dtaac es-ES chrome/locale/es-ES/
-locale dtaac fr chrome/locale/fr/
-locale dtaac hr-HR chrome/locale/hr-HR/
-locale dtaac nl chrome/locale/nl/
-locale dtaac pt-PT chrome/locale/pt-PT/
-locale dtaac ro chrome/locale/ro/
-locale dtaac ru chrome/locale/ru/
-locale dtaac sr chrome/locale/sr/
-locale dtaac sv-SE chrome/locale/sv-SE/
-locale dtaac zh-CN chrome/locale/zh-CN/
-
-resource dtaac modules/
+locale dtaac cs locale/cs/
+locale dtaac de locale/de/
+locale dtaac es-ES locale/es-ES/
+locale dtaac fr locale/fr/
+locale dtaac hr-HR locale/hr-HR/
+locale dtaac nl locale/nl/
+locale dtaac pt-PT locale/pt-PT/
+locale dtaac ro locale/ro/
+locale dtaac ru locale/ru/
+locale dtaac sr locale/sr/
+locale dtaac sv-SE locale/sv-SE/
+locale dtaac zh-CN locale/zh-CN/
 
 overlay  chrome://dta/content/dta/manager.xul  chrome://dtaac/content/manager.xul
 overlay  chrome://dta/content/preferences/prefs.xul chrome://dtaac/content/prefpane.xul

components/services.js

@@ -102,7 +102,7 @@ AutoFilter.prototype = {
 
 	get plugins() {
 		let plgs = {};
-		Cu.import('resource://dtaac/plugins.jsm', plgs);
+		Cu.import('chrome://dtaac-modules/content/plugins.jsm', plgs);
 		delete AutoFilter.prototype.plugins;
 		return this.plugins = AutoFilter.prototype.plugins = plgs;
 	},
@@ -219,7 +219,7 @@ WebInstallConverter.prototype = {
 		try {
 			// load the plugins module
 			let plugs = {};
-			Cu.import('resource://dtaac/plugins.jsm', plugs);
+			Cu.import('chrome://dtaac-modules/content/plugins.jsm', plugs);
 
 			// close the storage stream output
 			this._bout.flush();

chrome/content/manager.js → content/manager.js

@@ -6,7 +6,7 @@
 (function () {
 "use strict";
 
-const _ = Components.utils.import("resource://dtaac/l10n.jsm", {}).bundle("manager.properties");
+const _ = Components.utils.import("chrome://dtaac-modules/content/l10n.jsm", {}).bundle("manager.properties");
 
 if (!("log" in this)) {
 	this.LOG_DEBUG = this.LOG_ERROR = this.LOG_INFO = 0;
@@ -39,7 +39,7 @@ if (!('URL' in DTA)) {
 // the sandbox
 // see the _outer_* functions
 let _sandboxFactories = {};
-Components.utils.import("resource://dtaac/sandboxfactories.jsm", _sandboxFactories);
+Components.utils.import("chrome://dtaac-modules/content/sandboxfactories.jsm", _sandboxFactories);
 
 function acResolver() {}
 acResolver.prototype = {
@@ -618,9 +618,9 @@ acResolver.prototype = {
 if (!('module' in this)) {
 	this.module = Components.utils.import;
 }
-module('resource://dtaac/replacementgenerator.jsm', acResolver.prototype);
-module('resource://dtaac/urlcomposer.jsm', acResolver.prototype);
-module('resource://dtaac/sandboxscripts.jsm', acResolver.prototype);
+module('chrome://dtaac-modules/content/replacementgenerator.jsm', acResolver.prototype);
+module('chrome://dtaac-modules/content/urlcomposer.jsm', acResolver.prototype);
+module('chrome://dtaac-modules/content/sandboxscripts.jsm', acResolver.prototype);
 
 function acFactory(obj) {
 	if (!obj.type || !obj.match || !obj.prefix) {
@@ -695,7 +695,7 @@ acFactory.prototype = {
 };
 
 let acPlugins = {};
-Components.utils.import('resource://dtaac/plugins.jsm', acPlugins);
+Components.utils.import('chrome://dtaac-modules/content/plugins.jsm', acPlugins);
 
 function acFactoryManager() {
 	this._init();

chrome/content/prefpane.js → content/prefpane.js

@@ -6,7 +6,7 @@
 var acPlugins = (function() {
 "use strict";
 
-const _ = Components.utils.import("resource://dtaac/l10n.jsm", {}).bundle("prefpane.properties");
+const _ = Components.utils.import("chrome://dtaac-modules/content/l10n.jsm", {}).bundle("prefpane.properties");
 
 if (!("log" in this)) {
 	this.LOG_DEBUG = this.LOG_ERROR = this.LOG_INFO = 0;
@@ -40,7 +40,7 @@ var acPlugins = {
 		this._pref = document.getElementById('acPrefPlugins');
 		this._list = document.getElementById('acListPlugins');
 
-		Components.utils.import('resource://dtaac/plugins.jsm', this._plugins);
+		Components.utils.import('chrome://dtaac-modules/content/plugins.jsm', this._plugins);
 		try {
 			this._prompts = require("prompts");
 		}

chrome/content/webinstall.js → content/webinstall.js

@@ -9,7 +9,7 @@ function $(id) {
 
 function load() {
 	removeEventListener("load", load, true);
-	Components.utils.import('resource://dtaac/plugins.jsm', plugins);
+	Components.utils.import('chrome://dtaac-modules/content/plugins.jsm', plugins);
 
 	let toHide = $('error');
 	try {

modules/plugins.jsm

@@ -447,7 +447,7 @@ function prettyJSON(objectOrString, initialIndent) {
 	let req = new XMLHttpRequest();
 	// don't try to parse as XML
 	req.overrideMimeType('application/json');
-	req.open('GET', 'resource://dtaac/plugins.json');
+	req.open('GET', 'chrome://dtaac-modules/content/plugins.json');
 	req.addEventListener("load", function() {
 		__builtinPlugins__ = [];
 		let decoded = JSON.parse(req.responseText);