Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Corrected fat-binary support. Closes GH-6
- Namespace mysql_api component into mysql library path - Try search for {1.8, 1.9}/mysql_api inside mysql lib before directly - Removed RUBY_PLATFORM conditional.
- Loading branch information
1 parent
209a9ef
commit a06fc96
Showing
3 changed files
with
8 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -90,4 +90,4 @@ def default_mysql_config_path | |
end | ||
end | ||
|
||
create_makefile("mysql_api") | ||
create_makefile("mysql/mysql_api") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,9 @@ | ||
# support multiple ruby version (fat binaries under windows) | ||
begin | ||
require 'mysql_api' | ||
RUBY_VERSION =~ /(\d+.\d+)/ | ||
require "mysql/#{$1}/mysql_api" | ||
rescue LoadError | ||
if RUBY_PLATFORM =~ /mingw|mswin/ then | ||
RUBY_VERSION =~ /(\d+.\d+)/ | ||
require "#{$1}/mysql_api" | ||
end | ||
require 'mysql/mysql_api' | ||
end | ||
|
||
require 'mysql/version' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters