proj4rb 0.4.1 → 0.4.2

data/ext/Makefile

@@ -2,49 +2,44 @@
 SHELL = /bin/sh
 
 # V=0 quiet, V=1 verbose.  other values don't work.
-V = 0
+V = 1
 Q1 = $(V:1=)
 Q = $(Q1:0=@)
-ECHO1 = $(V:1=@:)
+n=$(NULLCMD)
+ECHO1 = $(V:1=@echo)
 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
+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:
+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
+rubylibprefix = $(prefix)/lib/$(RUBY_BASE_NAME)
+bindir = $(exec_prefix)/bin
+sbindir = $(exec_prefix)/sbin
+libexecdir = $(exec_prefix)/libexec
+datadir = $(prefix)/share
+sysconfdir = $(prefix)/etc
+sharedstatedir = $(DESTDIR)/etc
+localstatedir = $(DESTDIR)/var
 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
+oldincludedir = $(DESTDIR)/usr/include
+infodir = $(datadir)/info
+mandir = $(datadir)/man
+ridir = $(datadir)/ri
+docdir = $(datadir)/doc/$(RUBY_BASE_NAME)
+sitedir = $(rubylibprefix)/site_ruby
+vendordir = $(rubylibprefix)/vendor_ruby
+rubyhdrdir = $(includedir)/$(RUBY_BASE_NAME)-$(ruby_version)
+sitehdrdir = $(rubyhdrdir)/site_ruby
+vendorhdrdir = $(rubyhdrdir)/vendor_ruby
 rubylibdir = $(rubylibprefix)/$(ruby_version)
 archdir = $(rubylibdir)/$(arch)
 sitelibdir = $(sitedir)/$(ruby_version)
@@ -52,70 +47,72 @@ 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 
+NULLCMD = 
+
+CC = cl -nologo
+CXX = $(CC)
+LIBRUBY = $(RUBY_SO_NAME).lib
+LIBRUBY_A = $(RUBY_SO_NAME)-static.lib
+LIBRUBYARG_SHARED = $(LIBRUBY)
+LIBRUBYARG_STATIC = $(LIBRUBY_A)
+OUTFLAG = -Fe
+COUTFLAG = -Fo
 
 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) 
+cflags   = 
+optflags = 
+debugflags = 
+warnflags = 
+CFLAGS   =  -MD -Zi -W2 -wd4996 -we4028 -we4142 -O2sy-  -Zm600 
 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)
+CPPFLAGS = -DHAVE_PROJ_API_H   
+CXXFLAGS = $(CFLAGS) -MD -Zi -W2 -wd4996 -we4028 -we4142 -O2sy-  -Zm600
+ldflags  = -incremental:no -debug -opt:ref -opt:icf
+dldflags = -incremental:no -debug -opt:ref -opt:icf -dll $(LIBPATH)
 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
+LDSHARED = cl -nologo -LD
+LDSHAREDXX = $(LDSHARED)
+AR = lib -nologo
 EXEEXT = .exe
 
 RUBY_BASE_NAME = ruby
 RUBY_INSTALL_NAME = ruby
-RUBY_SO_NAME = msvcrt-ruby191
-arch = i386-mingw32
-sitearch = i386-msvcrt
+RUBY_SO_NAME = msvcr100-ruby191
+arch = i386-mswin32_100
+sitearch = i386-msvcr100
 ruby_version = 1.9.1
-ruby = c:/MinGW/local/ruby/bin/ruby
-RUBY = $(ruby)
-RM = rm -f
+ruby = C:/MinGW/local/ruby/bin/ruby
+RUBY = $(ruby:/=\)
+RM = $(RUBY) -run -e 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
+RMDIRS = $(RUBY) -run -e rmdir -- -p
+MAKEDIRS = @$(RUBY) -run -e mkdir -- -p
+INSTALL = @$(RUBY) -run -e install -- -vp
 INSTALL_PROG = $(INSTALL) -m 0755
-INSTALL_DATA = $(INSTALL) -m 644
-COPY = cp
+INSTALL_DATA = $(INSTALL) -m 0644
+COPY = @$(RUBY) -run -e cp -- -v
 
 #### End of system configuration section. ####
 
 preload = 
 
 libpath = . $(libdir)
-LIBPATH =  -L. -L$(libdir)
+LIBPATH =  -libpath:. -libpath:$(libdir)
 DEFFILE = $(TARGET)-$(arch).def
 
 CLEANFILES = mkmf.log $(DEFFILE)
