From 45f2134ab5cc5540845635b9374cf5141c16a644 Mon Sep 17 00:00:00 2001
From: Eric House <eehouse@trand>
Date: Mon, 13 Feb 2012 23:35:41 -0800
Subject: [PATCH] fix variant generation -- seems to work now.  JNI was broken.

---
 .../android/XWords4-dbg/AndroidManifest.xml   |  2 +-
 xwords4/android/XWords4-dbg/assets/.gitignore |  3 ++
 xwords4/android/XWords4-dbg/build.xml         | 10 +++++--
 xwords4/android/XWords4/build.xml             |  5 +++-
 xwords4/android/scripts/Variant.mk            |  7 ++++-
 xwords4/android/scripts/genvers.sh            | 17 +++++++----
 xwords4/android/scripts/getsigs.sh            | 30 +++++++++++++------
 7 files changed, 54 insertions(+), 20 deletions(-)
 create mode 100644 xwords4/android/XWords4-dbg/assets/.gitignore

diff --git a/xwords4/android/XWords4-dbg/AndroidManifest.xml b/xwords4/android/XWords4-dbg/AndroidManifest.xml
index 9b92a470d..ffc8622a2 100644
--- a/xwords4/android/XWords4-dbg/AndroidManifest.xml
+++ b/xwords4/android/XWords4-dbg/AndroidManifest.xml
@@ -21,7 +21,7 @@
      own application, the package name must be changed from "com.example.*"
      to come from a domain that you own or have control over. -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="org.eehouse.android.xw4_dbg"
+          package="org.eehouse.android.xw4dbg"
           android:versionCode="34"
           android:versionName="@string/app_version"
           >
diff --git a/xwords4/android/XWords4-dbg/assets/.gitignore b/xwords4/android/XWords4-dbg/assets/.gitignore
new file mode 100644
index 000000000..e9a786d8d
--- /dev/null
+++ b/xwords4/android/XWords4-dbg/assets/.gitignore
@@ -0,0 +1,3 @@
+BasEnglish2to8.xwd
+CollegeEng_2to8.xwd
+Top5000.xwd
diff --git a/xwords4/android/XWords4-dbg/build.xml b/xwords4/android/XWords4-dbg/build.xml
index 3cfe402f1..648b99617 100644
--- a/xwords4/android/XWords4-dbg/build.xml
+++ b/xwords4/android/XWords4-dbg/build.xml
@@ -52,18 +52,24 @@
     <target name="-pre-build">
         <exec dir="." executable="../scripts/mkvariant.sh" output="/dev/null" >
             <arg value="--variant-name"/>
-            <arg value="xw4_dbg"/>
+            <arg value="xw4dbg"/>
             <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>
         <exec dir="." executable="../scripts/ndkbuild.sh" >
             <arg value="-j3"/>
         </exec>
-        <exec dir=".." executable="./scripts/genvers.sh" output="ant_out.txt" />
+        <exec dir=".." executable="./scripts/genvers.sh" output="ant_out.txt">
+            <arg value="XWords4-dbg"/>
+            <arg value="xw4dbg"/>
+        </exec>
+
     </target>
 <!--
     <target name="-pre-compile">
diff --git a/xwords4/android/XWords4/build.xml b/xwords4/android/XWords4/build.xml
index 2ade613d9..10246e391 100644
--- a/xwords4/android/XWords4/build.xml
+++ b/xwords4/android/XWords4/build.xml
@@ -53,7 +53,10 @@
         <exec dir="." executable="../scripts/ndkbuild.sh" >
             <arg value="-j3"/>
         </exec>
-        <exec dir=".." executable="./scripts/genvers.sh" output="ant_out.txt" />
+        <exec dir=".." executable="./scripts/genvers.sh" output="ant_out.txt">
+          <arg value="XWords4"/>
+          <arg value="xw4"/>
+        </exec>
     </target>
 <!--
     <target name="-pre-compile">
diff --git a/xwords4/android/scripts/Variant.mk b/xwords4/android/scripts/Variant.mk
index 751ddc564..ba41030f8 100644
--- a/xwords4/android/scripts/Variant.mk
+++ b/xwords4/android/scripts/Variant.mk
@@ -15,9 +15,14 @@ $(DEST_PATH)/%.xml : $(SRC_PATH)/%.xml
 		< $< > $@
 
 $(DEST_PATH)/%.h : $(SRC_PATH)/%.h
-	sed \
+	@sed \
 		-e "s,\(^.*org/eehouse/android/\)xw4\(.*$$\),\1$(VARIANT)\2," \
 		< $< > $@
 
