Miscellaneous attempts to fix Windows builds

This commit is contained in:
Peter Wagenet 2019-07-30 11:17:54 -07:00
parent 4a8e52cb56
commit 2ae54264c4
4 changed files with 20 additions and 7 deletions

View File

@ -9,17 +9,23 @@ environment:
RUST_BACKTRACE: 1
matrix:
# 32-bit
- RUBY_VERSION: 23
- RUBY_VERSION: 26
RUST_HOST: i686-pc-windows-msvc
RUST_VERSION: stable
MINGW64_PATH: C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32
MSYS_PATH: C:\MinGW\msys\1.0
# 64-bit
- RUBY_VERSION: 23-x64
- RUBY_VERSION: 26-x64
RUST_HOST: x86_64-pc-windows-msvc
RUST_VERSION: stable
MINGW64_PATH: C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64
MSYS_PATH: C:\msys64
# 64-bit
- RUBY_VERSION: 23-x64
- RUBY_VERSION: 26-x64
RUST_HOST: x86_64-pc-windows-msvc
RUST_VERSION: nightly
MINGW64_PATH: C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64
MSYS_PATH: C:\msys64
matrix:
allow_failures:
@ -29,7 +35,7 @@ matrix:
fast_finish: true
install:
- set PATH=C:\Ruby%RUBY_VERSION%\bin;C:\Ruby%RUBY_VERSION%\DevKit\bin;C:\Ruby%RUBY_VERSION%\DevKit\mingw\bin;%HOMEDRIVE%%HOMEPATH%\.cargo\bin;%APPVEYOR_BUILD_FOLDER%\ruby\windows_build;%PATH%
- set PATH=C:\Ruby%RUBY_VERSION%\bin;%MINGW64_PATH%\bin;%MSYS_PATH%\bin;%HOMEDRIVE%%HOMEPATH%\.cargo\bin;%APPVEYOR_BUILD_FOLDER%\ruby\windows_build;%PATH%
- echo %PATH%
- set HELIX_ROOT=%APPVEYOR_BUILD_FOLDER%
- IF NOT EXIST %HOMEDRIVE%%HOMEPATH%\.cargo\bin (curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain %RUST_VERSION% --default-host %RUST_HOST% -y)

View File

@ -82,3 +82,9 @@ hello
hello world
=> nil
```
## Local Windows Development
```
set PATH=c:\Ruby26-x64\msys64\usr\bin;c:\Ruby26-x64\msys64\mingw64\bin;PATH_TO_HELIX\ruby\windows_build;%PATH%
```

View File

@ -30,5 +30,5 @@ Gem::Specification.new do |spec|
spec.add_development_dependency "bundler", "~> 2.0"
spec.add_development_dependency "rspec", "~> 3.4"
spec.add_development_dependency "rake-compiler", "~> 0.9.7"
spec.add_development_dependency "rake-compiler", "~> 1.0.7"
end

View File

@ -1,7 +1,8 @@
require "mkmf"
root_dir = File.expand_path("../../../../../..", __FILE__)
require "mkmf"
require "#{root_dir}/lib/helix_runtime/version"
dir_config "dummy"
find_header "helix_runtime.h", "#{root_dir}/ext/helix_runtime/native"