-DISTCLEANFILES = 
+DISTCLEANFILES = vc*.pdb
 DISTCLEANDIRS = 
 
 extout = 
 extout_prefix = 
 target_prefix = 
 LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED) -lproj  -lshell32 -lws2_32 -limagehlp  
+LIBS = $(LIBRUBYARG_SHARED) libproj.lib  unicows.lib oldnames.lib user32.lib advapi32.lib shell32.lib ws2_32.lib imagehlp.lib  
 SRCS = projrb.c
-OBJS = projrb.o
+OBJS = projrb.obj
 TARGET = proj4_ruby
 DLLIB = $(TARGET).so
 EXTSTATIC = 
@@ -130,7 +127,7 @@ ARCHHDRDIR    = $(rubyhdrdir)/$(arch)/ruby$(target_prefix)
 
 TARGET_SO     = $(DLLIB)
 CLEANLIBS     = $(TARGET).so 
-CLEANOBJS     = *.o  *.bak
+CLEANOBJS     = *.obj $(TARGET)-$(arch).exp $(TARGET)-$(arch).lib $(TARGET)-$(arch).pdb *.bak
 
 all:    $(DLLIB)
 static: $(STATIC_LIB)
@@ -141,15 +138,15 @@ clean-rb-default::
 clean-rb::
 clean-so::
 clean: clean-so clean-rb-default clean-rb
-		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
+		@-$(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
+		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES:/=\)
+		@-$(RMDIRS) $(DISTCLEANDIRS:/=\)
 
 realclean: distclean
 install: install-so install-rb
