Add Debug build, include SkUTF.h, SkUnicode.h, skia_enable_skshaper=t…

…rue, skia_use_icu=true

.github/workflows/build.yml

@@ -9,39 +9,54 @@ on:
 env:
   # version: m87
   skia_branch: chrome/m87
-  skia_commit: a0c82f08df58dcd0e1d143db9ccab38f8d823b95
-  release: m87-a0c82f0
+  skia_commit: 489348851cca51b23f522734b6db3c785ffdfaed
+  release: m87-4893488
 
 jobs:
 
   macos:
     runs-on: macos-10.15
+    strategy:
+      matrix:
+        build_type: [Release, Debug]
     steps:
       - uses: actions/checkout@v2
       - run: ./build_macos.sh
+        env:
+          build_type: ${{ matrix.build_type }}
       - run: ./release.sh
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   linux:
     runs-on: ubuntu-latest
     container: ubuntu:14.04
+    strategy:
+      matrix:
+        build_type: [Release, Debug]
     steps:
       - uses: actions/checkout@v2
       - run: sudo ./prepare_linux.sh
       - run: PATH=/usr/lib/binutils-2.26/bin:$PATH ./build_linux.sh
+        env:
+          build_type: ${{ matrix.build_type }}
       - run: ./release.sh
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   windows:
     runs-on: windows-2019
+    strategy:
+      matrix:
+        build_type: [Release, Debug]
     steps:
       - uses: actions/checkout@v2
       - uses: microsoft/setup-msbuild@v1.0.1
       - uses: ilammy/msvc-dev-cmd@v1.3.0
       - shell: bash
         run: ./build_windows.sh
