From 80fcc5279cadf4d13a03efa443b919b5cbe01a53 Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Thu, 16 Apr 2015 11:00:10 -0700 Subject: [PATCH 1/4] Bump Rubies: 1.9.3-p551, 2.0.0-p645, 2.1.6, and add 2.2.2 --- bin/package_win32_fat_binary | 2 +- bin/prepare_xrubies | 17 ++++++++++++----- bootstrap.sh | 1 + 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/bin/package_win32_fat_binary b/bin/package_win32_fat_binary index 9ead80d..6aad6a3 100755 --- a/bin/package_win32_fat_binary +++ b/bin/package_win32_fat_binary @@ -13,7 +13,7 @@ cd '/vagrant' cd $1 base_version=${BASE_VERSION:-1.9.3} -cc_versions=${RUBY_CC_VERSION:-1.8.7:1.9.3:2.0.0:2.1.4} +cc_versions=${RUBY_CC_VERSION:-1.8.7:1.9.3:2.0.0:2.1.6:2.2.2} # Use Ruby 1.9.3 as base to cross-compile to different versions rvm use $base_version diff --git a/bin/prepare_xrubies b/bin/prepare_xrubies index 7319935..8df1fd8 100755 --- a/bin/prepare_xrubies +++ b/bin/prepare_xrubies @@ -24,22 +24,29 @@ rake-compiler cross-ruby VERSION=1.8.7-p374 HOST=i586-mingw32msvc # Build 1.9.3 using 1.9.3 as base rvm use 1.9.3 -rake-compiler cross-ruby VERSION=1.9.3-p550 HOST=i586-mingw32msvc +rake-compiler cross-ruby VERSION=1.9.3-p551 HOST=i586-mingw32msvc # Use all CPUs for building 2.0+ export MAKE="make -j$(nproc)" # Build Ruby 2.0.0 -rake-compiler cross-ruby VERSION=2.0.0-p594 HOST=i686-w64-mingw32 debugflags="-g" +rake-compiler cross-ruby VERSION=2.0.0-p645 HOST=i686-w64-mingw32 debugflags="-g" # Build x64 Ruby 2.0.0 -rake-compiler cross-ruby VERSION=2.0.0-p594 HOST=x86_64-w64-mingw32 debugflags="-g" +rake-compiler cross-ruby VERSION=2.0.0-p645 HOST=x86_64-w64-mingw32 debugflags="-g" # Build Ruby 2.1 -rake-compiler cross-ruby VERSION=2.1.4 HOST=i686-w64-mingw32 debugflags="-g" +rake-compiler cross-ruby VERSION=2.1.6 HOST=i686-w64-mingw32 debugflags="-g" # Build x64 Ruby 2.1 -rake-compiler cross-ruby VERSION=2.1.4 HOST=x86_64-w64-mingw32 debugflags="-g" +rake-compiler cross-ruby VERSION=2.1.6 HOST=x86_64-w64-mingw32 debugflags="-g" + +# Build Ruby 2.2 using 2.0.0 as base +rvm use 2.0.0 +rake-compiler cross-ruby VERSION=2.2.2 HOST=i686-w64-mingw32 debugflags="-g" + +# Build x64 Ruby 2.2 +rake-compiler cross-ruby VERSION=2.2.2 HOST=x86_64-w64-mingw32 debugflags="-g" # Mark installation prepared and don't run all this again touch "$HOME/.rake-compiler/.prepared" diff --git a/bootstrap.sh b/bootstrap.sh index bf64ec1..9c04ab7 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -78,6 +78,7 @@ $as_vagrant 'rvm install 1.8.7-p374' $as_vagrant 'rvm install 1.9.3' $as_vagrant 'rvm install 2.0.0' $as_vagrant 'rvm install 2.1' +$as_vagrant 'rvm install 2.2' # add /vagrant/bin to the PATH if ! grep -q "/vagrant/bin" $home/.bash_profile; then From 171dcd790adefd61af2d795365b3188361850bc8 Mon Sep 17 00:00:00 2001 From: aharpervc Date: Tue, 19 May 2015 13:58:55 -0400 Subject: [PATCH 2/4] Install bundler for system rubies - I can't see how bundler is installed, but it is required --- bin/prepare_xrubies | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/prepare_xrubies b/bin/prepare_xrubies index 7319935..1c7990a 100755 --- a/bin/prepare_xrubies +++ b/bin/prepare_xrubies @@ -12,8 +12,9 @@ fi # shared directory between VM and host cd '/vagrant' -# Install rake-compiler in all Rubies +# Install required gems in all system Rubies rvm all do gem install rake-compiler -v "~> 0.9.3" +rvm all do gem install bundler -v "~> 1.9.9" # Use just one CPU for building 1.8.7 and 1.9.3 export MAKE="make" From 90b481a461f0152f758d7c46f6b21bd82dcc7aa8 Mon Sep 17 00:00:00 2001 From: aharpervc Date: Wed, 20 May 2015 09:16:47 -0400 Subject: [PATCH 3/4] Update package_win32_fat_binary - remove 187 as a cross compile target - bump the base version to 2.0 --- bin/package_win32_fat_binary | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/package_win32_fat_binary b/bin/package_win32_fat_binary index 6aad6a3..4ad453a 100755 --- a/bin/package_win32_fat_binary +++ b/bin/package_win32_fat_binary @@ -12,8 +12,8 @@ cd '/vagrant' # passed in path of gem to be cross-compiled cd $1 -base_version=${BASE_VERSION:-1.9.3} -cc_versions=${RUBY_CC_VERSION:-1.8.7:1.9.3:2.0.0:2.1.6:2.2.2} +base_version=${BASE_VERSION:-2.0.0} +cc_versions=${RUBY_CC_VERSION:-1.9.3:2.0.0:2.1.6:2.2.2} # Use Ruby 1.9.3 as base to cross-compile to different versions rvm use $base_version From dd2c88f7c3a98f43249942c79b690f1811084683 Mon Sep 17 00:00:00 2001 From: aharpervc Date: Mon, 20 Jul 2015 12:44:03 -0400 Subject: [PATCH 4/4] Remove system ruby 1.8.7 - we shouldn't need it now that 1.8.7 isn't a cross compile target --- bin/prepare_xrubies | 6 +----- bootstrap.sh | 1 - sample_gem/Rakefile | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/bin/prepare_xrubies b/bin/prepare_xrubies index 4d845ab..5b70355 100755 --- a/bin/prepare_xrubies +++ b/bin/prepare_xrubies @@ -16,13 +16,9 @@ cd '/vagrant' rvm all do gem install rake-compiler -v "~> 0.9.5" rvm all do gem install bundler -v "~> 1.9.9" -# Use just one CPU for building 1.8.7 and 1.9.3 +# Use just one CPU for building 1.9.3 export MAKE="make" -# Build 1.8.7 with mingw32 compiler (GCC 4.2) -rvm use 1.8.7-p374 -rake-compiler cross-ruby VERSION=1.8.7-p374 HOST=i586-mingw32msvc - # Build 1.9.3 using 1.9.3 as base rvm use 1.9.3 rake-compiler cross-ruby VERSION=1.9.3-p551 HOST=i586-mingw32msvc diff --git a/bootstrap.sh b/bootstrap.sh index 9c04ab7..dc574a4 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -74,7 +74,6 @@ fi # install rubies $as_vagrant 'rvm install jruby' -$as_vagrant 'rvm install 1.8.7-p374' $as_vagrant 'rvm install 1.9.3' $as_vagrant 'rvm install 2.0.0' $as_vagrant 'rvm install 2.1' diff --git a/sample_gem/Rakefile b/sample_gem/Rakefile index 3f2913f..1d925d9 100644 --- a/sample_gem/Rakefile +++ b/sample_gem/Rakefile @@ -5,7 +5,6 @@ require "rake/clean" CLEAN.include( "tmp", - "lib/1.8", "lib/1.9", "lib/2.0", "lib/2.1",