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

Fix MSYS2 Package Names #296

Merged
merged 1 commit into from
Apr 11, 2020
Merged

Fix MSYS2 Package Names #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,11 @@ To setup a development environment in Windows:
1) Run ``C:\msys64\mingw64.exe`` - a terminal window should pop up
```bash
$ pacman -Suy
$ pacman -S git mingw-w64-x86-64-gcc mingw-w64-x86-64-gtk3 \
mingw-w64-x86-64-pkg-config mingw-w64-x86-64-cairo \
mingw-w64-x86-64-gobject-introspection mingw-w64-x86-64-python3 \
mingw-w64-x86-64-python3-gobject mingw-w64-x86-64-python3-cairo \
mingw-w64-x86-64-python3-pip mingw-w64-x86-64-python3-setuptools
$ pacman -S git mingw-w64-x86_64-gcc mingw-w64-x86_64-gtk3 \
mingw-w64-x86_64-pkg-config mingw-w64-x86_64-cairo \
mingw-w64-x86_64-gobject-introspection mingw-w64-x86_64-python \
mingw-w64-x86_64-python-gobject mingw-w64-x86_64-python-cairo \
mingw-w64-x86_64-python-pip
```

Ensure `/mingw64/bin` is added to your `PATH`:
Expand Down
12 changes: 5 additions & 7 deletions docs/windows.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,11 @@ To setup a development environment in Windows:
1) Run ``C:\msys64\mingw64.exe`` - a terminal window should pop up
```bash
$ pacman -Suy
$ pacman -S git mingw-w64-x86-64-gcc mingw-w64-x86-64-gtk3 \
mingw-w64-x86-64-pkg-config mingw-w64-x86-64-cairo \
mingw-w64-x86-64-gobject-introspection mingw-w64-x86-64-python3 \
mingw-w64-x86-64-python3-importlib-metadata mingw-w64-x86-64-python3-gobject \
mingw-w64-x86-64-python3-cairo mingw-w64-x86-64-python3-pip \
mingw-w64-x86-64-python3-setuptools mingw-w64-x86-64-python3-zope.interface \
mingw-w64-x86-64-python3-coverage mingw-w64-x86-64-python3-pytest
$ pacman -S git mingw-w64-x86_64-gcc mingw-w64-x86_64-gtk3 \
mingw-w64-x86_64-pkg-config mingw-w64-x86_64-cairo \
mingw-w64-x86_64-gobject-introspection mingw-w64-x86_64-python \
mingw-w64-x86_64-python-gobject mingw-w64-x86_64-python-cairo \
mingw-w64-x86_64-python-pip
```

[Clone the
Expand Down
9 changes: 4 additions & 5 deletions win-installer/msys2-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,10 @@ pacman --noconfirm -S --needed \
mingw-w64-"$MSYS2_ARCH"-pkg-config \
mingw-w64-"$MSYS2_ARCH"-cairo \
mingw-w64-"$MSYS2_ARCH"-gobject-introspection \
mingw-w64-"$MSYS2_ARCH"-python3 \
mingw-w64-"$MSYS2_ARCH"-python3-gobject \
mingw-w64-"$MSYS2_ARCH"-python3-cairo \
mingw-w64-"$MSYS2_ARCH"-python3-pip \
mingw-w64-"$MSYS2_ARCH"-python3-setuptools
mingw-w64-"$MSYS2_ARCH"-python \
mingw-w64-"$MSYS2_ARCH"-python-gobject \
mingw-w64-"$MSYS2_ARCH"-python-cairo \
mingw-w64-"$MSYS2_ARCH"-python-pip \

source "$DIR"/../venv
pip install pyinstaller
Expand Down