Philipp Hörist pushed to branch master at gajim / gajim

Commits: 229d84f3 by André Apitzsch at 2020-11-07T14:54:54+01:00 Windows: Remove unused function from build script

- - - - - 9d949958 by André Apitzsch at 2020-11-07T15:01:03+01:00 Windows: Fix build instructions

- - - - - 26a8b374 by André Apitzsch at 2020-11-07T15:07:36+01:00 Windows: Clean up build instructions

- - - - -

2 changed files:

- win/README.md - win/_base.sh

Changes:

===================================== win/README.md ===================================== @@ -1,32 +1,26 @@ # Windows Installer

-We use [msys2](http://www.msys2.org/) for creating the Windows installer +We use [msys2](https://www.msys2.org/) for creating the Windows installer and development on Windows.

-### Development ------------ +## Development

-Download [msys2](http://www.msys2.org/) (msys2-x86_64-xxx.exe) and follow the install instructions on the [msys2](http://www.msys2.org/) startpage (**Important!**) +Download [msys2](https://www.msys2.org/) (msys2-x86_64-xxx.exe) and follow the install instructions on the [msys2](https://www.msys2.org/) startpage (**Important!**)

* Fork the master branch on dev.gajim.org -* Execute ``C:\msys64\msys2_shell.cmd -mingw64`` -* Run ``pacman -S git`` to install git -* Run ``git clone https://dev.gajim.org/USERNAME/gajim.git%60%60 -* Run ``cd gajim/win`` to end up where this README exists. -* Execute ``./dev_env.sh`` to install all the needed dependencies. -* Now go to the git root dir ``cd ..`` -* Launch Gajim ``./launch.py`` +* Execute `C:\msys64\msys2_shell.cmd -mingw64` +* Run `pacman -S git` to install git +* Run `git clone https://dev.gajim.org/USERNAME/gajim.git%60 +* Run `cd gajim/win` to end up where this README exists. +* Execute `./dev_env.sh` to install all the needed dependencies. +* Now go to the git root dir `cd ..` +* Launch Gajim `./launch.py`

-### Build Gajim / Creating an Installer ---------------------- +## Build Gajim / Create an Installer

-Follow the steps in the Development section, but instead of ``./dev_env.sh`` execute ``./build.sh``. - -You can supply a git tag ``./build.sh [git-tag]``. - -Or dont supply it, then current HEAD is build. +Follow the steps in the Development section, but instead of `./dev_env.sh` execute `./build.sh i686` or `./build.sh x86_64`.

Both the installer and the portable installer should appear in ``C:\msys64\home\USER\gajim\win_build_root``.

===================================== win/_base.sh ===================================== @@ -72,12 +72,6 @@ function create_root { build_pacman --noconfirm -S base }

-function download_install_dep () { - curl -o "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-"$1"-any.pkg.tar.xz \ - http://repo.msys2.org/mingw/%22$%7BARCH%7D%22/mingw-w64-%22$%7BARCH%7D%22-%2... - build_pacman --noconfirm -U "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-"$1"-any.pkg.tar.xz -} - function install_deps { build_pacman --noconfirm -S mingw-w64-"${ARCH}"-"${PYTHON_ID}" \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-gobject \

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9980d079dc1e25757ff2f4ed293c7b53...