gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-21 06:48:00 +01:00
Code Issues Projects Releases Wiki Activity

Commit some changes that were somehow skipped before

Browse Source
This commit is contained in:
Kris Maglione
2008-12-02 14:30:07 -05:00
parent edf1c5ce99
commit 7d8a5719cf
7 changed files with 65 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
liberator/Makefile.common
View File

@@ -3,70 +3,43 @@
TOP = $(shell pwd) TOP = $(shell pwd)
OS = $(shell uname -s) OS = $(shell uname -s)
BUILD_DATE = $(shell date "+%Y/%m/%d %H:%M:%S") BUILD_DATE = $(shell date "+%Y/%m/%d %H:%M:%S")
BASE = $(TOP)/../liberator
DOC_SRC_FILES = $(wildcard locale/*/*.txt) DOC_SRC_FILES = $(wildcard locale/*/*.txt)
DOC_FILES = ${DOC_SRC_FILES:%.txt=%.html} DOC_FILES = ${DOC_SRC_FILES:%.txt=%.html}
MAKE_JAR = VERSION="$(VERSION)" DATE="$(BUILD_DATE)" sh $(BASE)/make_jar.sh
# TODO: specify source files manually? # TODO: specify source files manually?
JAR_TXT_FILES = ${shell find -L content skin locale \ JAR_BASES = $(TOP) $(BASE)
-type f \ JAR_DIRS = content skin locale
-a ! -path '*CVS*' \ JAR_TEXTS = js css dtd xml xul html xhtml
-a \( \ JAR_BINS = png
-path '*.js' \
-o -path '*.css' \
-o -path '*.dtd' \
-o -path '*.xml' \
-o -path '*.xul' \
-o -path '*.html' \
-o -path '*.xhtml' \
\) \
}
JAR_DIRS = $(foreach f,${JAR_FILES},$(dir $f))
JAR_BIN_FILES = ${shell find content skin webcontent \
-type f \
-a ! -path '*CVS*' \
-a -path '*.png' \
}
JAR_FILES = ${JAR_BIN_FILES} ${JAR_TXT_FILES} ${DOC_FILES}
JAR = chrome/${NAME}.jar JAR = chrome/${NAME}.jar
XPI_TXT_FILES = install.rdf chrome.manifest TODO AUTHORS Donators NEWS License.txt \ XPI_BASES = $(JAR_BASES) $(TOP)/..
${shell find -L modules components \ XPI_FILES = install.rdf TODO AUTHORS Donators NEWS License.txt
-type f \ XPI_DIRS = modules components chrome
-a ! -path '*CVS*' \ XPI_TEXTS = js jsm
-a \( \ XPI_BINS = jar
-path '*.js' \
-o -path '*.jsm' \ XPI_NAME = ${NAME}_${VERSION}
\) \ XPI_PATH = ../downloads/${XPI_NAME}
} XPI = $(XPI_PATH).xpi
XPI_DIRS = $(foreach f,${XPI_FILES},$(dir $f))
XPI_BIN_FILES = ${JAR} Makefile.common Makefile
XPI_FILES = ${XPI_BIN_FILES} ${XPI_TXT_FILES}
XPI_NAME = ${NAME}_${VERSION}.xpi
XPI = ../downloads/${XPI_NAME}
RDF = ../downloads/update.rdf RDF = ../downloads/update.rdf
RDF_IN = ${RDF}.in RDF_IN = ${RDF}.in
BUILD_DIR = build.${VERSION}.${OS} BUILD_DIR = build.${VERSION}.${OS}
BUILD_JAR_DIR = ${BUILD_DIR}/jar
BUILD_XPI_DIR = ${BUILD_DIR}/xpi
BUILD_JAR_SUBDIRS = $(sort ${JAR_DIRS:%=${BUILD_JAR_DIR}/%})
BUILD_XPI_SUBDIRS = $(sort ${XPI_DIRS:%=${BUILD_XPI_DIR}/%})
ASCIIDOC = asciidoc ASCIIDOC = asciidoc
ZIP = zip
SED = sed
PERL = perl
# specify V=1 on make line to see more verbose output .SILENT:
Q=$(if ${V},,@)
CP_V=$(if ${V},-v)
#### rules #### rules
.PHONY: all help info doc jar xpi install clean distclean .PHONY: all help info doc jar xpi install clean distclean $(JAR)
all: help all: help
help: help:
@@ -105,67 +78,33 @@ ${RDF}: ${RDF_IN} Makefile
clean: clean:
@echo "Cleanup..." @echo "Cleanup..."
${Q}rm -f ${JAR} ${XPI} rm -f ${JAR} ${XPI}
${Q}find . -name '*~' -exec rm -f {} \; find . -name '*~' -exec rm -f {} \;
distclean: clean distclean: clean
@echo "More cleanup..." @echo "More cleanup..."
${Q}rm -f ${DOC_FILES} rm -f ${DOC_FILES}
${Q}rm -rf ${BUILD_DIR} rm -rf ${BUILD_DIR}
#### xpi #### xpi
${BUILD_XPI_SUBDIRS}: $(XPI): $(JAR)
${Q}mkdir -p $@
${XPI}: ${BUILD_XPI_SUBDIRS} ${XPI_FILES}
@echo "Building XPI..." @echo "Building XPI..."
${Q}mkdir -p $(dir ${XPI}) mkdir -p $(XPI_PATH)
${Q}for f in ${XPI_BIN_FILES} ; do \ awk -v 'name=$(NAME)' -f $(BASE)/process_manifest.awk $(TOP)/chrome.manifest >$(XPI_PATH)/chrome.manifest
cp $$f ${BUILD_XPI_DIR}/$$f ; \ $(MAKE_JAR) "$(XPI)" "$(XPI_BASES)" "$(XPI_DIRS)" "$(XPI_TEXTS)" "$(XPI_BINS)" "$(XPI_FILES)"
done
${Q}for f in ${XPI_TXT_FILES} ; do \
${SED} -e "s,###VERSION###,${VERSION},g" \
-e "s,###DATE###,${BUILD_DATE},g" \
< $$f > ${BUILD_XPI_DIR}/$$f ; \
( diff -q $$f ${BUILD_XPI_DIR}/$$f 1>/dev/null ) || \
( echo "modified: $$f" ; \
diff -u $$f ${BUILD_XPI_DIR}/$$f | grep '^[-+][^-+]' ) ; \
done
@# sed -e -> does not work correctly on MacOS's sed, therefore we use perl
@# ${Q}${SED} -e 's,\(skin\|content\|locale/.*\)/$$,jar:chrome/${NAME}.jar!/\1/,' \
${Q}${PERL} -pe 's,(skin|content|locale/.*)/$$,jar:chrome/${NAME}.jar!/\1/,' \
< chrome.manifest > ${BUILD_XPI_DIR}/chrome.manifest
${Q}( cd ${BUILD_XPI_DIR} && ${ZIP} -r ${TOP}/${XPI} ${XPI_FILES} )
@echo "SUCCESS: $@" @echo "SUCCESS: $@"
#### jar #### jar
${BUILD_JAR_SUBDIRS}: $(JAR):
${Q}mkdir -p $@
${JAR}: ${BUILD_JAR_SUBDIRS} ${JAR_FILES}
@echo "Building JAR..." @echo "Building JAR..."
${Q}mkdir -p $(dir ${JAR}) $(MAKE_JAR) "$(JAR)" "$(JAR_BASES)" "$(JAR_DIRS)" "$(JAR_TEXTS)" "$(JAR_BINS)" "$(JAR_FILES)"
${Q}for f in ${JAR_BIN_FILES} ; do \
cp $$f ${BUILD_JAR_DIR}/$$f ; \
done
${Q}for f in ${JAR_TXT_FILES} ; do \
${SED} -e "s,###VERSION###,${VERSION},g" \
-e "s,###DATE###,${BUILD_DATE},g" \
< $$f > ${BUILD_JAR_DIR}/$$f ; \
( diff -q $$f ${BUILD_JAR_DIR}/$$f 1>/dev/null ) || \
( echo "modified: $$f" ; \
diff -u $$f ${BUILD_JAR_DIR}/$$f | grep '^[-+][^-+]' ) ; \
done
${Q}( cd ${BUILD_JAR_DIR} && ${ZIP} -r ${TOP}/${JAR} ${JAR_FILES} )
@echo "SUCCESS: $@" @echo "SUCCESS: $@"
#### doc #### doc
${DOC_FILES}: %.html: %.txt Makefile.common locale/en-US/asciidoc.conf ${DOC_FILES}: %.html: %.txt Makefile.common locale/en-US/asciidoc.conf
@echo "DOC $@" @echo "DOC $@"
${Q}${ASCIIDOC} --unsafe -a linkcss -o $@ $< ${ASCIIDOC} --unsafe -a linkcss -o $@ $<

