replace Crosswords in variants' xml files. Required passing in app

name from build.xml and a new clean-target script that removes the
generated variant files.

xwords4/android/XWords4-sms/build.xml

@@ -49,6 +49,16 @@
         <exec dir="." executable="../scripts/ndkbuild.sh" output="/dev/null">
             <arg value="clean"/>
         </exec>
+        <exec dir="." executable="../scripts/cleanvariants.sh" >
+            <arg value="--dest-dir"/>
+            <arg value="./res"/>
+            <arg value="--dest-dir"/>
+            <arg value="./src"/>
+            <arg value="--dest-dir"/>
+            <arg value="./jni"/>
+            <arg value="--dest-dir"/>
+            <arg value="./assets"/>
+        </exec>
     </target>
 
 <!-- extension targets. Uncomment the ones where you want to do custom work
@@ -58,6 +68,8 @@
         <exec dir="." executable="../scripts/mkvariant.sh" output="/dev/null">
             <arg value="--variant-name"/>
             <arg value="xw4sms"/>
+            <arg value="--app-name"/>
+            <arg value="CrossW-SMS"/>
             <arg value="--dest-dir"/>
             <arg value="./res"/>
             <arg value="--dest-dir"/>

xwords4/android/scripts/Variant.mk

@@ -12,6 +12,7 @@ $(DEST_PATH)/%.png : $(SRC_PATH)/%.png
 $(DEST_PATH)/%.xml : $(SRC_PATH)/%.xml
 	@sed \
 		-e "s,\(^.*org.eehouse.android.\)xw4\(.*$$\),\1$(VARIANT)\2," \
+		-e "s,Crosswords,$(APPNAME),g" \
 		< $< > $@
 
 $(DEST_PATH)/%.h : $(SRC_PATH)/%.h

xwords4/android/scripts/cleanvariants.sh

@@ -0,0 +1,40 @@
+#!/bin/sh
+
+set -u -e
+
+DIRS=""
+VARIANT=""
+
+usage() {
+    [ $# -ge 1 ] && echo "ERROR: $1"
+    echo "usage: $0 [--dest-dir <dir>]*"
+    exit 1
+}
+
+while [ $# -ge 1 ]; do
+    echo "\"$1\""
+    case $1 in
+        --variant-name)
+            shift
+            VARIANT=$1
+            ;;
+        --dest-dir)
+            shift
+            DIRS="$DIRS $1"
+            ;;
+        *)
+            usage "unexpected param $1"
+            ;;
+    esac
+    shift
+done
+
+for DIR in $DIRS; do
+    for FILE in $(find $DIR -type f); do
+        if git ls-files $FILE --error-unmatch 2>/dev/null; then
+            echo "skipping $FILE; it's under version control within this variant"
+        else
+            rm $FILE
+        fi
+    done
+done

xwords4/android/scripts/mkvariant.sh

@@ -5,10 +5,11 @@ set -u -e
 MAKEFILE=$(dirname $0)/Variant.mk
 DIRS=""
 VARIANT=""
+APPNAME=""
 
 usage() {
     [ $# -ge 1 ] && echo "ERROR: $1"
-    echo "usage: $0 [--dest-dir <dir>]* --variant-name <dir>"
+    echo "usage: $0 [--dest-dir <dir>]* --variant-name <dir> --app-name <name>"
     exit 1
 }
 
@@ -44,8 +45,9 @@ do_dir() {
             if git ls-files $FILE --error-unmatch 2>/dev/null; then
                 echo "skipping $FILE; it's under version control within this variant"
             else
+                echo "looking at $FILE"
                 make -f $MAKEFILE SRC_PATH=$SRC_PATH DEST_PATH=$DEST_PATH \
-                    VARIANT=${VARIANT} $FILE
+                    VARIANT=${VARIANT} APPNAME=${APPNAME} $FILE
                 add_to_gitignored $DEST_PATH $(basename $FILE)
             fi
         fi
@@ -62,6 +64,10 @@ while [ $# -ge 1 ]; do
             shift
             VARIANT=$1
             ;;
+        --app-name)
+            shift
+            APPNAME=$1
+            ;;
         --dest-dir)
             shift
             DIRS="$DIRS $1"
@@ -76,6 +82,7 @@ done
 echo "$0 DIRS: $DIRS"
 
 [ -n "$VARIANT" ] || usage "--variant-name not supplied"
+[ -n "$APPNAME" ] || usage "--app-name not supplied"
 
 for DIR in $DIRS; do
     do_dir ../XWords4 . $DIR