Commit e0428c6ab3e1cf6ab9e47689192ef1a3d4f68635

Authored by Arthur Bikmullin
1 parent 16d8cefd

Merged with V83

... ... @@ -22,11 +22,10 @@ HTML_PLAYER="${MONKEYDIR}/bin/mserver_linux"
22 22 '
23 23 'Must be set to a valid dir for ANDROID and FLASH target support
24 24 '
25   -'Make sure to install the 32 bit JDK, even on 64 bit Windows!
26   -'
27 25 'The Java JDK is currently available here:
28 26 ' http://www.oracle.com/technetwork/java/javase/downloads/index.html
29 27 '
  28 +JDK_PATH="${HOME}/jdk1.8.0_31"
30 29 JDK_PATH="${HOME}/jdk1.7.0_09"
31 30 '--------------------
32 31
... ...
1   -Subproject commit 79288dedabacca829c5c2ecd386fb9bdc628fbf0
  1 +Subproject commit 67abcbc52c56fa7749069e09c23f57a0dc8191cc
... ...
1   -Subproject commit e169f8717dadaf32375d32a995aa56e66c9f7223
  1 +Subproject commit fb9dcce317c2b2a2d6fe7fff2837520c8094250a
... ...
1   -Subproject commit 2dfee9fb9a116f99c1fa8e738d8f616358ccbf41
  1 +Subproject commit 4116ee6c562735b2cbe84a48ef327afa496535ac
... ...
1   -Subproject commit b2143e82f29423fcf65d94accdcc7e6b75c5d1d4
  1 +Subproject commit d75dbac55da1ff24aab0a9da5adbbc9729d3ce0f
... ...
1   -Subproject commit c2bf0baac69f02a54cd04a5ba02de584099d36ed
  1 +Subproject commit 63f010ce63fd7306d18b468f3fbc343de1188435
... ...
1   -Subproject commit 10950234c478993621ec3d33c248825d94cf27ad
  1 +Subproject commit 596a1cd09e846a3b494c3e35f16f968e55a2b336
... ...
1   -Subproject commit ff7195cefe2b14fbaff5ebf56195313b9d6c6ccd
  1 +Subproject commit 9ae6f3c79654ca9a9600657a0e255e9284ceef8a
... ...
1   -Subproject commit 46a2f9c4c1d8b59759cba1be67f7aad750481d73
  1 +Subproject commit ff42b50b5941c88fdfe5811e92b03b1ae5591f48
... ...
... ... @@ -51,7 +51,7 @@ Class AndroidBuilder Extends Builder
51 51
52 52 SetConfigVar "ANDROID_MANIFEST_MAIN",GetConfigVar( "ANDROID_MANIFEST_MAIN" ).Replace( ";","~n" )+"~n"
53 53 SetConfigVar "ANDROID_MANIFEST_APPLICATION",GetConfigVar( "ANDROID_MANIFEST_APPLICATION" ).Replace( ";","~n" )+"~n"
54   - SetConfigVar "ANDROID_MANIFEST_ACTIVITY",GetConfigVar( "ANDROID_MAINFEST_ACTIVITY" ).Replace( ";","~n" )+"~n"
  54 + SetConfigVar "ANDROID_MANIFEST_ACTIVITY",GetConfigVar( "ANDROID_MANIFEST_ACTIVITY" ).Replace( ";","~n" )+"~n"
55 55
56 56 'create package
57 57 Local jpath:="src"
... ... @@ -166,16 +166,27 @@ Class AndroidBuilder Extends Builder
166 166 Local antcfg:="debug"
167 167
168 168 If GetConfigVar( "ANDROID_SIGN_APP" )="1" antcfg="release"
  169 +
  170 + Local ant:="ant"
  171 + If tcc.ANT_PATH ant="~q"+tcc.ANT_PATH+"/bin/ant~q"
169 172
170   - If Not (Execute( tcc.ANT_PATH+"/bin/ant clean",False ) And Execute( tcc.ANT_PATH+"/bin/ant "+antcfg+" install",False ))
  173 + If Not (Execute( ant+" clean",False ) And Execute( ant+" "+antcfg+" install",False ))
171 174
172 175 Die "Android build failed."
173 176
174 177 Else If tcc.opt_run
  178 +
  179 + Local adb:="adb"
  180 + If tcc.ANDROID_PATH adb="~q"+tcc.ANDROID_PATH+"/platform-tools/adb~q"
  181 +
  182 + Execute adb+" logcat -c",False
  183 + Execute adb+" shell am start -n "+app_package+"/"+app_package+".MonkeyGame",False
  184 + Execute adb+" logcat [Monkey]:I *:E",False
175 185
176   - Execute "adb logcat -c",False
177   - Execute "adb shell am start -n "+app_package+"/"+app_package+".MonkeyGame",False
178   - Execute "adb logcat [Monkey]:I *:E",False
  186 +' Execute "echo $PATH",False
  187 +' Execute "adb logcat -c",False
  188 +' Execute "adb shell am start -n "+app_package+"/"+app_package+".MonkeyGame",False
  189 +' Execute "adb logcat [Monkey]:I *:E",False
179 190 '
180 191 'NOTE: This leaves ADB server running which can LOCK the .build dir making it undeletable...
181 192 '
... ...
... ... @@ -46,7 +46,7 @@ Class GlfwBuilder Extends Builder
46 46
47 47 ChangeDir dst
48 48 CreateDir "build"
49   - CreateDir "build/"+ENV_CONFIG
  49 + CreateDir "build/"+casedConfig
50 50
51 51 Local ccopts:=""
52 52 Select ENV_CONFIG
... ...
1   -Subproject commit 5de9c322042bcaa842c6cf5d63845bce53199a29
  1 +Subproject commit a95d546955f81e4c19409cd859c5bba6c09b11ab
... ...