Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

git-sync-deps seems to no longer require or support Python 2 #245

Merged
merged 3 commits into from
Apr 30, 2024
Merged

git-sync-deps seems to no longer require or support Python 2 #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
547075f
`git-sync-deps` seems to no longer require or support Python 2
pavpanchekha Apr 29, 2024
1de2357
Update install.rst
HinTak Apr 30, 2024
8f56b0b
Bump pypa/cibuildwheel up to v2.16.5 to fix intermitent windows build…
HinTak Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ jobs:
platforms: ${{ matrix.arch }}

- name: Build wheels
uses: pypa/[email protected].2
uses: pypa/[email protected].5
env:
CIBW_BUILD: "${{ matrix.cp }}-*"
CIBW_SKIP: "*musllinux*"
Expand Down
22 changes: 10 additions & 12 deletions docs/install.rst
View file
Open in desktop
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
Loading