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

Commits:

2 changed files:

Changes:

  • win/README.md
    1 1 
     # Windows Installer
    2 2
    3 
    -We use [msys2](http://www.msys2.org/) for creating the Windows installer
    3 
    +We use [msys2](https://www.msys2.org/) for creating the Windows installer
    4 4 
     and development on Windows.
    5 5
    6 6
    7 
    -### Development
    8 
    ------------
    7 
    +## Development
    9 8
    10 
    -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!**)
    9 
    +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!**)
    11 10
    12 11 
     * Fork the master branch on dev.gajim.org
    13 
    -* Execute ``C:\msys64\msys2_shell.cmd -mingw64``
    14 
    -* Run ``pacman -S git`` to install git
    15 
    -* Run ``git clone https://dev.gajim.org/USERNAME/gajim.git``
    16 
    -* Run ``cd gajim/win`` to end up where this README exists.
    17 
    -* Execute ``./dev_env.sh`` to install all the needed dependencies.
    18 
    -* Now go to the git root dir ``cd ..``
    19 
    -* Launch Gajim ``./launch.py``
    12 
    +* Execute `C:\msys64\msys2_shell.cmd -mingw64`
    13 
    +* Run `pacman -S git` to install git
    14 
    +* Run `git clone https://dev.gajim.org/USERNAME/gajim.git`
    15 
    +* Run `cd gajim/win` to end up where this README exists.
    16 
    +* Execute `./dev_env.sh` to install all the needed dependencies.
    17 
    +* Now go to the git root dir `cd ..`
    18 
    +* Launch Gajim `./launch.py`
    20 19
    21 20
    22 
    -### Build Gajim / Creating an Installer
    23 
    ----------------------
    21 
    +## Build Gajim / Create an Installer
    24 22
    25 
    -Follow the steps in the Development section, but instead of ``./dev_env.sh`` execute ``./build.sh``.
    26 
    -
    27 
    -You can supply a git tag ``./build.sh [git-tag]``.
    28 
    -
    29 
    -Or dont supply it, then current HEAD is build.
    23 
    +Follow the steps in the Development section, but instead of `./dev_env.sh` execute `./build.sh i686` or `./build.sh x86_64`.
    30 24
    31 25 
     Both the installer and the portable installer should appear in ``C:\msys64\home\USER\gajim\win\_build_root``.
    32 26

  • win/_base.sh
    ... ... @@ -72,12 +72,6 @@ function create_root {
    72 72 
         build_pacman --noconfirm -S base
    73 73 
     }
    74 74
    75 
    -function download_install_dep () {
    76 
    -    curl -o "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-"$1"-any.pkg.tar.xz \
    77 
    -    http://repo.msys2.org/mingw/"${ARCH}"/mingw-w64-"${ARCH}"-"$1"-any.pkg.tar.xz
    78 
    -    build_pacman --noconfirm -U "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-"$1"-any.pkg.tar.xz
    79 
    -}
    80 
    -
    81 75 
     function install_deps {
    82 76 
         build_pacman --noconfirm -S mingw-w64-"${ARCH}"-"${PYTHON_ID}" \
    83 77 
             mingw-w64-"${ARCH}"-"${PYTHON_ID}"-gobject \

    • —
    View it on GitLab.
    You're receiving this email because of your account on dev.gajim.org. If you'd like to receive fewer emails, you can adjust your notification settings.