m132-9ab7c2064b

Author: tonsky

.github/workflows/build.yml

@@ -17,7 +17,7 @@ permissions:
   contents: write
 
 env:
-  version: m123-4a0a5e9906
+  version: m132-9ab7c2064b
 
 jobs:
   macos:
@@ -50,7 +50,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        target_machine: ["x64", "arm64"]
+        target_machine: ["x64"]
         build_type: [Release, Debug]
       fail-fast: false
     steps:
@@ -77,34 +77,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-  android:
-    if: false
-    runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        machine: [arm, arm64, x64, x86]
-    steps:
-      - uses: actions/checkout@v4
-      - run: python3 script/check_release.py --version ${{ env.version }} --system android --machine ${{ matrix.machine }}
-        if: ${{ github.event.inputs.skip_release != 'true' }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-      - run: sudo ./script/prepare_linux.sh
-      - run: PATH=/usr/lib/binutils-2.26/bin:$PATH python3 script/checkout.py --version ${{ env.version }} --system android --machine ${{ matrix.machine }}
-      - run: PATH=/usr/lib/binutils-2.26/bin:$PATH python3 script/build.py --system android --machine ${{ matrix.machine }} --ndk "/usr/local/lib/android/sdk/ndk-bundle"
-      - run: PATH=/usr/lib/binutils-2.26/bin:$PATH python3 script/archive.py --system android --machine ${{ matrix.machine }}
-      - uses: actions/upload-artifact@v4
-        with:
-          name: Skia-${{ env.version }}-android-Release-${{ matrix.machine }}.zip
-          path: '*.zip'
-      - run: python3 script/release.py --system android --machine ${{ matrix.machine }}
-        if: ${{ github.event.inputs.skip_release != 'true' }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
   windows:
     runs-on: windows-latest
     strategy:

patches/GrD3DUtil.patch

@@ -23,25 +23,18 @@ def main():
     'out/' + build_type + '-' + machine + '/*.a',
     'out/' + build_type + '-' + machine + '/*.lib',
     'out/' + build_type + '-' + machine + '/icudtl.dat',
+    'out/' + build_type + '-' + machine + '/defines.cmake',
     'include/**/*',
-    'modules/particles/include/*.h',
-    'modules/skcms/skcms.h',
-    'modules/skcms/src/skcms_public.h',
-    'modules/skottie/include/*.h',
-    'modules/skottie/src/*.h',
-    'modules/skottie/src/animator/*.h',
-    'modules/skottie/src/effects/*.h',
-    'modules/skottie/src/layers/*.h',
-    'modules/skottie/src/layers/shapelayer/*.h',
-    'modules/skottie/src/text/*.h',
-    'modules/skparagraph/include/*.h',
-    'modules/skplaintexteditor/include/*.h',
-    'modules/skresources/include/*.h',
-    'modules/sksg/include/*.h',
-    'modules/skshaper/include/*.h',
-    'modules/skshaper/src/*.h',
-    'modules/skunicode/include/*.h',
-    'modules/svg/include/*.h',
+    'modules/particles/**/*.h',
+    'modules/skcms/**/*.h',
+    'modules/skottie/**/*.h',
+    'modules/skparagraph/**/*.h',
+    'modules/skplaintexteditor/**/*.h',
+    'modules/skresources/**/*.h',
+    'modules/sksg/**/*.h',
+    'modules/skshaper/**/*.h',
+    'modules/skunicode/**/*.h',
+    'modules/svg/**/*.h',
     'src/**/*.h',
     'third_party/externals/angle2/LICENSE',
     'third_party/externals/angle2/include/**/*',

script/archive.py

@@ -1,9 +1,9 @@
 #! /usr/bin/env python3
 
-import common, os, subprocess, sys
+import common, os, re, subprocess, sys
 
 def main():
-  os.chdir(os.path.join(os.path.dirname(__file__), os.pardir, 'skia'))
+  os.chdir(f'{common.basedir}/skia')
 
   build_type = common.build_type()
   machine = common.machine()
@@ -78,12 +78,27 @@ def main():
       'ndk="' + ndk + '"'
     ]
 
+  # Generate build instructions
   out = os.path.join('out', build_type + '-' + machine)
   gn = 'gn.exe' if 'windows' == system else 'gn'
   subprocess.check_call([os.path.join('bin', gn), 'gen', out, '--args=' + ' '.join(args)])
+
+  # Compile
   ninja = 'ninja.exe' if 'windows' == system else 'ninja'
   subprocess.check_call([os.path.join('third_party/ninja', ninja), '-C', out, 'skia', 'modules'])
 
+  # Extract all unique defines from ninja commands
+  ninja_commands = subprocess.check_output([os.path.join('third_party/ninja', ninja), '-C', out, '-t', 'commands'], text=True)
+  defines = set()
+  for match in re.finditer(r'-D(\S+)', ninja_commands):
+    defines.add(match.group(1))
+  defines_file = os.path.join(out, 'defines.cmake')
+  with open(defines_file, 'w') as f:
+    f.write('add_definitions(\n')
+    for define in sorted(defines):
+      f.write('  -D' + define.replace('\\', '') + '\n')
+    f.write(')\n')
+
   return 0
 
 if __name__ == '__main__':

script/build.py

@@ -0,0 +1,10 @@
+#! /usr/bin/env python3
+import common, os, shutil, sys
+
+def main():
+  os.chdir(common.basedir)
+  shutil.rmtree("skia/out", ignore_errors=True)
+  return 0
+
+if __name__ == '__main__':
+  sys.exit(main())

script/clean.py

@@ -2,6 +2,8 @@
 
 import argparse, base64, os, platform, re, subprocess
 
+basedir = os.path.abspath(os.path.dirname(__file__) + '/..')
+
 def create_parser(version_required=False):
   parser = argparse.ArgumentParser()
   parser.add_argument('--build-type', default='Release')