gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-03-10 05:55:47 +01:00
Code Issues Projects Releases Wiki Activity

Merge default.

Browse Source 
--HG--
branch : key-processing
This commit is contained in:
Kris Maglione
2011-01-28 10:11:54 -05:00
parent 032ba5fa50 5cba6cbc77
commit 14d40afe65
4 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
common/Makefile
View File

@@ -35,8 +35,8 @@ XPI_TEXTS = js jsm $(JAR_TEXTS)
XPI_BINS = $(JAR_BINS) XPI_BINS = $(JAR_BINS)
XPI_NAME = $(NAME)-$(VERSION) XPI_NAME = $(NAME)-$(VERSION)
XPI_PATH = ../downloads/$(XPI_NAME) XPI = ../downloads/$(XPI_NAME).xpi
XPI = $(XPI_PATH).xpi XPI_PATH = $(TOP)$(XPI:%.xpi=%)
RDF = ../downloads/update.rdf RDF = ../downloads/update.rdf
RDF_IN = $(RDF).in RDF_IN = $(RDF).in
@@ -47,7 +47,7 @@ AWK ?= awk
B64ENCODE ?= base64 B64ENCODE ?= base64
CURL ?= curl CURL ?= curl
#.SILENT: .SILENT:
#### rules #### rules
@@ -84,7 +84,6 @@ info:
@echo "doc files $(DOC_FILES)" @echo "doc files $(DOC_FILES)"
@echo "xpi files $(XPI_FILES)" @echo "xpi files $(XPI_FILES)"
xpi: $(XPI)
jar: $(JAR) jar: $(JAR)
release: $(XPI) $(RDF) release: $(XPI) $(RDF)
@@ -169,17 +168,17 @@ test: $(XPI)
#### xpi #### xpi
$(XPI): $(CHROME) xpi: $(CHROME)
@echo "Building XPI..." @echo "Building XPI..."
mkdir -p $(XPI_PATH) mkdir -p "$(XPI_PATH)"
$(AWK) -v 'name=$(NAME)' -v 'suffix=$(MANGLE)' \ $(AWK) -v 'name=$(NAME)' -v 'suffix=$(MANGLE)' \
-f $(BASE)/process_manifest.awk \ -f $(BASE)/process_manifest.awk \
$(TOP)/chrome.manifest >$(XPI_PATH)/chrome.manifest $(TOP)/chrome.manifest >"$(XPI_PATH)/chrome.manifest"
$(MAKE_JAR) "$(XPI)" "$(XPI_BASES)" "$(XPI_DIRS)" "$(XPI_TEXTS)" "$(XPI_BINS)" "$(XPI_FILES)" $(MAKE_JAR) "$(XPI)" "$(XPI_BASES)" "$(XPI_DIRS)" "$(XPI_TEXTS)" "$(XPI_BINS)" "$(XPI_FILES)"
rm -r -- $(CHROME) rm -r -- $(CHROME)
@echo "Built XPI: $@" @echo "Built XPI: $(XPI)"
#### jar #### jar

2
common/content/dactyl.js
View File

@@ -1648,7 +1648,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
bang: true, bang: true,
completer: function (context) { completer: function (context) {
context.ignoreCase = true; context.ignoreCase = true;
return completion.dialog(context); completion.dialog(context);
} }
}); });

22
common/make_jar.sh
View File

@@ -2,7 +2,7 @@
set -e set -e
fromrepo= fromrepo=
if [ $1 = -r ]; then shift; fromrepo=1; fi if [ "$1" = -r ]; then shift; fromrepo=1; fi
top=$(pwd) top=$(pwd)
jar=$1 jar=$1
@@ -15,7 +15,7 @@ files="$@"
HG=${HG:-hg} HG=${HG:-hg}
stage="$top/${jar%.*}" stage="$top/${jar%.*}"
mkdir -p $stage mkdir -p "$stage"
sed=$(which sed) sed=$(which sed)
if [ "xoo" = x$(echo foo | sed -E 's/f(o)/\1/' 2>/dev/null) ] if [ "xoo" = x$(echo foo | sed -E 's/f(o)/\1/' 2>/dev/null) ]
@@ -49,7 +49,13 @@ copytext() {
( echo "modified: $1"; diff -u -- "$1" "$2" | grep '^[-+][^-+]' ) ( echo "modified: $1"; diff -u -- "$1" "$2" | grep '^[-+][^-+]' )
} }
[ -e "$top/$jar" ] && rm -rf "$top/$jar" [ -f "$jar" ] && rm -f "$jar"
case "$jar" in
/*) ;;
*)
[ -d "$jar" ] && rm -rf "$jar"
jar="$top/$jar";;
esac
for base in $bases for base in $bases
do do
@@ -80,14 +86,14 @@ done
( (
set -e; set -e;
cd $stage; cd "$stage";
case $jar in case "$jar" in
(*/) if [ "$stage" != "$top/$jar" ]; then mv -- * $top/$jar; fi;; (*/) if [ "$stage" != "$jar" ]; then mv -- * "$jar"; fi;;
(*) zip -9r "$top/$jar" -- *;; (*) zip -9r "$jar" -- *;;
esac esac
) || exit 1 ) || exit 1
[ "$stage" != "$top/$jar" ] && rm -rf "$stage" [ "$stage" != "$jar" ] && rm -rf "$stage"
true true
# vim:se ft=sh sts=4 sw=4 et: # vim:se ft=sh sts=4 sw=4 et:

1
common/modules/base.jsm
View File

@@ -758,6 +758,7 @@ Class.memoize = function memoize(getter)
this.get = function replace() let (obj = this.instance || this) ( this.get = function replace() let (obj = this.instance || this) (
Class.replaceProperty(obj, key, null), Class.replaceProperty(obj, key, null),
Class.replaceProperty(obj, key, getter.call(this, key))) Class.replaceProperty(obj, key, getter.call(this, key)))
this.set = function replace(val) Class.replaceProperty(this.instance || this, val);
} }
}); });