More makexpi.sh cleanup.

jsha · jsha · commit 4ab4e96c6e77 · 2015-04-23T11:28:28.000-07:00
Tabs -&gt; spaces
Remove preload statement in recursive mode, unnecessarily complicated.
Clean checkout directory before building.
Remove line that adds a .xpi incorrectly to XPI_NAME.
diff --git a/makexpi.sh b/makexpi.sh
@@ -23,17 +23,15 @@ ANDROID_APP_ID=org.mozilla.firefox
 
 # If the command line argument is a tag name, check that out and build it
 if [ -n "$1" ] && [ "$2" != "--no-recurse" ] && [ "$1" != "--fast" ] ; then
-	BRANCH=`git branch | head -n 1 | cut -d \  -f 2-`
-	SUBDIR=checkout
-	[ -d $SUBDIR ] || mkdir $SUBDIR
-	cp -r -f -a .git $SUBDIR
-	cd $SUBDIR
-	git reset --hard "$1"
-  # This is an optimization to get the OS reading the rulesets into RAM ASAP;
-  # it's useful on machines with slow disk seek times; there might be something
-  # better (vmtouch? readahead?) that tells the IO subsystem to read the files
-  # in whatever order it wants...
-  nohup cat src/chrome/content/rules/*.xml >/dev/null 2>/dev/null &
+  BRANCH=`git branch | head -n 1 | cut -d \  -f 2-`
+  SUBDIR=checkout
+  [ -d $SUBDIR ] || mkdir $SUBDIR
+  cp -r -f -a .git $SUBDIR
+  cd $SUBDIR
+  git reset --hard "$1"
+  # When a file are renamed, the old copy can linger in the checkout directory.
+  # Ensure a clean build.
+  git clean -fdx
 
   # Use the version of the build script that was current when that
   # tag/release/branch was made.
@@ -51,10 +49,6 @@ if [ -n "$1" ] && [ "$2" != "--no-recurse" ] && [ "$1" != "--fast" ] ; then
   exit 0
 fi
 
-# Same optimisation
-nohup cat src/chrome/content/rules/*.xml >/dev/null 2>/dev/null &
-
-
 if [ "$1" != "--fast" -o ! -f "$RULESETS_SQLITE" ] ; then
   echo "Generating sqlite DB"
   python2.7 ./utils/make-sqlite.py
@@ -117,10 +111,10 @@ fi
 # The name/version of the XPI we're building comes from src/install.rdf
 XPI_NAME="pkg/$APP_NAME-`grep em:version src/install.rdf | sed -e 's/[<>]/	/g' | cut -f3`"
 if [ "$1" ] && [ "$1" != "--fast" ] ; then
-	XPI_NAME="$XPI_NAME.xpi"
+  XPI_NAME="$XPI_NAME"
 else
   # During development, generate packages named with the short hash of HEAD.
-	XPI_NAME="$XPI_NAME~`git rev-parse --short HEAD`"
+  XPI_NAME="$XPI_NAME~`git rev-parse --short HEAD`"
         if ! git diff-index --quiet HEAD; then
             XPI_NAME="$XPI_NAME-dirty"
         fi
