Commit 2ff96ad7 authored by Philipp Hörist's avatar Philipp Hörist Committed by Philipp Hörist

Provide 64bit installer for Windows

parent ec78ce22
Pipeline #1225 passed with stages
in 1 minute and 54 seconds
environment:
matrix:
- MSYSTEM: MINGW64
MSYS_ARCH: "x86_64"
ARCH: "64bit"
- MSYSTEM: MINGW32
MSYS_ARCH: "i686"
ARCH: "32bit"
branches:
only:
......@@ -22,10 +28,10 @@ build_script:
C:\msys64\usr\bin\sh.exe --login -c $command
}
bash 'git clone C:/projects/gajim C:/msys64/home/appveyor/gajim'
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-Portable.exe" -FileName "Gajim-Portable-Master-$($env:TIME_STRING).exe"
bash "git clone C:/projects/gajim C:/msys64/home/appveyor/gajim"
bash "C:/msys64/home/appveyor/gajim/win/build.sh $($env:MSYS_ARCH)"
Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-Master-$($env:ARCH)-$($env:TIME_STRING).exe"
Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-Master-$($env:ARCH)-$($env:TIME_STRING).exe"
# on_finish:
# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
......
......@@ -11,8 +11,6 @@ DIR="$( cd "$( dirname "$0" )" && pwd )"
cd "${DIR}"
# CONFIG START
ARCH="i686"
PYTHON_VERSION="3"
BUILD_VERSION="0"
......@@ -25,15 +23,20 @@ MINGW="mingw32"
QL_VERSION="0.0.0"
QL_VERSION_DESC="UNKNOWN"
function set_arch {
ARCH="$1"
if [ "$1" == "x86_64" ]; then
MINGW="mingw64"
fi
}
function set_build_root {
BUILD_ROOT="$1"
BUILD_ROOT="${DIR}/_build_root"
REPO_CLONE="${BUILD_ROOT}/${MINGW}"/gajim
MINGW_ROOT="${BUILD_ROOT}/${MINGW}"
PACKAGE_DIR="${BUILD_ROOT}/${MINGW}/lib/python3.6/site-packages"
}
set_build_root "${DIR}/_build_root"
function build_pacman {
pacman --root "${BUILD_ROOT}" "$@"
}
......@@ -114,8 +117,6 @@ pillow==4.3.0
}
function install_gajim {
[ -z "$1" ] && (echo "Missing arg"; exit 1)
rm -Rf "${PACKAGE_DIR}"/gajim*
cd ..
......@@ -302,6 +303,6 @@ function move_ssl_libs {
}
function build_installer {
(cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" "${MISC}"/gajim.nsi)
(cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" "${MISC}"/gajim-portable.nsi)
(cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" -DARCH="${MINGW}" "${MISC}"/gajim.nsi)
(cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" -DARCH="${MINGW}" "${MISC}"/gajim-portable.nsi)
}
......@@ -10,12 +10,12 @@ DIR="$( cd "$( dirname "$0" )" && pwd )"
source "$DIR"/_base.sh
function main {
local GIT_TAG=${1:-"master"}
set_arch "$1"
set_build_root
install_pre_deps
create_root
install_deps
install_gajim "$GIT_TAG"
install_gajim
cleanup_install
move_ssl_libs
build_installer
......
......@@ -101,7 +101,7 @@ Section "Gajim" SecGajim
SectionIn RO
SetOutPath "$INSTDIR"
File /r "mingw32\*.*"
File /r "${ARCH}\*.*"
SetOutPath "$INSTDIR\bin"
CreateShortCut "$INSTDIR\Gajim-Portable.lnk" "$INSTDIR\bin\Gajim.exe" \
......
......@@ -146,12 +146,18 @@ LangString STR_Running ${LANG_HEBREW} "נראה שהתוכנית Gajim מורצ
Section "Gajim" SecGajim
SectionIn RO
Var /GLOBAL arch_name
StrCpy $arch_name "(64-Bit)"
StrCmp ${ARCH} "mingw64" cont
StrCpy $arch_name "(32-Bit)"
cont:
SetOutPath "$INSTDIR"
File /r "mingw32\*.*"
File /r "${ARCH}\*.*"
WriteRegStr HKCU "Software\Gajim" "" $INSTDIR
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim ${VERSION} $arch_name"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" "$INSTDIR\Uninstall.exe"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayIcon" "$INSTDIR\bin\Gajim.exe"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "${VERSION}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment