Change id of extension for AMO signing.

jsha · jsha · commit 314207b01d3d · 2015-08-18T12:13:16.000-07:00
To get an automated signature from AMO for self-hosting, we need to have
a separate unlisted version of our extension. Because of a problem in AMO,
the unlisted version cannot have the same id as the listed version. So we're
renaming the self-hosted version to https-everywhere-eff@eff.org.

This also includes a change to make-sqlite.py to remove the git commit table.
The new release process will require an initial build, then a signature, then a
second build. Since that second build will be at a different git commit,
rulesets.sqlite would change and cause the signature to no longer match.

Conflicts:
	utils/make-sqlite.py
diff --git a/makexpi.sh b/makexpi.sh
@@ -34,8 +34,7 @@ if [ -n "$1" ] && [ "$2" != "--no-recurse" ] ; then
   # Ensure a clean build.
   git clean -fdx
 
-  git submodule init
-  git submodule update
+  git submodule update --recursive -f
   # Use the version of the build script that was current when that
   # tag/release/branch was made.
   ./makexpi.sh $1 --no-recurse || exit 1
@@ -47,7 +46,7 @@ if [ -n "$1" ] && [ "$2" != "--no-recurse" ] ; then
   # Now escape from the horrible mess we've made
   cd ..
   XPI_NAME="$APP_NAME-$1"
-  cp $SUBDIR/pkg/$XPI_NAME.xpi pkg/
+  cp $SUBDIR/pkg/$XPI_NAME-eff.xpi pkg/
   if ! cp $SUBDIR/pkg/$XPI_NAME-amo.xpi pkg/ 2> /dev/null ; then
     echo Old version does not support AMO
   fi
