gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-24 07:25:45 +01:00
Code Issues Projects Releases Wiki Activity

Make building an XPI with spaces in its name possible.

Browse Source
This commit is contained in:
Kris Maglione
2011-01-28 05:29:11 -05:00
parent 0f6f7f1610
commit 9b3ec5b76b
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common/Makefile
View File

@@ -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,7 +168,7 @@ test: $(XPI)
#### xpi #### xpi
$(XPI): $(CHROME) xpi: $(CHROME)
@echo "Building XPI..." @echo "Building XPI..."
mkdir -p $(XPI_PATH) mkdir -p $(XPI_PATH)
@@ -179,7 +178,7 @@ $(XPI): $(CHROME)
$(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

10
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) ]
@@ -86,9 +86,9 @@ done
( (
set -e; set -e;
cd $stage; cd "$stage";
case $jar in case "$jar" in
(*/) if [ "$stage" != "$jar" ]; then mv -- * $jar; fi;; (*/) if [ "$stage" != "$jar" ]; then mv -- * "$jar"; fi;;
(*) zip -9r "$jar" -- *;; (*) zip -9r "$jar" -- *;;
esac esac
) || exit 1 ) || exit 1