diff --git a/xwords4/android/XWords4/.gitignore b/xwords4/android/XWords4/.gitignore index b35181c70..465c97736 100644 --- a/xwords4/android/XWords4/.gitignore +++ b/xwords4/android/XWords4/.gitignore @@ -1,3 +1,12 @@ +.DS_Store +.gradle +/.idea/libraries +/.idea/workspace.xml +/build +/captures +/libs-debug +/libs-release +/local.properties *.apk ant_out.txt local.properties diff --git a/xwords4/android/XWords4/.idea/.name b/xwords4/android/XWords4/.idea/.name new file mode 100644 index 000000000..68f9bd49d --- /dev/null +++ b/xwords4/android/XWords4/.idea/.name @@ -0,0 +1 @@ +XWords4 \ No newline at end of file diff --git a/xwords4/android/XWords4/.idea/compiler.xml b/xwords4/android/XWords4/.idea/compiler.xml new file mode 100644 index 000000000..96cc43efa --- /dev/null +++ b/xwords4/android/XWords4/.idea/compiler.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/xwords4/android/XWords4/.idea/copyright/profiles_settings.xml b/xwords4/android/XWords4/.idea/copyright/profiles_settings.xml new file mode 100644 index 000000000..e7bedf337 --- /dev/null +++ b/xwords4/android/XWords4/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/xwords4/android/XWords4/.idea/gradle.xml b/xwords4/android/XWords4/.idea/gradle.xml new file mode 100644 index 000000000..1bbc21dc2 --- /dev/null +++ b/xwords4/android/XWords4/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/xwords4/android/XWords4/.idea/misc.xml b/xwords4/android/XWords4/.idea/misc.xml new file mode 100644 index 000000000..c60d22d63 --- /dev/null +++ b/xwords4/android/XWords4/.idea/misc.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.7 + + + + + + + + \ No newline at end of file diff --git a/xwords4/android/XWords4/.idea/modules.xml b/xwords4/android/XWords4/.idea/modules.xml new file mode 100644 index 000000000..c0244711b --- /dev/null +++ b/xwords4/android/XWords4/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/xwords4/android/XWords4/.idea/runConfigurations.xml b/xwords4/android/XWords4/.idea/runConfigurations.xml new file mode 100644 index 000000000..7f68460d8 --- /dev/null +++ b/xwords4/android/XWords4/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/xwords4/android/XWords4/.idea/vcs.xml b/xwords4/android/XWords4/.idea/vcs.xml new file mode 100644 index 000000000..6564d52db --- /dev/null +++ b/xwords4/android/XWords4/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/xwords4/android/XWords4/XWords4.iml b/xwords4/android/XWords4/XWords4.iml new file mode 100644 index 000000000..fa4abfe96 --- /dev/null +++ b/xwords4/android/XWords4/XWords4.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/xwords4/android/XWords4/app/.gitignore b/xwords4/android/XWords4/app/.gitignore new file mode 100644 index 000000000..796b96d1c --- /dev/null +++ b/xwords4/android/XWords4/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/xwords4/android/XWords4/app/app.iml b/xwords4/android/XWords4/app/app.iml new file mode 100644 index 000000000..48eceed6b --- /dev/null +++ b/xwords4/android/XWords4/app/app.iml @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/xwords4/android/XWords4/app/build.gradle b/xwords4/android/XWords4/app/build.gradle new file mode 100644 index 000000000..a4981d407 --- /dev/null +++ b/xwords4/android/XWords4/app/build.gradle @@ -0,0 +1,114 @@ +def VARIANT_NAME = 'xw4' +def INITIAL_CLIENT_VERS = 6 +def CHAT_ENABLED = true +def THUMBNAIL_ENABLED = true +def LIBS_DEBUG = 'libs-debug' +def LIBS_RELEASE = 'libs-release' + +apply plugin: 'com.android.application' + +dependencies { + compile files('../libs/gcm.jar') +} + +android { + compileSdkVersion 22 + buildToolsVersion "22.0.1" + defaultConfig { + applicationId "org.eehouse.android.xw4" + minSdkVersion 7 + targetSdkVersion 14 + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + debug { + debuggable true + } + } + + sourceSets { + // Use symlinks instead of setting non-conventional + // directories here. AS doesn't respect what's set here: it'll + // compile, but post-install app launch and source-level + // debugging don't work. + release { + jniLibs.srcDir "../$LIBS_RELEASE" + } + debug { + jniLibs.srcDir "../$LIBS_DEBUG" + } + } + + lintOptions { + abortOnError false + } + productFlavors { + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) +} + +task genVers(type: Exec) { + workingDir '../' + commandLine '../scripts/genvers.sh', VARIANT_NAME, + INITIAL_CLIENT_VERS, CHAT_ENABLED, THUMBNAIL_ENABLED +} + +task mkImages(type: Exec) { + workingDir '../' + commandLine '../scripts/mkimages.sh' +} + +task copyStrings(type: Exec) { + workingDir '../' + commandLine '../scripts/copy-strings.py' +} + +task ndkSetup(type: Exec) { + workingDir '../' + commandLine "../scripts/ndksetup.sh" +} + +task genGcmid(type: Exec) { + workingDir '../' + commandLine '../scripts/gen_gcmid.sh', + '-o', "src/org/eehouse/android/$VARIANT_NAME/GCMConsts.java", + '-v', "$VARIANT_NAME" +} + +task myPreBuild(dependsOn: ['genVers', 'ndkSetup', 'mkImages', 'copyStrings', 'mkXml', 'genGcmid']) { +} +preBuild.dependsOn myPreBuild + +task ndkBuildDebug(type: Exec) { + workingDir '../' + commandLine '../scripts/ndkbuild.sh', '-j3', "CHAT_ENABLED=$CHAT_ENABLED", + "THUMBNAIL_ENABLED=$THUMBNAIL_ENABLED", 'BUILD_TARGET=debug', + "INITIAL_CLIENT_VERS=$INITIAL_CLIENT_VERS", "VARIANT=$VARIANT_NAME", + "NDK_LIBS_OUT=$LIBS_DEBUG", 'NDK_OUT=./obj-debug' +} + +task ndkBuildRelease(type: Exec) { + workingDir '../' + commandLine '../scripts/ndkbuild.sh', '-j3', "CHAT_ENABLED=$CHAT_ENABLED", + "THUMBNAIL_ENABLED=$THUMBNAIL_ENABLED", 'BUILD_TARGET=release', + "INITIAL_CLIENT_VERS=$INITIAL_CLIENT_VERS", "VARIANT=$VARIANT_NAME", + "NDK_LIBS_OUT=$LIBS_RELEASE", 'NDK_OUT=./obj-release' +} + +task mkXml(type: Exec) { + workingDir '../' + commandLine '../scripts/mk_xml.py', '-o', + "src/org/eehouse/android/$VARIANT_NAME/loc/LocIDsData.java", + '-t', "debug", '-v', "$VARIANT_NAME" +} + +afterEvaluate { + compileReleaseNdk.dependsOn ndkBuildRelease + compileDebugNdk.dependsOn ndkBuildDebug +} diff --git a/xwords4/android/XWords4/app/proguard-rules.pro b/xwords4/android/XWords4/app/proguard-rules.pro new file mode 100644 index 000000000..55f1c8742 --- /dev/null +++ b/xwords4/android/XWords4/app/proguard-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /home/eehouse/android/android-sdk-linux/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/xwords4/android/XWords4/app/src/main/AndroidManifest.xml b/xwords4/android/XWords4/app/src/main/AndroidManifest.xml new file mode 120000 index 000000000..4db074ab1 --- /dev/null +++ b/xwords4/android/XWords4/app/src/main/AndroidManifest.xml @@ -0,0 +1 @@ +../../../AndroidManifest.xml \ No newline at end of file diff --git a/xwords4/android/XWords4/app/src/main/assets b/xwords4/android/XWords4/app/src/main/assets new file mode 120000 index 000000000..f86487ffc --- /dev/null +++ b/xwords4/android/XWords4/app/src/main/assets @@ -0,0 +1 @@ +../../../assets/ \ No newline at end of file diff --git a/xwords4/android/XWords4/app/src/main/java b/xwords4/android/XWords4/app/src/main/java new file mode 120000 index 000000000..a1d005e30 --- /dev/null +++ b/xwords4/android/XWords4/app/src/main/java @@ -0,0 +1 @@ +../../../src/ \ No newline at end of file diff --git a/xwords4/android/XWords4/app/src/main/res b/xwords4/android/XWords4/app/src/main/res new file mode 120000 index 000000000..fc8850136 --- /dev/null +++ b/xwords4/android/XWords4/app/src/main/res @@ -0,0 +1 @@ +../../../res \ No newline at end of file diff --git a/xwords4/android/XWords4/build.gradle b/xwords4/android/XWords4/build.gradle new file mode 100644 index 000000000..a1590caf8 --- /dev/null +++ b/xwords4/android/XWords4/build.gradle @@ -0,0 +1,34 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:1.3.0' + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + jcenter() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} + +subprojects { + afterEvaluate {project -> + if (project.hasProperty("android")) { + android { + compileSdkVersion 14 + buildToolsVersion '22.0.1' + } + } + } +} diff --git a/xwords4/android/XWords4/gradle.properties b/xwords4/android/XWords4/gradle.properties new file mode 100644 index 000000000..1d3591c8a --- /dev/null +++ b/xwords4/android/XWords4/gradle.properties @@ -0,0 +1,18 @@ +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. + +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html + +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +# Default value: -Xmx10248m -XX:MaxPermSize=256m +# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 + +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true \ No newline at end of file diff --git a/xwords4/android/XWords4/gradle/wrapper/gradle-wrapper.jar b/xwords4/android/XWords4/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..8c0fb64a8 Binary files /dev/null and b/xwords4/android/XWords4/gradle/wrapper/gradle-wrapper.jar differ diff --git a/xwords4/android/XWords4/gradle/wrapper/gradle-wrapper.properties b/xwords4/android/XWords4/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..beaf6ec9f --- /dev/null +++ b/xwords4/android/XWords4/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Nov 09 19:22:17 PST 2015 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip diff --git a/xwords4/android/XWords4/gradlew b/xwords4/android/XWords4/gradlew new file mode 100755 index 000000000..91a7e269e --- /dev/null +++ b/xwords4/android/XWords4/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/xwords4/android/XWords4/gradlew.bat b/xwords4/android/XWords4/gradlew.bat new file mode 100644 index 000000000..aec99730b --- /dev/null +++ b/xwords4/android/XWords4/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/xwords4/android/XWords4/settings.gradle b/xwords4/android/XWords4/settings.gradle new file mode 100644 index 000000000..e7b4def49 --- /dev/null +++ b/xwords4/android/XWords4/settings.gradle @@ -0,0 +1 @@ +include ':app'