Merge branch 'master' of git://git.torproject.org/git/https-everywhere

Seth Schoen · Seth Schoen · commit 5673bfd2f66f · 2010-11-10T12:34:03.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
-*.xpi
+pkg/*.xpi
+*~
+*.swp
diff --git a/makexpi.sh b/makexpi.sh
@@ -7,30 +7,59 @@ APP_NAME=https-everywhere
 # invoke with no arguments to pull a prerelease of the current
 # development point.
 
-# invoke with a tag name to build a specific branch.
+# invoke with the literal argument "uncommitted" to build from the
+# current src directory.
+
+# invoke with a tag name to build a specific branch or tag.
 
 # e.g.:
 #  ./makexpi.sh 0.2.3.development.2
 
 # or just:
 #  ./makexpi.sh
 
-if [ "$1" ] ; then
+# BUGS: if you have a branch or tagged named "uncommitted" then this
+# is kind of ambiguous.
+
+cd "$(dirname $0)"
+
+if [ -n "$1" ] && [ "$1" != "uncommitted" ]; then
     VERSION="$1"
     TARG="$1"
 else
     VERSION="$(grep em:version src/install.rdf | sed -e 's/[<>]/	/g' | cut -f3)~pre"
     TARG=HEAD
+    if [ "$1" != "uncommitted" ] && [ -n "$(git status src -s)" ] ; then
+        printf >&2 "\
+WARNING: There are uncommitted changes in your current repostitory.
+WARNING: These changes will not be included in the generated .xpi
+WARNING: Run 'git status' for information about the uncommitted changes.
+WARNING: Or, use 'makexpi.sh uncommitted' to include them in the build.
+" 
+    fi
 fi
 XPI_NAME="pkg/$APP_NAME-$VERSION.xpi"
 [ -d pkg ] || mkdir pkg
 
-cd "$(dirname $0)/src"
-git archive --format=zip -9 "$TARG" . > "../$XPI_NAME"
+cd "src"
+if [ "$1" = "uncommitted" ]; then
+    printf >&2 "WARNING: using zip instead of git archive to build .xpi\n"
+    CHANGES="$(git status . -s)"
+    if [ -n "$CHANGES" ]; then
+        printf >&2 "WARNING: uncommitted changes were included:\n%s\n" "$CHANGES"
+    fi
+    # FIXME: is it really acceptable to reuse .gitignore to specify
+    # include patterns for /usr/bin/zip?  It seems to work for our
+    # current patterns (2010-11-09)
+    zip -X -q -9r "../$XPI_NAME" . "-x@../.gitignore"
+else
+    git archive --format=zip -9 "$TARG" . > "../$XPI_NAME"
+fi
+
 ret="$?"
 if [ "$ret" != 0 ]; then
     rm -f "../$XPI_NAME"
     exit "$?"
 else
-  echo Created $XPI_NAME
+  printf >&2 "Created %s\n" "$XPI_NAME"
 fi

-Original file line number
+Diff line change
@@ @@ -1 +1,3 @@ @@
 -*.xpi
 +pkg/*.xpi
 +*~
 +*.swp