proj4rb 0.3.1 → 0.4.0

data/Rakefile

@@ -0,0 +1,72 @@
+#!/usr/bin/env ruby
+
+require "rubygems"
+require "rake/extensiontask"
+require "rake/testtask"
+require "rubygems/package_task"
+require "rdoc/task"
+require "yaml"
+
+# Read the spec file
+GEM_NAME = "proj4rb"
+SO_NAME = "proj4_ruby"
+spec = Gem::Specification.load("#{GEM_NAME}.gemspec")
+
+# Setup compile tasks
+Rake::ExtensionTask.new do |ext|
+  ext.gem_spec = spec
+  ext.name = SO_NAME
+  ext.ext_dir = "ext"
+  ext.lib_dir = "lib/#{RUBY_VERSION.sub(/\.\d$/, '')}"
+  ext.config_options << "--with-proj-dir=C:/MinGW/local"
+end
+
+# Setup generic gem
+Gem::PackageTask.new(spec) do |pkg|
+  pkg.package_dir = 'pkg'
+  pkg.need_tar    = false
+end
+
+# Setup Windows Gem
+if RUBY_PLATFORM.match(/win32|mingw32/)
+  binaries = (FileList['lib/**/*.so',
+                       'lib/**/*dll'])
+
+  # Windows specification
+  win_spec = spec.clone
+  win_spec.instance_variable_set(:@cache_file, nil)
+  win_spec.platform = Gem::Platform::CURRENT
+  win_spec.files += binaries.to_a
+
+  # Unset extensions
+  win_spec.extensions = nil
+
+  # Rake task to build the windows package
+  Gem::PackageTask.new(win_spec) do |pkg|
+    pkg.package_dir = 'pkg'
+    pkg.need_tar = false
+  end
+end
+
+# RDoc Task
+desc "Generate rdoc documentation"
+RDoc::Task.new("rdoc") do |rdoc|
+  rdoc.rdoc_dir = 'doc'
+  rdoc.title    = "Proj4rb"
+  # Show source inline with line numbers
+  rdoc.options << "--line-numbers"
+  # Make the readme file the start page for the generated html
+  rdoc.main = 'README.rdoc'
+  rdoc.rdoc_files.include('doc/*.rdoc',
+                          'ext/projrb.c',
+                          'README',
+                          'proj4rb.gemspec',
+                          'Changelog',
+                          'MIT-LICENSE')
+end
+
+# Test Task
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.verbose = true
+end

data/ext/Makefile

