Mercurial > 510Connectbot

changeset 459:a3239022798d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
compile 32 and 64 bit arch, bump version
author Carl Byington <carl@five-ten-sg.com>
date Sun, 28 Apr 2019 17:06:20 -0700
parents ad275ce23092
children 4776062555f3
files Makefile app/build.gradle app/src/main/AndroidManifest.xml app/src/main/java/com/five_ten_sg/connectbot/service/TerminalMonitor.java build.gradle gradle/wrapper/gradle-wrapper.properties
diffstat 6 files changed, 36 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Tue Jan 29 11:22:19 2019 -0800
+++ b/Makefile	Sun Apr 28 17:06:20 2019 -0700
@@ -1,12 +1,13 @@
 #mc40 is "On Device Storage"
 #tc55 is "Internal Storage"
 
+na=$(shell find . -iname '*.c' -o -iname '*.h' -o -iname '*.cpp')
 style:=release
 dest:=/run/user/1000/gvfs/mtp*/*torage/Download
 ver:=$(shell grep versionName app/src/main/AndroidManifest.xml | cut -d'"' -f2)
-apk:='app/build/outputs/apk/510Connectbot-$(ver).apk'
+apk:='app/build/outputs/apk/510Connectbot-$(ver).$(style).apk'
 id:=$(shell hg id --id || echo 1)
-da:=$(shell date +%Y-%m-%d)
+da:=$(shell date '+%Y-%m-%dT%H:%M:%S')
 version:=\
 <?xml version=\"1.0\" encoding=\"utf-8\"?>\n\
 <resources>\n\
@@ -15,10 +16,13 @@
 
 ifeq ($(style),release)
     task:=assembleArmRelease
+	debug:=0
 else
 	task:=assembleArmDebug
+	debug:=1
 endif
 
+fn:=app/src/main/java/com/five_ten_sg/connectbot/monitor/MonitorService.java
 
 all:
 	hg pull; hg update
@@ -65,6 +69,8 @@
 	convert app/src/main/res/drawable-ldpi/icon.png    -resize 50% -colorspace Gray app/src/main/res/drawable-ldpi/notification_icon.png
 
 indentc:
+	dos2unix $(na)
+	for i in $(na); do sed -i -e 's/\r//g' $$i; done
 	indent --line-length100 \
 		   --brace-indent4 \
 		   --braces-on-if-line \
@@ -73,15 +79,17 @@
 		   --case-indentation4 \
 		   --comment-indentation60 \
 		   --cuddle-else \
+		   --cuddle-do-while \
 		   --declaration-comment-column60 \
 		   --no-tabs \
 		   -nbbo \
 		   -npcs \
 		   -nprs \
 		   -npsl \
+		   -bad -bap -bbb -sob \
 		   -saf -sai -saw \
 		   -i4 \
-		   $(shell find . -iname *.c -o -iname *.h -o -iname *.cpp)
+		   $(na)
 
 
 indentjava:
@@ -93,9 +101,10 @@
 		--indent-cases \
 		--indent-namespaces \
 		--break-blocks \
+		--pad-oper \
+		--pad-first-paren-out \
+		--pad-header \
 		--unpad-paren \
-		--pad-oper \
-		--pad-header \
 		--delete-empty-lines \
 		--align-pointer=type \
 		--break-closing-brackets \
@@ -104,7 +113,7 @@
 		--convert-tabs \
 		--break-after-logical \
 		--mode=java \
-		   $(shell find . -iname *.java | grep -v /gen/)
+		   $(shell find . -iname '*.java' | grep -v /gen/)
 
 internaldocs:
 	doxygen
--- a/app/build.gradle	Tue Jan 29 11:22:19 2019 -0800
+++ b/app/build.gradle	Sun Apr 28 17:06:20 2019 -0700
@@ -23,14 +23,21 @@
             signingConfig = android.signingConfigs.release
             ndk {
                 debuggable = false
-                abiFilters 'armeabi-v7a'
+                abiFilters 'armeabi-v7a', 'arm64-v8a'
             }
         }
         debug {
             debuggable = true
+            initWith debug
+            jniDebuggable true
+            externalNativeBuild {
+                ndkBuild {
+                    cFlags "-DDEBUG=1"
+                }
+            }
             ndk {
                 debuggable = true
-                abiFilters 'armeabi-v7a'
+                abiFilters 'armeabi-v7a', 'arm64-v8a'
             }
         }
     }
@@ -57,7 +64,7 @@
         targetSdkVersion = 28
         ndk {
             moduleName = "com_google_ase_Exec"
-            abiFilters 'armeabi-v7a'
+            abiFilters 'armeabi-v7a', 'arm64-v8a'
         }
     }
 
@@ -67,4 +74,8 @@
         }
     }
 
+    dependencies {
+        implementation 'com.android.support:support-v4:23.+'
+        // update the 23.0.0 to latest version available
+    }
 }
--- a/app/src/main/AndroidManifest.xml	Tue Jan 29 11:22:19 2019 -0800
+++ b/app/src/main/AndroidManifest.xml	Sun Apr 28 17:06:20 2019 -0700
@@ -17,8 +17,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.five_ten_sg.connectbot"
-	android:versionName="1.9.3-3"
-	android:versionCode="1933"
+	android:versionName="1.9.3-4"
+	android:versionCode="1934"
 	android:installLocation="auto">
 
 	<uses-permission android:name="android.permission.INTERNET" />
--- a/app/src/main/java/com/five_ten_sg/connectbot/service/TerminalMonitor.java	Tue Jan 29 11:22:19 2019 -0800
+++ b/app/src/main/java/com/five_ten_sg/connectbot/service/TerminalMonitor.java	Sun Apr 28 17:06:20 2019 -0700
@@ -41,6 +41,7 @@
     public  static final char MONITOR_CMD_SHOWURL       = 9;
     public  static final char MONITOR_CMD_SWITCHSESSION = 10;
     public  static final char MONITOR_CMD_CURSORREQUEST = 11;
+    public  static final char MONITOR_CMD_SAYSTRING     = 12;
 
     public  static final String[] commands = {
         "cmd_init",
@@ -55,6 +56,7 @@
         "cmd_showurl",
         "cmd_switchsession",
         "cmd_cursorrequest"
+        "cmd_saystring"
     };
 
     public  static final char CURSOR_REQUESTED      = 0;
--- a/build.gradle	Tue Jan 29 11:22:19 2019 -0800
+++ b/build.gradle	Sun Apr 28 17:06:20 2019 -0700
@@ -6,7 +6,7 @@
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.4.0'
     }
 }
 
--- a/gradle/wrapper/gradle-wrapper.properties	Tue Jan 29 11:22:19 2019 -0800
+++ b/gradle/wrapper/gradle-wrapper.properties	Sun Apr 28 17:06:20 2019 -0700
@@ -1,8 +1,6 @@
-#Wed Oct 21 11:34:03 PDT 2015
+#Wed Apr 17 12:40:18 PDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-#distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
-
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip