Merge pull request #32 from JetBrains/migrate-to-m110

Migrate to m110

.github/workflows/build.yml

@@ -13,7 +13,7 @@ on:
         default: 'false'
 
 env:
-  version: m105-adda216f-4
+  version: m110-de56cc1
 
 jobs:
   macos:

README.md

@@ -15,15 +15,15 @@ Prebuilt binaries can be found [in releases](https://github.com/JetBrains/skia-p
 ## Building locally
 
 ```sh
-python3 script/checkout.py --version m105-305b7c02
+python3 script/checkout.py --version m110-de56cc1
 python3 script/build.py
 python3 script/archive.py
 ```
 
 To build a debug build:
 
 ```sh
-python3 script/checkout.py --version m105-305b7c02
+python3 script/checkout.py --version m110-de56cc1
 python3 script/build.py --build-type Debug
 python3 script/archive.py --build-type Debug
 ```

script/build.py

@@ -13,7 +13,7 @@ def main():
   ndk = common.ndk()
 
   tools_dir = "depot_tools"
-  ninja = 'ninja.exe' if 'windows' == host else 'ninja'
+  ninja = 'ninja.bat' if 'windows' == host else 'ninja'
   isIos = 'ios' == target or 'iosSim' == target
   isIosSim = 'iosSim' == target
 

script/checkout.py

@@ -1,6 +1,6 @@
 #! /usr/bin/env python3
 
-import argparse, common, os, pathlib, platform, re, subprocess, sys
+import common, os, re, subprocess, sys
 
 def main():
   os.chdir(os.path.join(os.path.dirname(__file__), os.pardir))
@@ -45,6 +45,10 @@ def main():
   else:
     subprocess.check_call(["python3", "tools/git-sync-deps"])
 
+  # fetch ninja
+  print("> Fetching ninja")
+  subprocess.check_call(["python3", "bin/fetch-ninja"])
+
   return 0
 
 if __name__ == '__main__':