+$(DEST_PATH)/%.c : $(SRC_PATH)/%.c
+	@sed \
+		-e "s,\(^.*Java_org_eehouse_android_\)xw4\(.*$$\),\1$(VARIANT)\2," \
+		< $< > $@
+
 $(DEST_PATH)/% : $(SRC_PATH)/%
 	@cp $< $@
diff --git a/xwords4/android/scripts/genvers.sh b/xwords4/android/scripts/genvers.sh
index b4362f58b..37ea58873 100755
--- a/xwords4/android/scripts/genvers.sh
+++ b/xwords4/android/scripts/genvers.sh
@@ -1,5 +1,10 @@
 #!/bin/sh
 
+set -e -u
+
+DIR=$1
+VARIANT=$2
+
 cd $(dirname $0)
 cd ../../
 
@@ -8,7 +13,7 @@ GITVERSION=$(scripts/gitversion.sh)
 # TODO: deal with case where there's no hash available -- exported
 # code maybe?  Better: gitversion.sh does that.
 
-cat <<EOF > android/XWords4/res/values/git_string.xml
+cat <<EOF > android/${DIR}/res/values/git_string.xml
 <?xml version="1.0" encoding="utf-8"?>
 <!-- auto-generated; do not edit -->
 
@@ -21,9 +26,9 @@ EOF
 # the way to mark a release
 SHORTVERS="$(git describe --always $GITVERSION 2>/dev/null || echo unknown)"
 
-cat <<EOF > android/XWords4/src/org/eehouse/android/xw4/GitVersion.java
+cat <<EOF > android/${DIR}/src/org/eehouse/android/${VARIANT}/GitVersion.java
 // auto-generated; do not edit
-package org.eehouse.android.xw4;
+package org.eehouse.android.${VARIANT};
 class GitVersion {
     public static final String VERS = "$SHORTVERS";
 }
@@ -32,6 +37,6 @@ EOF
 # touch the files that depend on git_string.xml.  (I'm not sure that
 # this list is complete or if ant and java always get dependencies
 # right.  Clean builds are the safest.)
-touch android/XWords4/res/xml/xwprefs.xml 
-touch android/XWords4/gen/org/eehouse/android/xw4/R.java
-touch android/XWords4/src/org/eehouse/android/xw4/Utils.java
+touch android/${DIR}/res/xml/xwprefs.xml 
+touch android/${DIR}/gen/org/eehouse/android/${VARIANT}/R.java
+touch android/${DIR}/src/org/eehouse/android/${VARIANT}/Utils.java
diff --git a/xwords4/android/scripts/getsigs.sh b/xwords4/android/scripts/getsigs.sh
index e16843bc6..a06b31c17 100755
--- a/xwords4/android/scripts/getsigs.sh
+++ b/xwords4/android/scripts/getsigs.sh
@@ -1,14 +1,26 @@
 #!/bin/sh
 
-BASE=$(dirname $0)
-cd $BASE/../XWords4/bin/classes
+usage() {
+    [ $# -gt 0 ] && echo "Error: $1"
+    echo "usage: $0 <dir> <pkg-node>         "
+    echo "            # e.g. XWords4 or XWords4-dbg and xw4 or xw4_dbg"
+    exit 1
+}
 
-javah -o /tmp/javah$$.txt org.eehouse.android.xw4.jni.XwJNI
-javap -s org.eehouse.android.xw4.jni.XwJNI
-javap -s org.eehouse.android.xw4.jni.DrawCtx
-javap -s org.eehouse.android.xw4.jni.UtilCtxt
-javap -s org.eehouse.android.xw4.jni.CommsAddrRec
-javap -s org.eehouse.android.xw4.jni.TransportProcs
-javap -s org.eehouse.android.xw4.jni.JNIUtils
+[ $# -gt 1 ] || usage "dir and node parameters required"
+
+DIR=$1
+NODE=$2
+
+BASE=$(dirname $0)
+cd $BASE/../${DIR}/bin/classes
+
+javah -o /tmp/javah$$.txt org.eehouse.android.${NODE}.jni.XwJNI
+javap -s org.eehouse.android.${NODE}.jni.XwJNI
+javap -s org.eehouse.android.${NODE}.jni.DrawCtx
+javap -s org.eehouse.android.${NODE}.jni.UtilCtxt
+javap -s org.eehouse.android.${NODE}.jni.CommsAddrRec
+javap -s org.eehouse.android.${NODE}.jni.TransportProcs
+javap -s org.eehouse.android.${NODE}.jni.JNIUtils
 cat /tmp/javah$$.txt
 rm /tmp/javah$$.txt