@@ -157,8 +154,8 @@ install: install-so install-rb
 install-so: $(RUBYARCHDIR)
 install-so: $(RUBYARCHDIR)/$(DLLIB)
 $(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
-	@-$(MAKEDIRS) $(@D)
-	$(INSTALL_PROG) $(DLLIB) $(@D)
+	@-$(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
@@ -172,41 +169,116 @@ 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
+.SUFFIXES: .c .m .cc .mm .cxx .cpp .obj
+
+{$(hdrdir)}.cc.obj:
+	$(ECHO) compiling $(<:\=/)
+	$(Q) $(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tp$(<:\=/)
+
+{$(topdir)}.cc.obj:
+	$(ECHO) compiling $(<:\=/)
+	$(Q) $(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tp$(<:\=/)
+
+{$(srcdir)}.cc.obj:
+	$(ECHO) compiling $(<:\=/)
+	$(Q) $(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tp$(<:\=/)
+
+.cc.obj:
+	$(ECHO) compiling $(<:\=/)
+	$(Q) $(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tp$(<:\=/)
+
+{$(hdrdir)}.mm.obj:
+	$(ECHO) compiling $(<:\=/)
+	$(Q) $(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tp$(<:\=/)
+
+{$(topdir)}.mm.obj:
+	$(ECHO) compiling $(<:\=/)
+	$(Q) $(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tp$(<:\=/)
+
+{$(srcdir)}.mm.obj:
+	$(ECHO) compiling $(<:\=/)
+	$(Q) $(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tp$(<:\=/)
+
+.mm.obj:
+	$(ECHO) compiling $(<:\=/)
+	$(Q) $(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tp$(<:\=/)
+
+{$(hdrdir)}.cxx.obj:
+	$(ECHO) compiling $(<:\=/)
+	$(Q) $(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tp$(<:\=/)
+
+{$(topdir)}.cxx.obj:
+	$(ECHO) compiling $(<:\=/)
+	$(Q) $(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tp$(<:\=/)
+
+{$(srcdir)}.cxx.obj:
+	$(ECHO) compiling $(<:\=/)
+	$(Q) $(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tp$(<:\=/)
+
+.cxx.obj:
+	$(ECHO) compiling $(<:\=/)
+	$(Q) $(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tp$(<:\=/)
+
+{$(hdrdir)}.cpp.obj:
+	$(ECHO) compiling $(<:\=/)
+	$(Q) $(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tp$(<:\=/)
+
+{$(topdir)}.cpp.obj:
+	$(ECHO) compiling $(<:\=/)
+	$(Q) $(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tp$(<:\=/)
+
+{$(srcdir)}.cpp.obj:
+	$(ECHO) compiling $(<:\=/)
+	$(Q) $(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tp$(<:\=/)
+
+.cpp.obj:
+	$(ECHO) compiling $(<:\=/)
+	$(Q) $(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tp$(<:\=/)
+
+{$(hdrdir)}.c.obj:
+	$(ECHO) compiling $(<:\=/)
+	$(Q) $(CC) $(INCFLAGS) $(CFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tc$(<:\=/)
+
+{$(topdir)}.c.obj:
+	$(ECHO) compiling $(<:\=/)
+	$(Q) $(CC) $(INCFLAGS) $(CFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tc$(<:\=/)
 
-.cc.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+{$(srcdir)}.c.obj:
+	$(ECHO) compiling $(<:\=/)
+	$(Q) $(CC) $(INCFLAGS) $(CFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tc$(<:\=/)
 
-.mm.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+.c.obj:
+	$(ECHO) compiling $(<:\=/)
+	$(Q) $(CC) $(INCFLAGS) $(CFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tc$(<:\=/)
 
-.cxx.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+{$(hdrdir)}.m.obj:
+	$(ECHO) compiling $(<:\=/)
+	$(Q) $(CC) $(INCFLAGS) $(CFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tc$(<:\=/)
 
-.cpp.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+{$(topdir)}.m.obj:
+	$(ECHO) compiling $(<:\=/)
+	$(Q) $(CC) $(INCFLAGS) $(CFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tc$(<:\=/)
 
-.c.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
+{$(srcdir)}.m.obj:
+	$(ECHO) compiling $(<:\=/)
+	$(Q) $(CC) $(INCFLAGS) $(CFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tc$(<:\=/)
 
-.m.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
+.m.obj:
+	$(ECHO) compiling $(<:\=/)
+	$(Q) $(CC) $(INCFLAGS) $(CFLAGS) $(CPPFLAGS) $(COUTFLAG)$(@) -c -Tc$(<:\=/)
 
 $(DLLIB): $(DEFFILE) $(OBJS) Makefile
 	$(ECHO) linking shared-object $(DLLIB)
-	@-$(RM) $(@)
-	$(Q) $(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
+	@-$(RM) $(@:/=\)
+	$(Q) $(LDSHARED) -Fe$(@) $(OBJS) $(LIBS) $(LOCAL_LIBS) -link $(DLDFLAGS) -implib:$(*F:.so=)-$(arch).lib -pdb:$(*F:.so=)-$(arch).pdb -def:$(DEFFILE)
+	$(Q) @if exist $(@).manifest $(RUBY) -run -e wait_writable -- -n 10 $(@)
+	$(Q) @if exist $(@).manifest mt -nologo -manifest $(@).manifest -outputresource:$(@);2
+	$(Q) @if exist $(@).manifest $(RM) $(@:/=\).manifest
 
 
 
 $(DEFFILE): 
-	$(ECHO) generating $(@)
+	$(ECHO) generating $(@:\=/)
 	$(Q) $(RUBY) -e "puts 'EXPORTS', '' + 'Init_$(TARGET)'.sub(/\..*\z/,'')"  > $@
 
-$(OBJS): $(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h $(arch_hdrdir)/ruby/config.h
+$(OBJS): {.;$(VPATH)}$(hdrdir)/ruby.h {.;$(VPATH)}$(hdrdir)/ruby/defines.h $(arch_hdrdir)/ruby/config.h

data/ext/extconf.rb

@@ -6,7 +6,8 @@ if not have_header('proj_api.h')
   raise('Cannot find proj_api.h header')
 end
 
-if not have_library('proj', 'pj_init')
+unless have_library('proj', 'pj_init') or
+       have_library('libproj', 'pj_init')
   raise('Cannot find proj4 library')
 end
 

data/ext/proj4_ruby-i386-mswin32_100.def

@@ -0,0 +1,2 @@
+EXPORTS
+Init_proj4_ruby

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: proj4rb
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Guilhem Vellut
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-30 00:00:00 Z
+date: 2011-08-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake-compiler
@@ -78,8 +78,14 @@ files:
 - example/version.rb
 - ext/extconf.rb
 - ext/Makefile
-- ext/mkmf.log
+- ext/proj4_ruby-i386-mswin32_100.def
+- ext/proj4_ruby-i386-mswin32_100.exp
+- ext/proj4_ruby-i386-mswin32_100.lib
+- ext/proj4_ruby-i386-mswin32_100.pdb
+- ext/proj4_ruby.so
 - ext/projrb.c
+- ext/projrb.obj
+- ext/vc100.pdb
 - ext/vc/proj4_ruby.sln
 - ext/vc/proj4_ruby.vcproj
 - lib/proj4.rb

data/ext/mkmf.log

@@ -1,25 +0,0 @@
-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 */
-
---------------------
-