copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Windows build

This commit is contained in:
Philipp Hörist 2018-02-11 23:45:16 +01:00
parent f47ea05b79
commit 9e26411bd6
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
appveyor.yml
View File

@ -1,6 +1,6 @@
environment: environment:
matrix: matrix:
- MSYS: C:/msys64/mingw32 - MSYSTEM: MINGW32
branches: branches:
only: only:
@ -11,10 +11,9 @@ clone_depth: 1
# init: # init:
# - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) # - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
install: build_script:
- C:\msys64\usr\bin\pacman -Syuu --needed --noconfirm --ask=127
- ps: | - ps: |
$env:MSYSTEM="MINGW32"
$env:TIME_STRING=(get-date -UFormat "%Y-%m-%d").ToString() $env:TIME_STRING=(get-date -UFormat "%Y-%m-%d").ToString()
$env:BUILDROOT="C:\msys64\home\appveyor\gajim\win\_build_root" $env:BUILDROOT="C:\msys64\home\appveyor\gajim\win\_build_root"
@ -23,14 +22,11 @@ install:
C:\msys64\usr\bin\sh.exe --login -c $command C:\msys64\usr\bin\sh.exe --login -c $command
} }
bash 'pacman -Sy --noconfirm git'
bash 'git clone C:/projects/gajim C:/msys64/home/appveyor/gajim' bash 'git clone C:/projects/gajim C:/msys64/home/appveyor/gajim'
bash 'C:/msys64/home/appveyor/gajim/win/build.sh' bash 'C:/msys64/home/appveyor/gajim/win/build.sh'
Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-Master-$($env:TIME_STRING).exe" Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-Master-$($env:TIME_STRING).exe"
Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-Master-$($env:TIME_STRING).exe" Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-Master-$($env:TIME_STRING).exe"
build: off
# on_finish: # on_finish:
# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

5
win/_base.sh
View File

@ -51,9 +51,8 @@ function build_compileall {
} }
function install_pre_deps { function install_pre_deps {
pacman -S --needed --noconfirm p7zip git \ pacman -S --needed --noconfirm p7zip \
mingw-w64-"${ARCH}"-nsis wget intltool mingw-w64-"${ARCH}"-toolchain \ mingw-w64-"${ARCH}"-nsis wget intltool mingw-w64-"${ARCH}"-toolchain
mingw-w64-i686-python3
} }
function create_root { function create_root {