+        env:
+          build_type: ${{ matrix.build_type }}
       - run: ./release.sh
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -30,6 +30,12 @@ If you want to specify exact commit to build:
 skia_branch=chrome/m87 skia_commit=a0c82f08df58dcd0e1d143db9ccab38f8d823b95 release=m87-a0c82f0 ./build_macos.sh
 ```
 
+To build debug version:
+
+```sh
+build_type=Debug version=m87 ./build_macos.sh
+```
+
 ### Building step-by-step
 
 Install `depot_tools` somewhere:

build_linux.sh

@@ -1,19 +1,44 @@
 #!/bin/bash
 set -o errexit -o nounset -o pipefail
+
 cd "`dirname $0`"
 
 source ./checkout.sh
 
+build_type=${build_type:-Release}
+echo "> Build type $build_type"
+
+if [ "${build_type}" = "Debug" ]; then
+  args="is_debug=true"
+else
+  args="is_debug=false is_official_build=true"
+fi
+
 python2 tools/git-sync-deps
-gn gen out/Release-x64 --args="is_debug=false is_official_build=true skia_use_system_expat=false skia_use_system_icu=false \
-  skia_use_system_libjpeg_turbo=false skia_use_system_libpng=false skia_use_system_libwebp=false skia_use_system_zlib=false \
-  skia_use_sfntly=false skia_use_freetype=true skia_use_harfbuzz=true skia_pdf_subset_harfbuzz=true \
-  skia_use_system_freetype2=false skia_use_system_harfbuzz=false skia_enable_gpu=true skia_use_gl=true \
-  target_cpu=\"x64\" extra_cflags_cc=[\"-frtti\"] cxx=\"g++-9\""
-ninja -C out/Release-x64 skia modules
+gn gen out/${build_type}-x64 --args="${args} \
+  skia_use_system_expat=false \
+  skia_use_system_libjpeg_turbo=false \
+  skia_use_system_libpng=false \
+  skia_use_system_libwebp=false \
+  skia_use_system_zlib=false \
+  skia_use_sfntly=false \
+  skia_use_freetype=true \
+  skia_use_system_freetype2=false \
+  skia_use_harfbuzz=true \
+  skia_use_system_harfbuzz=false \
+  skia_pdf_subset_harfbuzz=true \
+  skia_use_icu=true \
+  skia_use_system_icu=false \
+  skia_enable_skshaper=true \
+  skia_enable_gpu=true \
+  skia_use_gl=true \
+  target_cpu=\"x64\" \
+  extra_cflags_cc=[\"-frtti\"] \
+  cxx=\"g++-9\""
+ninja -C out/${build_type}-x64 skia modules
 
-zip --recurse-paths --quiet ../Skia-${release}-linux-Release-x64.zip \
-  out/Release-x64/*.a \
+zip --recurse-paths --quiet ../Skia-${release}-linux-${build_type}-x64.zip \
+  out/${build_type}-x64/*.a \
   include \
   modules/particles/include/*.h \
   modules/skottie/include/*.h \
@@ -22,8 +47,10 @@ zip --recurse-paths --quiet ../Skia-${release}-linux-Release-x64.zip \
   modules/skresources/include/*.h \
   modules/sksg/include/*.h \
   modules/skshaper/include/*.h \
+  modules/skshaper/src/*.h \
   src/core/*.h \
   src/gpu/gl/*.h \
+  src/utils/*.h \
   third_party/externals/angle2/LICENSE \
   third_party/externals/angle2/include \
   third_party/externals/freetype/docs/FTL.TXT \

build_macos.sh

@@ -1,19 +1,45 @@
 #!/bin/bash
 set -o errexit -o nounset -o pipefail
+
 cd "`dirname $0`"
 
 source ./checkout.sh
 
+build_type=${build_type:-Release}
+echo "> Build type $build_type"
+
+if [ "${build_type}" = "Debug" ]; then
+  args="is_debug=true"
+else
+  args="is_debug=false is_official_build=true"
+fi
+
 python2 tools/git-sync-deps
-gn gen out/Release-x64 --args="is_debug=false is_official_build=true skia_use_system_expat=false skia_use_system_icu=false \
-  skia_use_system_libjpeg_turbo=false skia_use_system_libpng=false skia_use_system_libwebp=false skia_use_system_zlib=false \
-  skia_use_sfntly=false skia_use_freetype=true skia_use_harfbuzz=true skia_pdf_subset_harfbuzz=true skia_use_system_freetype2=false \
-  skia_enable_gpu=true skia_use_gl=true skia_use_metal=true skia_use_system_harfbuzz=false \
-  target_cpu=\"x64\" extra_cflags=[\"-stdlib=libc++\", \"-mmacosx-version-min=10.13\"] extra_cflags_cc=[\"-frtti\"]"
-ninja -C out/Release-x64 skia modules
+gn gen out/${build_type}-x64 --args="${args} \
+  skia_use_system_expat=false \
+  skia_use_system_libjpeg_turbo=false \
+  skia_use_system_libpng=false \
+  skia_use_system_libwebp=false \
+  skia_use_system_zlib=false \
+  skia_use_sfntly=false \
+  skia_use_freetype=true \
+  skia_use_system_freetype2=false \
+  skia_use_harfbuzz=true \
+  skia_use_system_harfbuzz=false \
+  skia_pdf_subset_harfbuzz=true \
+  skia_use_icu=true \
+  skia_use_system_icu=false \
+  skia_enable_skshaper=true \
+  skia_enable_gpu=true \
+  skia_use_gl=true \
+  skia_use_metal=true \
+  target_cpu=\"x64\" \
+  extra_cflags=[\"-stdlib=libc++\", \"-mmacosx-version-min=10.13\"] \
+  extra_cflags_cc=[\"-frtti\"]"
+ninja -C out/${build_type}-x64 skia modules
 
-zip --recurse-paths --quiet ../Skia-${release}-macos-Release-x64.zip \
-  out/Release-x64/*.a \
+zip --recurse-paths --quiet ../Skia-${release}-macos-${build_type}-x64.zip \
+  out/${build_type}-x64/*.a \
   include \
   modules/particles/include/*.h \
   modules/skottie/include/*.h \
@@ -22,8 +48,10 @@ zip --recurse-paths --quiet ../Skia-${release}-macos-Release-x64.zip \
   modules/skresources/include/*.h \
   modules/sksg/include/*.h \
   modules/skshaper/include/*.h \
+  modules/skshaper/src/*.h \
   src/core/*.h \
   src/gpu/gl/*.h \
+  src/utils/*.h \
   third_party/externals/angle2/LICENSE \
   third_party/externals/angle2/include \
   third_party/externals/freetype/docs/FTL.TXT \
@@ -45,4 +73,4 @@ zip --recurse-paths --quiet ../Skia-${release}-macos-Release-x64.zip \
   third_party/externals/swiftshader/LICENSE.txt \
   third_party/externals/swiftshader/include \
   third_party/externals/zlib/LICENSE \
-  third_party/externals/zlib/*.h
+  third_party/externals/zlib/*.h

build_windows.sh

@@ -5,18 +5,38 @@ cd "`dirname $0`"
 
 source ./checkout.sh
 
+build_type=${build_type:-Release}
+echo "> Build type $build_type"
+
+if [ "${build_type}" = "Debug" ]; then
+  args="is_debug=true"
+else
+  args="is_debug=false is_official_build=true"
+fi
+
 python tools/git-sync-deps
-gn gen out/Release-x64 --args="is_debug=false is_official_build=true skia_use_system_expat=false skia_use_system_icu=false \
-  skia_use_system_libjpeg_turbo=false skia_use_system_libpng=false skia_use_system_libwebp=false skia_use_system_zlib=false \
-  skia_use_sfntly=false skia_use_freetype=true skia_use_harfbuzz=true skia_pdf_subset_harfbuzz=true \
-  skia_use_system_freetype2=false skia_use_system_harfbuzz=false \
-  extra_cflags=[\"-DSK_FONT_HOST_USE_SYSTEM_SETTINGS\"] \
-  target_cpu=\"x64\""
-ninja -C out/Release-x64 skia modules
+gn gen out/${build_type}-x64 --args="${args} \
+  skia_use_system_expat=false \
+  skia_use_system_libjpeg_turbo=false \
+  skia_use_system_libpng=false \
+  skia_use_system_libwebp=false \
+  skia_use_system_zlib=false \
+  skia_use_sfntly=false \
+  skia_use_freetype=true \
+  skia_use_system_freetype2=false \
+  skia_use_harfbuzz=true \
+  skia_use_system_harfbuzz=false \
+  skia_pdf_subset_harfbuzz=true \
+  skia_use_icu=true \
+  skia_use_system_icu=false \
+  skia_enable_skshaper=true \
+  target_cpu=\"x64\" \
+  extra_cflags=[\"-DSK_FONT_HOST_USE_SYSTEM_SETTINGS\"]"
+ninja -C out/${build_type}-x64 skia modules
 
-7z a -tzip -r ../Skia-${release}-windows-Release-x64.zip \
-  out/Release-x64/*.lib \
-  out/Release-x64/icudtl.dat \
+7z a -tzip -r ../Skia-${release}-windows-${build_type}-x64.zip \
+  out/${build_type}-x64/*.lib \
+  out/${build_type}-x64/icudtl.dat \
   include \
   modules/particles/include/*.h \
   modules/skottie/include/*.h \
@@ -25,8 +45,10 @@ ninja -C out/Release-x64 skia modules
   modules/skresources/include/*.h \
   modules/sksg/include/*.h \
   modules/skshaper/include/*.h \
+  modules/skshaper/src/*.h \
   src/core/*.h \
   src/gpu/gl/*.h \
+  src/utils/*.h \
   third_party/externals/angle2/LICENSE \
   third_party/externals/angle2/include \
   third_party/externals/freetype/docs/FTL.TXT \

release.sh

@@ -14,10 +14,12 @@ else
   echo "> Release ${release} exists"
 fi
 
-archive=`ls *.zip`
-[[ $(cat release.json | grep '"upload_url"') =~ https://.*/assets ]]
-upload_url="${BASH_REMATCH[0]}?name=${archive}"
-rm release.json
+for archive in *.zip; do 
+  [[ $(cat release.json | grep '"upload_url"') =~ https://.*/assets ]]
+  upload_url="${BASH_REMATCH[0]}?name=${archive}"
 
-echo "Uploading ${archive} to ${upload_url}"
-curl --fail --location --silent --show-error --header "${auth}" --header "${accept}" --header "Content-Type: application/zip" --request POST --data-binary "@${archive}" ${upload_url}
+  echo "Uploading ${archive} to ${upload_url}"
+  curl --fail --location --silent --show-error --header "${auth}" --header "${accept}" --header "Content-Type: application/zip" --request POST --data-binary "@${archive}" ${upload_url}
+done
+
+rm release.json