Merge pull request #7 from zhm/upgrade-sources

Upgrade sources and fix compilation errors on ruby 2.2.1
zhm · Apr 9, 2015 · 81c6365 · 81c6365
2 parents a1cd42d + 607f364
commit 81c6365
Show file tree

Hide file tree

Showing 13 changed files with 3,027 additions and 1,307 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.1.5
+  - 2.2.1
 before_install:
   - sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable -y
   - sudo apt-get update

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,2 +1,8 @@
+## v1.0.0
+* Regenerated bindings using GDAL 1.10.1 sources and SWIG 3.0.5
+* Patch for ruby 2.2.1 (Thanks @aleksejleonov and @johnjohndoe) (Issue #5)
+* Fix symbol conflicts when requiring both `gdal-ruby/gdal` and `gdal-ruby/ogr` with `get_driver_by_name` and other functions (Issue #2)
+* Since the symbol conflicts are now fixed, `gdal`, `ogr`, `osr` and `gdalconst` are now `require`'d be default (Issue #2)
+
 ## v0.0.7
 * Fix for building on ruby versions where `$CXXFLAGS` isn't defined
diff --git a/ext/gdal-ruby/gdal/extconf.rb b/ext/gdal-ruby/gdal/extconf.rb
@@ -1,5 +1,8 @@
 require 'mkmf'
 
+# see https://github.com/zhm/gdal-ruby/issues/5
+require_relative '../ruby-2.2-patch'
+
 raise 'gdal-config not found.' if `which gdal-config`.empty?
 
 dir_config 'gdal',
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ rvm: @@
       - 1.9.2
       - 1.9.3
       - 2.1.5
+      - 2.2.1
     before_install:
       - sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable -y
       - sudo apt-get update
@@ Expand Down @@