New directory layout.

liberator/make_jar.sh

@@ -0,0 +1,56 @@
+#!/bin/dash
+set -e
+
+top=$(pwd)
+jar=$1
+bases=$2
+dirs=$3
+text=$4
+bin=$5
+shift 5;
+files="$@"
+
+stage="$top/${jar%.*}"
+mkdir -p $stage
+
+getfiles () {
+    filter="\.($(echo $1 | tr ' ' '|'))$"; shift
+    find "$@" -not -path '*CVS*' 2>/dev/null | grep -E "$filter" || true
+}
+copytext () {
+    sed -e "s,###VERSION###,$VERSION,g" \
+        -e "s,###DATE###,$DATE,g" \
+        <"$1" >"$2"
+    cmp -s "$1" "$2" ||
+    ( echo "modified: $1"; diff -u "$1" "$2" | grep '^[-+][^-+]' )
+}
+
+for base in $bases
+do
+    (
+        set -e
+        cd $base
+	[ ${jar##*.} = jar ] && stage="$stage/${base##*/}"
+        for dir in $dirs
+        do
+            for f in $(getfiles "$bin" "$dir")
+            do
+                mkdir -p "$stage/${f%/*}"
+                cp $f "$stage/$f"
+            done
+            for f in $(getfiles "$text" "$dir")
+            do
+                mkdir -p "$stage/${f%/*}"
+                copytext "$f" "$stage/$f"
+            done
+        done
+        for f in $files
+        do
+            [ -f "$f" ] && copytext "$f" "$stage/$f"
+        done
+    )
+done
+
+cd $stage; zip -r "$top/$jar" *
+rm -rf "$stage"
+

liberator/process_manifest.awk

@@ -0,0 +1,11 @@
+{ content = $1 ~ /^(content|skin|locale)$/ }
+content && $NF ~ /^[a-z]/ { $NF = name "/" $NF }
+content {
+    sub(/^\.\.\//, "", $NF);
+    $NF = "jar:chrome/" name ".jar!" $NF
+}
+{
+    sub("^\\.\\./liberator/", "", $NF)
+    print
+}
+

muttator/Makefile

@@ -0,0 +1,6 @@
+#### configuration
+
+VERSION       = 2.0pre
+NAME          = vimperator
+
+include ../liberator/Makefile.common

muttator/chrome.manifest

@@ -0,0 +1,31 @@
+# Thunderbird
+content	 muttator        content/
+locale	 liberator en-US locale/en-US/
+
+content	 liberator             ../liberator/content/
+resource liberator             ../liberator/modules/
+skin	 liberator classic/1.0 ../liberator/skin/
+
+override chrome://liberator/content/liberator.dtd chrome://muttator/content/liberator.dtd
+override chrome://liberator/content/config.js	  chrome://muttator/content/config.js
+
+overlay  chrome://browser/content/browser.xul chrome://liberator/content/liberator.xul
+overlay  chrome://browser/content/browser.xul chrome://vimperator/content/vimperator.xul
+
+# Thunderbird
+content  liberator content/
+resource liberator modules/
+locale   liberator en-US locale/en-US/
+skin     liberator classic/1.0 skin/
+
+override chrome://liberator/content/liberator.dtd chrome://liberator/content/muttator.dtd
+override chrome://liberator/content/config.js chrome://liberator/content/muttator.js
+
+overlay  chrome://messenger/content/messenger.xul chrome://liberator/content/liberator.xul
+overlay  chrome://messenger/content/messenger.xul chrome://liberator/content/muttator.xul
+
+#1
+#override chrome://liberator/content/compose/liberator.xul chrome://liberator/content/liberator.xul
+overlay  chrome://messenger/content/messengercompose/messengercompose.xul chrome://liberator/content/compose/liberator.xul
+overlay  chrome://messenger/content/messengercompose/messengercompose.xul chrome://liberator/content/compose/compose.xul
+

muttator/install.rdf

@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+
+    <Description about="urn:mozilla:install-manifest">
+	<em:id>muttator@mozdev.org</em:id>
+	<em:name>Muttator</em:name>
+	<em:version>###VERSION###</em:version>
+	<em:description>Make Thunderbird behave like Vim</em:description>
+	<em:creator>Martin Stubenschrott</em:creator>
+	<em:homepageURL>http://muttator.mozdev.org</em:homepageURL>
+	<em:iconURL>chrome://muttator/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">
+			<em:package>content/muttator/</em:package>
+	    </Description>
+	</em:file>
+
+	<em:targetApplication>
+	    <Description>
+		<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
+		<em:minVersion>3.0a1pre</em:minVersion>
+		<em:maxVersion>3.0b1pre</em:maxVersion>
+	    </Description>
+	</em:targetApplication>
+
+    </Description>
+</RDF>