Setup android builds: cpp_test, cpp_empty, cocos_new for appveyor (cocos2d#18624)

* Simlpify appveyor script, remove unused functions

* Setup android builds: cpp_test, cpp_empty, cocos_new for appveyor

* Use absolute path for download-deps.py

* PushAppveyorArtifacts

Author: crazyhappygame

.appveyor.yml

@@ -7,14 +7,20 @@ environment:
   PYTHON: "C:\\Python27"
   PYTHON_VERSION: "2.7.13"
   PYTHON_ARCH: "32"
+  matrix:
+    - build_type: android_cpp_empty_test
+    - build_type: android_cpp_tests
+    - build_type: android_cocos_new_test
+#    - build_type: android_gen_libs
+    - build_type: windows32
 
 platform:
   - x86
 
 configuration:
   - Release
 
-before_build: 
+before_build:
   - ps: ./tools/appveyor-scripts/before-build.ps1
 
 build_script:
@@ -27,4 +33,6 @@ branches:
   - v4-develop
   - v3-doc
   - v3.11_backup
-  - v35-for-tizen
+  - v35-for-tizen
+
+clone_depth: 50

tools/appveyor-scripts/before-build.ps1

@@ -8,17 +8,17 @@ function Download-Deps
 
 function Download-NDK
 {
-	$url = "https://dl.google.com/android/repository/android-ndk-r16-windows-x86.zip"
+    $url = "https://dl.google.com/android/repository/android-ndk-r16-windows-x86.zip"
     $output = "$env:APPVEYOR_BUILD_FOLDER/../android-ndk-r16-windows-x86.zip"
     Write-Host "downloading $url"
-	Start-FileDownload $url $output
-	Write-Host "finish downloading $url"
+    Start-FileDownload $url $output
+    Write-Host "finish downloading $url"
 
-	Write-Host "installing NDK"
+    Write-Host "installing NDK"
     Push-Location $env:APPVEYOR_BUILD_FOLDER/../
-	$zipfile = $output
+    $zipfile = $output
     Invoke-Expression "7z.exe x $zipfile"
-	Write-Host "finish installing NDK"
+    Write-Host "finish installing NDK"
     Pop-Location
     $env:NDK_ROOT = "$env:APPVEYOR_BUILD_FOLDER/../android-ndk-r16"
     Write-Host "set environment NDK_ROOT to $env:NDK_ROOT"
@@ -29,29 +29,38 @@ function Generate-Binding-Codes
 
     # install python module
     & pip install PyYAML Cheetah
-	Write-Host "generating binding codes"
+    Write-Host "generating binding codes"
 
     $env:PYTHON_BIN = $python
-	Write-Host "set environment viriable PYTHON_BIN to $env:PYTHON_BIN"
+    Write-Host "set environment viriable PYTHON_BIN to $env:PYTHON_BIN"
 
-	Push-Location $env:APPVEYOR_BUILD_FOLDER\tools\tolua
-	& $python $env:APPVEYOR_BUILD_FOLDER\tools\tolua\genbindings.py
-	Pop-Location
+    Push-Location $env:APPVEYOR_BUILD_FOLDER\tools\tolua
+    & $python $env:APPVEYOR_BUILD_FOLDER\tools\tolua\genbindings.py
+    Pop-Location
 
     Push-Location $env:APPVEYOR_BUILD_FOLDER\tools\tojs
-	& $python $env:APPVEYOR_BUILD_FOLDER\tools\tojs\genbindings.py
-	Pop-Location
+    & $python $env:APPVEYOR_BUILD_FOLDER\tools\tojs\genbindings.py
+    Pop-Location
 }
 
 function Update-SubModule
 {
-	Push-Location $env:APPVEYOR_BUILD_FOLDER
-	& git submodule init
-	& git submodule update --recursive
-	Pop-Location
+    Push-Location $env:APPVEYOR_BUILD_FOLDER
+    & git submodule init
+    & git submodule update --recursive
+    Pop-Location
 }
 
 Update-SubModule
-Download-Deps
-Download-NDK
-Generate-Binding-Codes
+
+$python = "C:\\Python27\\python.exe"
+
+If ($env:build_type -eq "windows32") {
+    Download-Deps
+    Download-NDK
+    Generate-Binding-Codes
+}
+Else {
+    & $python -u .\tools\appveyor-scripts\setup_android.py
+    if ($lastexitcode -ne 0) {throw}
+}

tools/appveyor-scripts/build.ps1

@@ -1,2 +1,55 @@
-& msbuild $env:APPVEYOR_BUILD_FOLDER\build\cocos2d-win32.sln /t:Build /p:Platform="Win32" /p:Configuration="Release" /m
-if ($lastexitcode -ne 0) {throw}
+$python = "C:\\Python27\\python.exe"
+
+Write-Host "Set environment"
+# gradlew
+$env:ANDROID_HOME=$env:APPVEYOR_BUILD_FOLDER + "\..\android-sdk"
+$env:ANDROID_NDK_HOME=$env:APPVEYOR_BUILD_FOLDER + "\..\android-ndk-r16b"
+# gen-libs
+$env:ANDROID_SDK_ROOT=$env:APPVEYOR_BUILD_FOLDER + "\..\android-sdk"
+$env:NDK_ROOT=$env:APPVEYOR_BUILD_FOLDER + "\..\android-ndk-r16b"
+
+function PushAndroidArtifacts
+{
+    # https://www.appveyor.com/docs/packaging-artifacts/
+    $root = Resolve-Path app\build\outputs\apk; [IO.Directory]::GetFiles($root.Path, '*.*', 'AllDirectories') | % { Push-AppveyorArtifact $_ -FileName $_.Substring($root.Path.Length + 1) -DeploymentName to-publish }
+}
+
+
+If ($env:build_type -eq "android_cpp_tests") {
+    Write-Host "Build tests\cpp-tests"
+    Push-Location $env:APPVEYOR_BUILD_FOLDER\tests\cpp-tests\proj.android\
+    & ./gradlew build
+    if ($lastexitcode -ne 0) {throw}
+    PushAndroidArtifacts
+    Pop-Location
+
+} elseif ($env:build_type -eq "android_cpp_empty_test") {
+    Write-Host "Build tests\cpp-empty-test"
+    Push-Location $env:APPVEYOR_BUILD_FOLDER\tests\cpp-empty-test\proj.android\
+    & ./gradlew build
+    if ($lastexitcode -ne 0) {throw}
+    PushAndroidArtifacts
+    Pop-Location
+
+} elseif ($env:build_type -eq "android_cocos_new_test") {
+    Write-Host "Create new project cocos_new_test"
+    & $python -u tools\cocos2d-console\bin\cocos.py --agreement n new -l cpp -p my.pack.qqqq cocos_new_test
+    if ($lastexitcode -ne 0) {throw}
+
+    Write-Host "Build cocos_new_test"
+    Push-Location $env:APPVEYOR_BUILD_FOLDER\cocos_new_test\proj.android\
+    & ./gradlew build
+    if ($lastexitcode -ne 0) {throw}
+    PushAndroidArtifacts
+    Pop-Location
+# TODO: uncomment when fixed
+# } elseif ($env:build_type -eq "android_gen_libs") {
+#     Write-Host "Build cocos gen-libs"
+#     & $python -u tools\cocos2d-console\bin\cocos.py gen-libs -p android -m release --ap android-15 --app-abi armeabi-v7a --agreement n
+#     if ($lastexitcode -ne 0) {throw}
+
+}
+Else {
+    & msbuild $env:APPVEYOR_BUILD_FOLDER\build\cocos2d-win32.sln /t:Build /p:Platform="Win32" /p:Configuration="Release" /m
+    if ($lastexitcode -ne 0) {throw}
+}

tools/appveyor-scripts/setup_android.py

@@ -0,0 +1,123 @@
+#!/usr/bin/env python
+'''
+aaa
+'''
+import os
+import urllib
+import zipfile
+import platform
+import sys
+import subprocess
+import tempfile
+
+DIR_PATH = os.path.dirname(os.path.realpath(__file__))
+
+COCOS2D_X = os.path.abspath(os.path.join(DIR_PATH, "../.."))
+# ROOT_DIR/cocos2d-x
+ROOT_DIR = os.path.abspath(os.path.join(COCOS2D_X, ".."))
+
+ANDROID_NDK = os.path.join(ROOT_DIR, "android-ndk-r16b")
+ANDROID_SDK = os.path.join(ROOT_DIR, "android-sdk")
+SDK_MANAGER = os.path.join(ROOT_DIR, "sdk_tools/tools/bin/sdkmanager")
+SYSTEM = platform.system().lower()
+if SYSTEM == "windows":
+    SDK_MANAGER = SDK_MANAGER + ".bat"
+
+
+def run(command):
+    print("=" * 80)
+    print(command)
+    subprocess.check_call(command.split())
+
+
+def run_with_yes(command):
+    print("=" * 80)
+    print("yes|" + command)
+    f = tempfile.TemporaryFile("w")
+    repeat_yes = 50
+    f.write("y\n" * repeat_yes)
+    f.seek(0)
+    subprocess.check_call(command.split(), stdin=f)
+
+
+def unzip(zip_file, directory):
+    print("=" * 80)
+    print("Unzip: " + zip_file + " to " + directory)
+    if SYSTEM == "windows":
+        zipfile.ZipFile(zip_file).extractall(directory)
+    else:
+        # module zipfile ignore priviliges i.e. +x
+        cmd = "unzip -d " + directory + " " + zip_file
+        subprocess.check_output(cmd.split())
+
+
+def download(url, zip_file):
+    print("=" * 80)
+    print("Download: " + url + ", file: " + zip_file)
+    urllib.urlretrieve(url, zip_file)
+
+
+def install_android_ndk():
+    file_name = "android-ndk-r16b-" + SYSTEM + "-x86_64.zip"
+    url = "https://dl.google.com/android/repository/" + file_name
+    zip_file = os.path.abspath(os.path.join(ROOT_DIR, file_name))
+
+    download(url, zip_file)
+    unzip(zip_file, ROOT_DIR)
+
+
+def install_android_sdk_tools():
+    file_name = "sdk-tools-{system}-3859397.zip".format(
+        system=platform.system().lower())
+    url = "https://dl.google.com/android/repository/" + file_name
+    zip_file = os.path.abspath(os.path.join(ROOT_DIR, file_name))
+
+    download(url, zip_file)
+    unzip(zip_file, os.path.join(ROOT_DIR, "sdk_tools"))
+
+
+def install_android_sdk():
+    switches = " --verbose --sdk_root=" + ANDROID_SDK + " "
+    cmd1 = SDK_MANAGER + switches
+    packages = [
+        "platforms;android-15",
+        "build-tools;25.0.0",
+        "platform-tools",
+        "tools"
+    ]
+
+    cmd = cmd1 + " ".join(packages)
+    run_with_yes(cmd)
+
+
+def export_environment():
+    # gradle
+    # os.environ["ANDROID_HOME"] = ANDROID_SDK
+    # os.environ["ANDROID_NDK_HOME"] = ANDROID_NDK
+    # # cocos gen-libs
+    # os.environ["ANDROID_SDK_ROOT"] = ANDROID_SDK
+    # os.environ["NDK_ROOT"] = ANDROID_NDK
+
+    with open(os.path.join(ROOT_DIR, "environment.sh"), "a") as myfile:
+        myfile.write("export ANDROID_HOME=" + ANDROID_SDK + "\n")
+        myfile.write("export ANDROID_NDK_HOME=" + ANDROID_NDK + "\n")
+        myfile.write("export ANDROID_SDK_ROOT=" + ANDROID_SDK + "\n")
+        myfile.write("export NDK_ROOT=" + ANDROID_NDK + "\n")
+
+    with open(os.path.join(ROOT_DIR, "environment.ps1"), "a") as myfile:
+        myfile.write("$env:ANDROID_HOME=\"" + ANDROID_SDK + "\"\n")
+        myfile.write("$env:ANDROID_NDK_HOME=\"" + ANDROID_NDK + "\"\n")
+        myfile.write("$env:ANDROID_SDK_ROOT=\"" + ANDROID_SDK + "\"\n")
+        myfile.write("$env:NDK_ROOT=\"" + ANDROID_NDK + "\"\n")
+
+
+def main():
+    run(sys.executable + " " + os.path.join(COCOS2D_X, "download-deps.py") + " --remove-download=False")
+    install_android_ndk()
+    install_android_sdk_tools()
+    install_android_sdk()
+    export_environment()
+
+
+if __name__ == '__main__':
+    main()