Skip to content

Commit e9b704d

Browse files
committed
Update build scripts
1 parent ff0f7bd commit e9b704d

5 files changed

Lines changed: 28 additions & 32 deletions

File tree

.appveyor.yml

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,41 +22,36 @@
2222

2323
version: "{build}"
2424

25-
image:
26-
- Visual Studio 2015
27-
2825
environment:
2926
global:
30-
VCVARSALL: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat
31-
CC: gcc
27+
TOOLCHAIN: gcc
3228
matrix:
3329
- MRUBY_VERSION: 1.2.0
34-
COMPILER: C:\MinGW # MinGW 32-bit 5.3.0
30+
COMPILER: C:\MinGW
31+
- MRUBY_VERSION: 1.2.0
32+
COMPILER: C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0
33+
- MRUBY_VERSION: 1.2.0
34+
COMPILER: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1
35+
- MRUBY_VERSION: 1.3.0
36+
COMPILER: C:\MinGW
3537
- MRUBY_VERSION: 1.3.0
36-
COMPILER: C:\MinGW # MinGW 32-bit 5.3.0
38+
COMPILER: C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0
39+
- MRUBY_VERSION: 1.3.0
40+
COMPILER: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1
3741
- MRUBY_VERSION: head
38-
COMPILER: C:\MinGW # MinGW 32-bit 5.3.0
39-
CFLAGS: -m32
42+
COMPILER: C:\MinGW
4043
- MRUBY_VERSION: head
41-
COMPILER: C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0 # MinGW-w64 5.3.0
44+
COMPILER: C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0
4245
- MRUBY_VERSION: head
43-
COMPILER: C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1 # MinGW-w64 6.3.0
44-
- MRUBY_VERSION: 1.3.0
45-
COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC # Visual Studio 2015
46-
CC: visualcpp
46+
COMPILER: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1
4747

4848
matrix:
4949
allow_failures:
50-
- CC: visualcpp
51-
exclude:
52-
- CC: visualcpp
53-
- CFLAGS: -m32
50+
- MRUBY_VERSION: head
5451

5552
init:
56-
- CALL "%VCVARSALL%" amd64
57-
- SET PATH=%COMPILER%\bin;%PATH%
58-
- SET PATH=C:\Ruby23-x64\bin;%PATH%
59-
- SET PATH=C:\cygwin\bin;%PATH%
53+
- SET PATH=C:\Windows\system32;C:\Windows;C:\Program Files\Git\cmd;%PATH%
54+
- SET PATH=%COMPILER%\bin;C:\Ruby24-x64\bin;%PATH%;C:\cygwin\bin;
6055
- gcc --version
6156

6257
build_script:

.travis.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# MIT License
22
#
3-
# Copyright (c) 2017 Sebastian Katzer
3+
# Copyright (c) Sebastian Katzer 2017
44
#
55
# Permission is hereby granted, free of charge, to any person obtaining a copy
66
# of this software and associated documentation files (the "Software"), to deal
@@ -31,6 +31,13 @@ env:
3131
- MRUBY_VERSION=1.3.0
3232
- MRUBY_VERSION=head
3333

34+
matrix:
35+
allow_failures:
36+
- env: MRUBY_VERSION=head
37+
38+
before_script:
39+
- export TOOLCHAIN=$CC
40+
3441
script:
3542
- rake compile
3643
- rake test

README.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ MRuby::Gem::Specification.new('your-mrbgem') do |spec|
4444
end
4545
```
4646

47-
4847
## Implemented methods
4948

5049
### Process
@@ -105,7 +104,6 @@ end
105104
| #waitpid | o |
106105
| #waitpid2 | o |
107106

108-
109107
### Process::Status
110108

111109
- https://ruby-doc.org/core-2.4.1/Process/Status.html
@@ -129,7 +127,6 @@ end
129127
| #termsig | o |
130128
| #to_i | o |
131129
| #to_s | o |
132-
133130
134131
### Kernel
135132

@@ -147,7 +144,6 @@ end
147144
| #spawn | o |
148145
| #system | o |
149146

150-
151147
### Signal
152148

153149
- https://ruby-doc.org/core-2.4.1/Signal.html
@@ -158,7 +154,6 @@ end
158154
| ::list | o |
159155
| ::trap | | Implemented in [mruby-signal][mruby-signal]. |
160156

161-
162157
## Development
163158

164159
Clone the repo:
@@ -179,7 +174,6 @@ Run the tests:
179174
- $? may not work correctly on the platform where ``pid_t`` is not ``int`` or
180175
``MRB_INT_MAX`` is less than ``PID_MAX`` (or /proc/sys/kernel/pid_max).
181176

182-
183177
## License
184178

185179
Copyright (c) 2012 Internet Initiative Japan Inc.

build_config.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
# SOFTWARE.
2222

2323
MRuby::Build.new do |conf|
24-
toolchain ENV.fetch('CC', :gcc)
24+
toolchain ENV.fetch('TOOLCHAIN', :gcc)
2525

2626
conf.enable_debug
2727
conf.enable_test
2828

29-
conf.gem File.expand_path(File.dirname(__FILE__))
29+
conf.gem __dir__
3030
end

mrbgem.rake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ end
2727

2828
MRuby::Gem::Specification.new('mruby-process') do |spec|
2929
spec.license = 'MIT'
30-
spec.authors = 'mruby developers'
30+
spec.authors = 'Sebastián Katzer, appPlant GmbH'
3131

3232
spec.add_test_dependency 'mruby-print', core: 'mruby-print'
3333
spec.add_test_dependency 'mruby-env', mgem: 'mruby-env'

0 commit comments

Comments
 (0)