comparison Makefile @ 459:a3239022798d

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 105815cce146
children 3a83f40439d7
comparison
equal deleted inserted replaced
458:ad275ce23092 459:a3239022798d
1 #mc40 is "On Device Storage" 1 #mc40 is "On Device Storage"
2 #tc55 is "Internal Storage" 2 #tc55 is "Internal Storage"
3 3
4 na=$(shell find . -iname '*.c' -o -iname '*.h' -o -iname '*.cpp')
4 style:=release 5 style:=release
5 dest:=/run/user/1000/gvfs/mtp*/*torage/Download 6 dest:=/run/user/1000/gvfs/mtp*/*torage/Download
6 ver:=$(shell grep versionName app/src/main/AndroidManifest.xml | cut -d'"' -f2) 7 ver:=$(shell grep versionName app/src/main/AndroidManifest.xml | cut -d'"' -f2)
7 apk:='app/build/outputs/apk/510Connectbot-$(ver).apk' 8 apk:='app/build/outputs/apk/510Connectbot-$(ver).$(style).apk'
8 id:=$(shell hg id --id || echo 1) 9 id:=$(shell hg id --id || echo 1)
9 da:=$(shell date +%Y-%m-%d) 10 da:=$(shell date '+%Y-%m-%dT%H:%M:%S')
10 version:=\ 11 version:=\
11 <?xml version=\"1.0\" encoding=\"utf-8\"?>\n\ 12 <?xml version=\"1.0\" encoding=\"utf-8\"?>\n\
12 <resources>\n\ 13 <resources>\n\
13 <string name=\"msg_version\" translatable=\"false\">510Connectbot $(ver) ($(id) $(da))</string>\n\ 14 <string name=\"msg_version\" translatable=\"false\">510Connectbot $(ver) ($(id) $(da))</string>\n\
14 </resources>\n 15 </resources>\n
15 16
16 ifeq ($(style),release) 17 ifeq ($(style),release)
17 task:=assembleArmRelease 18 task:=assembleArmRelease
19 debug:=0
18 else 20 else
19 task:=assembleArmDebug 21 task:=assembleArmDebug
22 debug:=1
20 endif 23 endif
21 24
25 fn:=app/src/main/java/com/five_ten_sg/connectbot/monitor/MonitorService.java
22 26
23 all: 27 all:
24 hg pull; hg update 28 hg pull; hg update
25 make builder 29 make builder
26 30
63 convert app/src/main/res/drawable-hdpi/icon.png -resize 50% -colorspace Gray app/src/main/res/drawable-hdpi/notification_icon.png 67 convert app/src/main/res/drawable-hdpi/icon.png -resize 50% -colorspace Gray app/src/main/res/drawable-hdpi/notification_icon.png
64 convert app/src/main/res/drawable-mdpi/icon.png -resize 50% -colorspace Gray app/src/main/res/drawable-mdpi/notification_icon.png 68 convert app/src/main/res/drawable-mdpi/icon.png -resize 50% -colorspace Gray app/src/main/res/drawable-mdpi/notification_icon.png
65 convert app/src/main/res/drawable-ldpi/icon.png -resize 50% -colorspace Gray app/src/main/res/drawable-ldpi/notification_icon.png 69 convert app/src/main/res/drawable-ldpi/icon.png -resize 50% -colorspace Gray app/src/main/res/drawable-ldpi/notification_icon.png
66 70
67 indentc: 71 indentc:
72 dos2unix $(na)
73 for i in $(na); do sed -i -e 's/\r//g' $$i; done
68 indent --line-length100 \ 74 indent --line-length100 \
69 --brace-indent4 \ 75 --brace-indent4 \
70 --braces-on-if-line \ 76 --braces-on-if-line \
71 --braces-on-func-def-line \ 77 --braces-on-func-def-line \
72 --case-brace-indentation4 \ 78 --case-brace-indentation4 \
73 --case-indentation4 \ 79 --case-indentation4 \
74 --comment-indentation60 \ 80 --comment-indentation60 \
75 --cuddle-else \ 81 --cuddle-else \
82 --cuddle-do-while \
76 --declaration-comment-column60 \ 83 --declaration-comment-column60 \
77 --no-tabs \ 84 --no-tabs \
78 -nbbo \ 85 -nbbo \
79 -npcs \ 86 -npcs \
80 -nprs \ 87 -nprs \
81 -npsl \ 88 -npsl \
89 -bad -bap -bbb -sob \
82 -saf -sai -saw \ 90 -saf -sai -saw \
83 -i4 \ 91 -i4 \
84 $(shell find . -iname *.c -o -iname *.h -o -iname *.cpp) 92 $(na)
85 93
86 94
87 indentjava: 95 indentjava:
88 astyle --style=java \ 96 astyle --style=java \
89 --attach-namespaces \ 97 --attach-namespaces \
91 --indent-classes \ 99 --indent-classes \
92 --indent-switches \ 100 --indent-switches \
93 --indent-cases \ 101 --indent-cases \
94 --indent-namespaces \ 102 --indent-namespaces \
95 --break-blocks \ 103 --break-blocks \
104 --pad-oper \
105 --pad-first-paren-out \
106 --pad-header \
96 --unpad-paren \ 107 --unpad-paren \
97 --pad-oper \
98 --pad-header \
99 --delete-empty-lines \ 108 --delete-empty-lines \
100 --align-pointer=type \ 109 --align-pointer=type \
101 --break-closing-brackets \ 110 --break-closing-brackets \
102 --keep-one-line-blocks \ 111 --keep-one-line-blocks \
103 --keep-one-line-statements \ 112 --keep-one-line-statements \
104 --convert-tabs \ 113 --convert-tabs \
105 --break-after-logical \ 114 --break-after-logical \
106 --mode=java \ 115 --mode=java \
107 $(shell find . -iname *.java | grep -v /gen/) 116 $(shell find . -iname '*.java' | grep -v /gen/)
108 117
109 internaldocs: 118 internaldocs:
110 doxygen 119 doxygen