From 8394871a4276f86020aaf2db10bc506f29fb2471 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 30 Sep 2007 16:41:36 +0000
Subject: [PATCH] change directory structure to follow the more standard
 package hierarchy

---
 Makefile                                      |  19 ++++++++------
 chrome.manifest                               |   4 +--
 chrome/content/vimperator/contents.rdf        |  24 ------------------
 .../vimperator => content}/bookmarks.js       |   0
 .../content/vimperator => content}/buffers.js |   0
 .../vimperator => content}/commands.js        |   0
 .../vimperator => content}/completion.js      |   0
 .../content/vimperator => content}/editor.js  |   0
 .../content/vimperator => content}/events.js  |   0
 .../content/vimperator => content}/file.js    |   0
 .../content/vimperator => content}/find.js    |   0
 .../content/vimperator => content}/help.css   |   0
 .../content/vimperator => content}/help.js    |   0
 .../content/vimperator => content}/hints.js   |   0
 .../vimperator => content}/logo_white.png     | Bin
 .../vimperator => content}/mappings.js        |   0
 .../content/vimperator => content}/modes.js   |   0
 .../content/vimperator => content}/options.js |   0
 .../content/vimperator => content}/tabs.js    |   0
 {chrome/content/vimperator => content}/ui.js  |   0
 .../vimperator => content}/vimperator.js      |   0
 .../vimperator => content}/vimperator.xul     |   2 +-
 install.rdf                                   |   2 +-
 {chrome/content/vimperator => skin}/icon.png  | Bin
 .../vimperator => skin}/vimperator.css        |   0
 25 files changed, 15 insertions(+), 36 deletions(-)
 delete mode 100644 chrome/content/vimperator/contents.rdf
 rename {chrome/content/vimperator => content}/bookmarks.js (100%)
 rename {chrome/content/vimperator => content}/buffers.js (100%)
 rename {chrome/content/vimperator => content}/commands.js (100%)
 rename {chrome/content/vimperator => content}/completion.js (100%)
 rename {chrome/content/vimperator => content}/editor.js (100%)
 rename {chrome/content/vimperator => content}/events.js (100%)
 rename {chrome/content/vimperator => content}/file.js (100%)
 rename {chrome/content/vimperator => content}/find.js (100%)
 rename {chrome/content/vimperator => content}/help.css (100%)
 rename {chrome/content/vimperator => content}/help.js (100%)
 rename {chrome/content/vimperator => content}/hints.js (100%)
 rename {chrome/content/vimperator => content}/logo_white.png (100%)
 rename {chrome/content/vimperator => content}/mappings.js (100%)
 rename {chrome/content/vimperator => content}/modes.js (100%)
 rename {chrome/content/vimperator => content}/options.js (100%)
 rename {chrome/content/vimperator => content}/tabs.js (100%)
 rename {chrome/content/vimperator => content}/ui.js (100%)
 rename {chrome/content/vimperator => content}/vimperator.js (100%)
 rename {chrome/content/vimperator => content}/vimperator.xul (99%)
 rename {chrome/content/vimperator => skin}/icon.png (100%)
 rename {chrome/content/vimperator => skin}/vimperator.css (100%)

diff --git a/Makefile b/Makefile
index 64f78715..81b5178e 100644
--- a/Makefile
+++ b/Makefile
@@ -6,14 +6,16 @@ VERSION       = 0.6pre
 OS            = $(shell uname -s)
 BUILD_DATE    = $(shell date "+%Y/%m/%d %H:%M:%S")
 
-JAR_FILES     = ${shell find chrome/content -type f 		\
-					-a ! -path '*CVS*' 	\
-					-a \( -path '*.js' 	\
-				     -o  -path '*.css' 	\
-				     -o  -path '*.xul' 	\
-				     -o  -path '*.rdf' 	\
-				     -o  -path '*.png' 	\
-				   \) } chrome.manifest
+JAR_FILES     = ${shell find content skin	\
+			-type f			\
+			-a ! -path '*CVS*'	\
+			-a \(			\
+				-path '*.js'	\
+			     -o -path '*.css'	\
+			     -o -path '*.xul'	\
+			     -o -path '*.png'	\
+			   \)			\
+		}
 JAR_DIRS      = $(foreach f,${JAR_FILES},$(dir $f))
 JAR           = chrome/vimperator.jar
 
@@ -148,6 +150,7 @@ ${BUILD_JAR_SUBDIRS}:
 
 ${JAR}: ${BUILD_JAR_SUBDIRS} ${JAR_FILES}
 	@echo "Building JAR..."
+	${Q}mkdir -p $(dir ${JAR}) #FIXME
 	${Q}for f in ${JAR_FILES} ; do \
 		${SED} -e "s,###VERSION###,${VERSION},g" \
 		       -e "s,###DATE###,${BUILD_DATE},g" \
diff --git a/chrome.manifest b/chrome.manifest
index 2c931d0a..73afa673 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -1,3 +1,3 @@
-# vimperators chrome registration file
-content	vimperator	jar:chrome/vimperator.jar!/chrome/content/vimperator/
+content	vimperator jar:chrome/vimperator.jar!/content/
+skin vimperator classic/1.0 jar:chrome/vimperator.jar!/skin/
 overlay chrome://browser/content/browser.xul chrome://vimperator/content/vimperator.xul
