From 2a101baf1d4158487ad08a3ed773bdbf335a3d55 Mon Sep 17 00:00:00 2001 From: Nikolay Volf Date: Thu, 16 Jun 2016 19:02:55 +0400 Subject: [PATCH] Appveyor config for windows build+installer (#1302) * appveyor * proper dist name * quote * win-build config * proper build section * tests in release * plugin dir * cache binaries * quotes * escaped quotes * forces user dir * fixes * syntax * proper cahce dir * quotes? * root nsis instead of bin * submodules init * artifact path fix * no submodule * raw link here * another way to force cargo cache * include vc++ 2015 redist * fix name of the dist * ETHCORE -> Ethcore --- appveyor.yml | 29 +++++++++++++++++++++++++++++ nsis/installer.nsi | 7 ++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 000000000..b980aba42 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,29 @@ +environment: + matrix: + - TARGET: x86_64-pc-windows-msvc +install: + - git submodule update --init --recursive + - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-1.9.0-x86_64-pc-windows-msvc.exe" + - ps: Start-FileDownload "https://github.com/ethcore/win-build/raw/master/SimpleFC.dll" -FileName nsis\SimpleFC.dll + - ps: Start-FileDownload "https://github.com/ethcore/win-build/raw/master/vc_redist.x64.exe" -FileName nsis\vc_redist.x64.exe + - rust-1.9.0-x86_64-pc-windows-msvc.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust" + - SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin;C:\Program Files (x86)\NSIS + - rustc -V + - cargo -V + +build: off + +test_script: + - cargo test --verbose --release + +after_test: + - cargo build --verbose --release + - makensis.exe nsis\installer.nsi + +artifacts: + - path: nsis\installer.exe + name: Windows Installer (x86_64) + +cache: + - target + - C:\users\appveyor\.cargo -> appveyor.yml diff --git a/nsis/installer.nsi b/nsis/installer.nsi index 10143306a..fffcc1dd9 100644 --- a/nsis/installer.nsi +++ b/nsis/installer.nsi @@ -1,11 +1,13 @@ !define APPNAME "Parity" -!define COMPANYNAME "ETHCORE" +!define COMPANYNAME "Ethcore" !define DESCRIPTION "Fast, light, robust Ethereum implementation" !define VERSIONMAJOR 1 !define VERSIONMINOR 2 !define VERSIONBUILD 0 +!addplugindir .\ + !define HELPURL "https://github.com/ethcore/parity/wiki" # "Support Information" link !define UPDATEURL "https://github.com/ethcore/parity/releases" # "Product Updates" link !define ABOUTURL "https://github.com/ethcore/parity" # "Publisher" link @@ -47,6 +49,9 @@ section "install" # Files added here should be removed by the uninstaller (see section "uninstall") file /oname=parity.exe ..\target\release\parity.exe file "logo.ico" + file vc_redist.x64.exe + + ExecWait '"$INSTDIR\vc_redist.x64.exe" /passive /norestart' # Add any other files for the install directory (license files, app data, etc) here # Uninstaller - See function un.onInit and section "uninstall" for configuration