@@ -0,0 +1,212 @@
+
+SHELL = /bin/sh
+
+# V=0 quiet, V=1 verbose.  other values don't work.
+V = 0
+Q1 = $(V:1=)
+Q = $(Q1:0=@)
+ECHO1 = $(V:1=@:)
+ECHO = $(ECHO1:0=@echo)
+
+#### Start of system configuration section. ####
+
+srcdir = .
+topdir = /c/MinGW/local/ruby/include/ruby-1.9.1
+hdrdir = /c/MinGW/local/ruby/include/ruby-1.9.1
+arch_hdrdir = c:/MinGW/local/ruby/include/ruby-1.9.1/$(arch)
+VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
+
+DESTDIR = c:
+prefix = $(DESTDIR)/MinGW/local/ruby
+rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
+exec_prefix = $(prefix)
+vendorhdrdir = $(rubyhdrdir)/vendor_ruby
+sitehdrdir = $(rubyhdrdir)/site_ruby
+rubyhdrdir = $(includedir)/$(RUBY_BASE_NAME)-$(ruby_version)
+vendordir = $(rubylibprefix)/vendor_ruby
+sitedir = $(rubylibprefix)/site_ruby
+ridir = $(datarootdir)/$(RI_BASE_NAME)
+mandir = $(datarootdir)/man
+localedir = $(datarootdir)/locale
+libdir = $(exec_prefix)/lib
+psdir = $(docdir)
+pdfdir = $(docdir)
+dvidir = $(docdir)
+htmldir = $(docdir)
+infodir = $(datarootdir)/info
+docdir = $(datarootdir)/doc/$(PACKAGE)
+oldincludedir = $(DESTDIR)/usr/include
+includedir = $(prefix)/include
+localstatedir = $(prefix)/var
+sharedstatedir = $(prefix)/com
+sysconfdir = $(prefix)/etc
+datadir = $(datarootdir)
+datarootdir = $(prefix)/share
+libexecdir = $(exec_prefix)/libexec
+sbindir = $(exec_prefix)/sbin
+bindir = $(exec_prefix)/bin
+rubylibdir = $(rubylibprefix)/$(ruby_version)
+archdir = $(rubylibdir)/$(arch)
+sitelibdir = $(sitedir)/$(ruby_version)
+sitearchdir = $(sitelibdir)/$(sitearch)
+vendorlibdir = $(vendordir)/$(ruby_version)
+vendorarchdir = $(vendorlibdir)/$(sitearch)
+
+CC = gcc
+CXX = g++
+LIBRUBY = lib$(RUBY_SO_NAME).dll.a
+LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
+LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
+LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
+OUTFLAG = -o 
+COUTFLAG = -o 
+
+RUBY_EXTCONF_H = 
+cflags   =  $(optflags) $(debugflags) $(warnflags)
+optflags = -O3
+debugflags = -g
+warnflags = -Wall -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wimplicit-function-declaration
+CFLAGS   =  $(cflags) 
+INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
+DEFS     = 
+CPPFLAGS = -DHAVE_PROJ_API_H -Ic:/MinGW/local/include $(DEFS) $(cppflags)
+CXXFLAGS = $(CFLAGS) $(cxxflags)
+ldflags  = -L. -Lc:/MinGW/local/lib
+dldflags =  -Wl,--enable-auto-image-base,--enable-auto-import $(DEFFILE)
+ARCH_FLAG = 
+DLDFLAGS = $(ldflags) $(dldflags)
+LDSHARED = $(CC) -shared $(if $(filter-out -g -g0,$(debugflags)),,-s)
+LDSHAREDXX = $(CXX) -shared $(if $(filter-out -g -g0,$(debugflags)),,-s)
+AR = ar
+EXEEXT = .exe
+
+RUBY_BASE_NAME = ruby
+RUBY_INSTALL_NAME = ruby
+RUBY_SO_NAME = msvcrt-ruby191
+arch = i386-mingw32
+sitearch = i386-msvcrt
+ruby_version = 1.9.1
+ruby = c:/MinGW/local/ruby/bin/ruby
+RUBY = $(ruby)
+RM = rm -f
+RM_RF = $(RUBY) -run -e rm -- -rf
+RMDIRS = rmdir --ignore-fail-on-non-empty -p
+MAKEDIRS = /bin/mkdir -p
+INSTALL = /bin/install -c
+INSTALL_PROG = $(INSTALL) -m 0755
+INSTALL_DATA = $(INSTALL) -m 644
+COPY = cp
+
+#### End of system configuration section. ####
+
+preload = 
+
+libpath = . $(libdir)
+LIBPATH =  -L. -L$(libdir)
+DEFFILE = $(TARGET)-$(arch).def
+
+CLEANFILES = mkmf.log $(DEFFILE)
+DISTCLEANFILES = 
+DISTCLEANDIRS = 
+
+extout = 
+extout_prefix = 
+target_prefix = 
+LOCAL_LIBS = 
+LIBS = $(LIBRUBYARG_SHARED) -lproj  -lshell32 -lws2_32 -limagehlp  
+SRCS = projrb.c
+OBJS = projrb.o
+TARGET = proj4_ruby
+DLLIB = $(TARGET).so
+EXTSTATIC = 
+STATIC_LIB = 
+
+BINDIR        = $(bindir)
+RUBYCOMMONDIR = $(sitedir)$(target_prefix)
+RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
+RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+HDRDIR        = $(rubyhdrdir)/ruby$(target_prefix)
+ARCHHDRDIR    = $(rubyhdrdir)/$(arch)/ruby$(target_prefix)
+
+TARGET_SO     = $(DLLIB)
+CLEANLIBS     = $(TARGET).so 
+CLEANOBJS     = *.o  *.bak
+
+all:    $(DLLIB)
+static: $(STATIC_LIB)
+.PHONY: all install static install-so install-rb
+.PHONY: clean clean-so clean-rb
+
+clean-rb-default::
+clean-rb::
+clean-so::
+clean: clean-so clean-rb-default clean-rb
+		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
+
+distclean-rb-default::
+distclean-rb::
+distclean-so::
+distclean: clean distclean-so distclean-rb-default distclean-rb
+		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
+		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
+		@-$(RMDIRS) $(DISTCLEANDIRS) 2> /dev/null || true
+
+realclean: distclean
+install: install-so install-rb
+
+install-so: $(RUBYARCHDIR)
+install-so: $(RUBYARCHDIR)/$(DLLIB)
+$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
+	@-$(MAKEDIRS) $(@D)
+	$(INSTALL_PROG) $(DLLIB) $(@D)
+install-rb: pre-install-rb install-rb-default
+install-rb-default: pre-install-rb-default
+pre-install-rb: Makefile
+pre-install-rb-default: Makefile
+pre-install-rb-default:
+	$(ECHO) installing default proj4_ruby libraries
+$(RUBYARCHDIR):
+	$(Q) $(MAKEDIRS) $@
+
+site-install: site-install-so site-install-rb
+site-install-so: install-so
+site-install-rb: install-rb
+
+.SUFFIXES: .c .m .cc .mm .cxx .cpp .o
+
+.cc.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.mm.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.cxx.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.cpp.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.c.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
+
+.m.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
+
+$(DLLIB): $(DEFFILE) $(OBJS) Makefile
+	$(ECHO) linking shared-object $(DLLIB)
+	@-$(RM) $(@)
+	$(Q) $(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
+
+
+
+$(DEFFILE): 
+	$(ECHO) generating $(@)
+	$(Q) $(RUBY) -e "puts 'EXPORTS', '' + 'Init_$(TARGET)'.sub(/\..*\z/,'')"  > $@
+
+$(OBJS): $(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h $(arch_hdrdir)/ruby/config.h

data/ext/mkmf.log

@@ -0,0 +1,25 @@
+have_header: checking for proj_api.h... -------------------- no
+
+"gcc -o conftest -Ic:/MinGW/local/ruby/include/ruby-1.9.1/i386-mingw32 -Ic:/MinGW/local/ruby/include/ruby-1.9.1/ruby/backward -Ic:/MinGW/local/ruby/include/ruby-1.9.1 -I.     -O3 -g -Wall -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-long-long conftest.c  -L. -Lc:/MinGW/local/ruby/lib -L.      -lmsvcrt-ruby191-static  -lshell32 -lws2_32  "
+checked program was:
+/* begin */
+1: #include "ruby.h"
+2: 
+3: #include <winsock2.h>
+4: #include <windows.h>
+5: int main() {return 0;}
+/* end */
+
+"gcc -E -Ic:/MinGW/local/ruby/include/ruby-1.9.1/i386-mingw32 -Ic:/MinGW/local/ruby/include/ruby-1.9.1/ruby/backward -Ic:/MinGW/local/ruby/include/ruby-1.9.1 -I.     -O3 -g -Wall -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-long-long  conftest.c -o conftest.i"
+conftest.c:5:22: proj_api.h: No such file or directory
+checked program was:
+/* begin */
+1: #include "ruby.h"
+2: 
+3: #include <winsock2.h>
+4: #include <windows.h>
+5: #include <proj_api.h>
+/* end */
+
+--------------------
+

data/ext/projrb.c

@@ -73,7 +73,7 @@ static VALUE proj_error_message(VALUE self, VALUE rerrno) {
 static VALUE proj_initialize(VALUE self, VALUE params){
   _wrap_pj* wpj;
   VALUE proj_params = rb_funcall(cProjection, idParseInitParameters, 1, params);
-  int size = RARRAY(proj_params)->len;
+  int size = RARRAY_LEN(proj_params);
   char** c_params = (char **) malloc(size*sizeof(char *));
   int i;
 

metadata

@@ -1,29 +1,49 @@
 --- !ruby/object:Gem::Specification 
 name: proj4rb
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  hash: 15
+  prerelease: 
+  segments: 
+  - 0
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Guilhem Vellut
+- Jochen Topf
+- Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-12-24 00:00:00 -07:00
-default_executable: 
-dependencies: []
-
-description: "      Proj4rb is a ruby binding for the Proj.4 Carthographic Projection library, that supports conversions between a very large number of geographic coordinate systems and datums.\n"
-email: guilhem.vellut@gmail.com
+date: 2011-07-30 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rake-compiler
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
+description: "    Proj4rb is a ruby binding for the Proj.4 Carthographic Projection library, that supports conversions between a very large number of geographic coordinate systems and datumspec.\n"
+email: 
 executables: []
 
 extensions: 
 - ext/extconf.rb
-extra_rdoc_files: 
-- README
+extra_rdoc_files: []
+
 files: 
-- rakefile.rb
-- README
+- Rakefile
+- README.rdoc
 - MIT-LICENSE
 - data/conus
 - data/epsg
@@ -57,37 +77,55 @@ files:
 - example/list-units.rb
 - example/version.rb
 - ext/extconf.rb
+- ext/Makefile
+- ext/mkmf.log
 - ext/projrb.c
-- ext/mingw/rakefile.rb
 - ext/vc/proj4_ruby.sln
 - ext/vc/proj4_ruby.vcproj
 - lib/proj4.rb
-has_rdoc: true
+- test/test_constants.rb
+- test/test_create_projection.rb
+- test/test_datums.rb
+- test/test_ellipsoids.rb
+- test/test_errors.rb
+- test/test_init_projection.rb
+- test/test_prime_meridians.rb
+- test/test_projection_type.rb
+- test/test_simple_projection.rb
+- test/test_transform.rb
+- test/test_units.rb
 homepage: http://proj4rb.rubyforge.org/
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --main
-- README
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.8.4
-  version: 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: 
 - Proj.4 C library
 rubyforge_project: proj4rb
-rubygems_version: 1.3.5
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Ruby bindings for the Proj.4 Carthographic Projection library

data/ext/mingw/rakefile.rb

@@ -1,38 +0,0 @@
-# We can't use Ruby's standard build procedures
-# on Windows because the Ruby executable is
-# built with VC++ while here we want to build
-# with MingW.  So just roll our own...
-
-require 'rake/clean'
-require 'rbconfig'
-
-RUBY_INCLUDE_DIR = Config::CONFIG["archdir"]
-RUBY_BIN_DIR = Config::CONFIG["bindir"]
-RUBY_LIB_DIR = Config::CONFIG["libdir"]
-RUBY_SHARED_LIB = Config::CONFIG["LIBRUBY"]
-RUBY_SHARED_DLL = RUBY_SHARED_LIB.gsub(/lib$/, 'dll')
-
-EXTENSION_NAME = "proj4_ruby.#{Config::CONFIG["DLEXT"]}"
-    
-CLEAN.include('*.o')
-CLOBBER.include(EXTENSION_NAME)
-
-task :default => "projrb"
-
-SRC = FileList['../*.c']
-OBJ = SRC.collect do |file_name|
-  File.basename(file_name).ext('o')
-end
-
-SRC.each do |srcfile|
-  objfile = File.basename(srcfile).ext('o')
-  file objfile => srcfile do
-    command = "gcc -c -fPIC -O2 -Wall -mms-bitfields -o #{objfile} #{srcfile} -I#{RUBY_INCLUDE_DIR} -I/local/include"
-    sh "sh -c '#{command}'" 
-  end
-end
-
-file "projrb" => OBJ do
-  command = "gcc -shared -o #{EXTENSION_NAME} #{OBJ} -lproj #{RUBY_BIN_DIR}/#{RUBY_SHARED_DLL} -L/local/lib" 
-  sh "sh -c '#{command}'" 
-end

data/rakefile.rb

@@ -1,130 +0,0 @@
-require 'rubygems'
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
-require 'rake/clean'
-require 'date'
-require 'ftools'
-
-CLOBBER.include('pkg/*', 'proj4rb-doc/**/*', 'lib/*.so', 'lib/*.bundle', 'lib/*.dll', 'ext/*.o', 'ext/*.so', 'ext/*.bundle', 'ext/*.dll', 'ext/Makefile', 'ext/mkmf.log')
-
-desc "Create Makefile"
-file 'ext/Makefile' => ['ext/extconf.rb'] do
-    sh 'cd ext; ruby extconf.rb'
-end
-
-desc "Build from C library"
-task :build => ['ext/Makefile', 'ext/projrb.c'] do
-    sh 'cd ext; make'
-end
-
-# ------- Default Package ----------
-FILES = FileList[
-  'rakefile.rb',
-  'README',
-  'MIT-LICENSE',
-  'data/**/*',
-  'doc/**/*',
-  'example/**/*',
-  'ext/*',
-  'ext/mingw/rakefile.rb',
-  'ext/vc/*.sln',
-  'ext/vc/*.vcproj',
-  'lib/**/*.rb'
-]
-
-# Default GEM Specification
-default_spec = Gem::Specification::new do |s|
-    s.name = 'proj4rb'
-    s.version = "0.3.1"
-    s.summary = "Ruby bindings for the Proj.4 Carthographic Projection library"
-    s.description = <<-EOF
-      Proj4rb is a ruby binding for the Proj.4 Carthographic Projection library, that supports conversions between a very large number of geographic coordinate systems and datums.
-    EOF
-    s.author = 'Guilhem Vellut'
-    s.email = 'guilhem.vellut@gmail.com'
-    s.homepage = 'http://proj4rb.rubyforge.org/'
-    s.rubyforge_project = 'proj4rb'
-    s.required_ruby_version = '>= 1.8.4'
-    s.date = DateTime.now
-    
-    s.platform = Gem::Platform::RUBY
-    s.requirements << 'Proj.4 C library'
-    s.require_path = 'lib'
-    s.extensions = ["ext/extconf.rb"]
-    s.files = FILES.to_a
-    s.test_files = FileList['test/test*.rb']
-    
-    s.has_rdoc = true
-    s.extra_rdoc_files = ["README"]
-    s.rdoc_options.concat ['--main',  'README']
-end
-
-desc "Package the library as a gem"
-Rake::GemPackageTask.new(default_spec) do |pkg|
-#    pkg.need_zip = true
-    pkg.need_tar = true
-end
-
-
-# ------- Windows Package ----------
-binaries = (FileList['ext/mingw/*.so',
-                     'ext/mingw/*.dll*'])
-
-win_spec = default_spec.clone
-win_spec.extensions = []
-win_spec.platform = Gem::Platform::CURRENT
-win_spec.files += binaries.map {|binaryname| "lib/#{File.basename(binaryname)}"}
-
-desc "Create Windows Gem"
-task :create_win32_gem do
-  # Copy the win32 extension built by MingW - easier to install
-  # since there are no dependencies of msvcr80.dll
-  current_dir = File.expand_path(File.dirname(__FILE__))
-
-  binaries.each do |binaryname|
-    target = File.join(current_dir, 'lib', File.basename(binaryname))
-    cp(binaryname, target)
-  end
-  
-  # Create the gem, then move it to admin/pkg
-  Gem::Builder.new(win_spec).build
-  gem_file = "#{win_spec.name}-#{win_spec.version}-#{win_spec.platform}.gem"
-  mv(gem_file, "pkg/#{gem_file}")
-
-  # Remove win extension from top level directory  
-  binaries.each do |binaryname|
-    target = File.join(current_dir, 'lib', File.basename(binaryname))
-    rm(target)
-  end
-end
-
-
-# ---------  Test Task ---------
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.libs << "lib"
-end
-
-# ---------  RDoc Documentation ---------
-desc "Generate rdoc documentation"
-Rake::RDocTask.new("rdoc") do |rdoc|
-  rdoc.rdoc_dir = 'doc/rdoc'
-  rdoc.title    = "Proj4rb Documentation"
-  # Show source inline with line numbers
-  rdoc.options << "--inline-source" << "--line-numbers"
-  # Make the readme file the start page for the generated html
-  rdoc.options << '--main' << 'README'
-  rdoc.rdoc_files.include('doc/*.rdoc',
-                          'ext/**/*.c',
-                          'lib/**/*.rb',
-                          'README',
-                          'MIT-LICENSE')
-end
-
-task :default => :package
-
-if RUBY_PLATFORM.match(/win32/)
-  task :package => :create_win32_gem
-end