Skip to content

Commit

Permalink
build_env: Automatically get the jhbuild Python site_packages path.
Browse files Browse the repository at this point in the history
So that it doesn't need to be manually updated in the shell
script. If the Python version or path changes this should still
provide the right site_packages path.
  • Loading branch information
carlosperate committed Jan 25, 2023
1 parent 04955f8 commit 8972971
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Check System
run: |
Expand Down
6 changes: 4 additions & 2 deletions osx/build_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,12 @@ export PKG_CONFIG_PATH=$HOME/gtk/inst/lib/pkgconfig:$HOME/gtk/inst/share/pkgconf
export XDG_DATA_DIRS=$HOME/gtk/inst/share
jhbuild buildone libffi python3 libxml2
(cd $HOME/gtk/inst/bin && touch itstool && chmod +x itstool)
/usr/local/bin/pip3 install six pygments --target ~/gtk/inst/lib/python3.9/site-packages

PY_SITE_PACKAGES=$(~/gtk/inst/bin/python3 -c 'import site; print(site.getsitepackages()[0], end="")')
/usr/local/bin/pip3 install six pygments --target $PY_SITE_PACKAGES

PYTHON=$HOME/gtk/inst/bin/python3 jhbuild build --nodeps --ignore-suggests #-s freetype-no-harfbuzz
/usr/local/bin/pip3 install pyobjc-core pyobjc-framework-Cocoa py2app --target ~/gtk/inst/lib/python3.9/site-packages
/usr/local/bin/pip3 install pyobjc-core pyobjc-framework-Cocoa py2app --target $PY_SITE_PACKAGES

# (cd $HOME/gtk/inst/lib && ln -s libpython3.6m.dylib libpython3.6.dylib)
# (cd $HOME/Source/ && ([ -d Mojave-gtk-theme ] || git clone https://github.com/vinceliuice/Mojave-gtk-theme.git))
Expand Down

0 comments on commit 8972971

Please sign in to comment.