33
liberator/content/liberator-overlay.js
View File

@@ -5,26 +5,32 @@
modules.modules = modules; modules.modules = modules;
var loader = Components.classes["@mozilla.org/moz/jssubscript-loader;1"] const loader = Components.classes["@mozilla.org/moz/jssubscript-loader;1"]
.getService(Components.interfaces.mozIJSSubScriptLoader); .getService(Components.interfaces.mozIJSSubScriptLoader);
function load(script, i) function load(script)
{ {
try for (let [i, base] in Iterator(prefix))
{ {
loader.loadSubScript(BASE + script, modules) try
} {
catch (e) loader.loadSubScript(base + script, modules)
{ return;
if (Components.utils.reportError) }
Components.utils.reportError(e); catch (e)
dump("liberator: Loading script " + script + ": " + e + "\n"); {
if (!i || i < 3) if (i + 1 < prefix.length)
return load(script, i + 1); // Sometimes loading (seemingly randomly) fails continue;
if (Components.utils.reportError)
Components.utils.reportError(e);
dump("liberator: Loading script " + script + ": " + e + "\n");
}
} }
} }
Components.utils.import("resource://liberator/storage.jsm", modules); Components.utils.import("resource://liberator/storage.jsm", modules);
let prefix = [BASE];
["liberator.js", ["liberator.js",
"config.js", "config.js",
"util.js", "util.js",
@@ -43,6 +49,7 @@
"template.js", "template.js",
"ui.js"].forEach(load); "ui.js"].forEach(load);
prefix.unshift("chrome://" + modules.config.name.toLowerCase() + "/content/");
if (modules.config.scripts) if (modules.config.scripts)
modules.config.scripts.forEach(load); modules.config.scripts.forEach(load);

