Skip to content

Commit

Permalink
Merge pull request #245 from pavpanchekha/patch-1
Browse files Browse the repository at this point in the history
`git-sync-deps` seems to no longer require or support Python 2
  • Loading branch information
HinTak committed Apr 30, 2024
2 parents 4faf14d + 8f56b0b commit 59f98a8
Showing 1 changed file with 10 additions and 12 deletions.
22 changes: 10 additions & 12 deletions docs/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ Linux

Prerequisites:

- Python 2.7 (build time only)
- Python 3 (build time only)
- GLIBC >= 2.17
- fontconfig >= 2.10.93
- OpenGL
Expand All @@ -89,14 +89,14 @@ or:
Set up ``PATH`` to the ``depot_tools``. build skia library. At this point,
``python`` executable should be python 2. Note the build tools require
relatively new glibc and python 2.7.
``python`` executable should be python 3. Note the build tools require
relatively new glibc and python 3.

.. code-block:: bash
export PATH="$PWD/depot_tools:$PATH"
cd skia
python2 tools/git-sync-deps
python tools/git-sync-deps
bin/gn gen out/Release --args='is_official_build=true skia_enable_tools=true skia_use_system_libjpeg_turbo=false skia_use_system_libwebp=false skia_use_system_libpng=false skia_use_system_icu=false skia_use_system_harfbuzz=false extra_cflags_cc=["-frtti"] extra_ldflags=["-lrt"]'
ninja -C out/Release skia skia.h
cd ..
Expand All @@ -116,22 +116,20 @@ macOS

Prerequisites:

- Python 2.7 (build time only)
- Xcode Command Line Tools

Set up ``PATH`` to the ``depot_tools``, and build skia library. At this point,
``python`` executable should be python 2.
Set up ``PATH`` to the ``depot_tools``, and build skia library.

.. code-block:: bash
export PATH="$PWD/depot_tools:$PATH"
cd skia
python2 tools/git-sync-deps
python3 tools/git-sync-deps
bin/gn gen out/Release --args='is_official_build=true skia_enable_tools=true skia_use_system_libjpeg_turbo=false skia_use_system_libwebp=false skia_use_system_libpng=false skia_use_system_icu=false skia_use_system_harfbuzz=false extra_cflags_cc=["-frtti"]'
ninja -C out/Release skia skia.h
cd ..
Then, build the skia python binding. At this point, ``python`` should be set to
Then, build the skia-python binding. Here, ``python`` should be set to
the desired version.

.. code-block:: bash
Expand All @@ -146,8 +144,8 @@ Windows

Prerequisites:

- Python 2.7 (build time only)
- Visual C++ version that supports C++14
- Python 3 (build time only)
- Visual C++ version that supports C++17

Windows binary can be built using the generic steps above.

Expand All @@ -156,7 +154,7 @@ Windows binary can be built using the generic steps above.
$env:Path += ";$pwd\depot_tools"
cd skia
python2 tools\git-sync-deps
python tools\git-sync-deps
bin\gn gen out\Release --args="is_official_build=true skia_enable_tools=true skia_use_system_libjpeg_turbo=false skia_use_system_libwebp=false skia_use_system_libpng=false skia_use_system_icu=false skia_use_system_harfbuzz=false skia_use_system_expat=false skia_use_system_zlib=false extra_cflags_cc=[\"/GR\", \"/EHsc\", \"/MD\"] target_cpu=\"x86_64\""
ninja -C out\Release skia skia.h
cd ..
Expand Down

0 comments on commit 59f98a8

Please sign in to comment.