diff --git a/chrome/content/vimperator/contents.rdf b/chrome/content/vimperator/contents.rdf
deleted file mode 100644
index 6ae9141d..00000000
--- a/chrome/content/vimperator/contents.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <RDF:Seq RDF:about="urn:mozilla:package:root">
-    <RDF:li RDF:resource="urn:mozilla:package:vimperator"/>
-  </RDF:Seq>
-
-  <!--<RDF:Seq RDF:about="urn:mozilla:overlays">-->
-  <!--<RDF:li RDF:resource="chrome://browser/content/browser.xul"/>-->
-  <!--</RDF:Seq>-->
-
-  <RDF:Seq RDF:about="chrome://browser/content/browser.xul">
-    <RDF:li>chrome://vimperator/content/vimperator.xul</RDF:li>
-  </RDF:Seq>
-
-  <RDF:Description RDF:about="urn:mozilla:package:vimperator"
-        chrome:displayName="Vimperator"
-        chrome:author="Martin Stubenschrott"
-        chrome:name="vimperator"
-        chrome:extension="true"
-        chrome:description="Make Firefox behave like Vim">
-  </RDF:Description>
-</RDF:RDF>
diff --git a/chrome/content/vimperator/bookmarks.js b/content/bookmarks.js
similarity index 100%
rename from chrome/content/vimperator/bookmarks.js
rename to content/bookmarks.js
diff --git a/chrome/content/vimperator/buffers.js b/content/buffers.js
similarity index 100%
rename from chrome/content/vimperator/buffers.js
rename to content/buffers.js
diff --git a/chrome/content/vimperator/commands.js b/content/commands.js
similarity index 100%
rename from chrome/content/vimperator/commands.js
rename to content/commands.js
diff --git a/chrome/content/vimperator/completion.js b/content/completion.js
similarity index 100%
rename from chrome/content/vimperator/completion.js
rename to content/completion.js
diff --git a/chrome/content/vimperator/editor.js b/content/editor.js
similarity index 100%
rename from chrome/content/vimperator/editor.js
rename to content/editor.js
diff --git a/chrome/content/vimperator/events.js b/content/events.js
similarity index 100%
rename from chrome/content/vimperator/events.js
rename to content/events.js
diff --git a/chrome/content/vimperator/file.js b/content/file.js
similarity index 100%
rename from chrome/content/vimperator/file.js
rename to content/file.js
diff --git a/chrome/content/vimperator/find.js b/content/find.js
similarity index 100%
rename from chrome/content/vimperator/find.js
rename to content/find.js
diff --git a/chrome/content/vimperator/help.css b/content/help.css
similarity index 100%
rename from chrome/content/vimperator/help.css
rename to content/help.css
diff --git a/chrome/content/vimperator/help.js b/content/help.js
similarity index 100%
rename from chrome/content/vimperator/help.js
rename to content/help.js
diff --git a/chrome/content/vimperator/hints.js b/content/hints.js
similarity index 100%
rename from chrome/content/vimperator/hints.js
rename to content/hints.js
diff --git a/chrome/content/vimperator/logo_white.png b/content/logo_white.png
similarity index 100%
rename from chrome/content/vimperator/logo_white.png
rename to content/logo_white.png
diff --git a/chrome/content/vimperator/mappings.js b/content/mappings.js
similarity index 100%
rename from chrome/content/vimperator/mappings.js
rename to content/mappings.js
diff --git a/chrome/content/vimperator/modes.js b/content/modes.js
similarity index 100%
rename from chrome/content/vimperator/modes.js
rename to content/modes.js
diff --git a/chrome/content/vimperator/options.js b/content/options.js
similarity index 100%
rename from chrome/content/vimperator/options.js
rename to content/options.js
diff --git a/chrome/content/vimperator/tabs.js b/content/tabs.js
similarity index 100%
rename from chrome/content/vimperator/tabs.js
rename to content/tabs.js
diff --git a/chrome/content/vimperator/ui.js b/content/ui.js
similarity index 100%
rename from chrome/content/vimperator/ui.js
rename to content/ui.js
diff --git a/chrome/content/vimperator/vimperator.js b/content/vimperator.js
similarity index 100%
rename from chrome/content/vimperator/vimperator.js
rename to content/vimperator.js
diff --git a/chrome/content/vimperator/vimperator.xul b/content/vimperator.xul
similarity index 99%
rename from chrome/content/vimperator/vimperator.xul
rename to content/vimperator.xul
index 55e41e2d..2fb635ff 100644
--- a/chrome/content/vimperator/vimperator.xul
+++ b/content/vimperator.xul
@@ -31,7 +31,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
 
 <!-- The stylesheet which is used for the :help command -->
-<?xml-stylesheet href="chrome://vimperator/content/vimperator.css" type="text/css"?>
+<?xml-stylesheet href="chrome://vimperator/skin/vimperator.css" type="text/css"?>
 
 <overlay id="vimperator"
     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
diff --git a/install.rdf b/install.rdf
index 3f6b0738..046c268f 100644
--- a/install.rdf
+++ b/install.rdf
@@ -9,7 +9,7 @@
 	<em:description>Make Firefox behave like Vim</em:description>
 	<em:creator>Martin Stubenschrott</em:creator>
 	<em:homepageURL>http://vimperator.mozdev.org</em:homepageURL>
-	<em:iconURL>chrome://vimperator/content/icon.png</em:iconURL>
+	<em:iconURL>chrome://vimperator/skin/icon.png</em:iconURL>
 	<!--em:updateURL>http://downloads.mozdev.org/vimperator/update.rdf</em:updateURL-->
 	<em:file>
 	    <Description about="urn:mozilla:extension:file:vimperator.jar">
diff --git a/chrome/content/vimperator/icon.png b/skin/icon.png
similarity index 100%
rename from chrome/content/vimperator/icon.png
rename to skin/icon.png
diff --git a/chrome/content/vimperator/vimperator.css b/skin/vimperator.css
similarity index 100%
rename from chrome/content/vimperator/vimperator.css
rename to skin/vimperator.css