6
muttator/Makefile
View File

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

14
muttator/chrome.manifest
View File

@@ -9,23 +9,9 @@ skin liberator classic/1.0 ../liberator/skin/
override chrome://liberator/content/liberator.dtd chrome://muttator/content/liberator.dtd override chrome://liberator/content/liberator.dtd chrome://muttator/content/liberator.dtd
override chrome://liberator/content/config.js chrome://muttator/content/config.js 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/liberator.xul
overlay chrome://messenger/content/messenger.xul chrome://liberator/content/muttator.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/liberator.xul
overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://liberator/content/compose/compose.xul overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://liberator/content/compose/compose.xul

2
vimperator/Makefile
View File

@@ -3,4 +3,4 @@
VERSION = 2.0pre VERSION = 2.0pre
NAME = vimperator NAME = vimperator
include Makefile.common include ../liberator/Makefile.common

18
vimperator/chrome.manifest
View File

@@ -1,12 +1,14 @@
# Firefox # Firefox
content liberator2 webcontent/ contentaccessible=yes content vimperator content/
content liberator content/ locale liberator en-US locale/en-US/
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/vimperator.dtd content liberator ../liberator/content/
override chrome://liberator/content/config.js chrome://liberator/content/vimperator.js resource liberator ../liberator/modules/
skin liberator classic/1.0 ../liberator/skin/
override chrome://liberator/content/liberator.dtd chrome://vimperator/content/liberator.dtd
override chrome://liberator/content/config.js chrome://vimperator/content/config.js
overlay chrome://browser/content/browser.xul chrome://liberator/content/liberator.xul overlay chrome://browser/content/browser.xul chrome://liberator/content/liberator.xul
overlay chrome://browser/content/browser.xul chrome://liberator/content/vimperator.xul overlay chrome://browser/content/browser.xul chrome://vimperator/content/vimperator.xul

2
vimperator/install.rdf
View File

@@ -9,7 +9,7 @@
<em:description>Make Firefox behave like Vim</em:description> <em:description>Make Firefox behave like Vim</em:description>
<em:creator>Martin Stubenschrott</em:creator> <em:creator>Martin Stubenschrott</em:creator>
<em:homepageURL>http://vimperator.mozdev.org</em:homepageURL> <em:homepageURL>http://vimperator.mozdev.org</em:homepageURL>
<em:iconURL>chrome://vimperator/skin/icon.png</em:iconURL> <em:iconURL>chrome://liberator/skin/icon.png</em:iconURL>
<!--em:updateURL>http://downloads.mozdev.org/vimperator/update.rdf</em:updateURL--> <!--em:updateURL>http://downloads.mozdev.org/vimperator/update.rdf</em:updateURL-->
<em:file> <em:file>
<Description about="urn:mozilla:extension:file:vimperator.jar"> <Description about="urn:mozilla:extension:file:vimperator.jar">