do_mysql 0.2.1 → 0.2.2

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 
 PLUGIN = "do_mysql"
 NAME = "do_mysql"
-VERSION = "0.2.1"
+VERSION = "0.2.2"
 AUTHOR = "Yehuda Katz"
 EMAIL = "wycats@gmail.com"
 HOMEPAGE = "http://dataobjects.devjavu.com"

data/ext/Makefile

@@ -0,0 +1,149 @@
+
+SHELL = /bin/sh
+
+#### Start of system configuration section. ####
+
+srcdir = .
+topdir = /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin9.0
+hdrdir = $(topdir)
+VPATH = $(srcdir):$(topdir):$(hdrdir)
+prefix = $(DESTDIR)/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr
+exec_prefix = $(DESTDIR)/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr
+sitedir = $(DESTDIR)/Library/Ruby/Site
+rubylibdir = $(libdir)/ruby/$(ruby_version)
+docdir = $(datarootdir)/doc/$(PACKAGE)
+dvidir = $(docdir)
+datarootdir = $(prefix)/share
+archdir = $(rubylibdir)/$(arch)
+sbindir = $(exec_prefix)/sbin
+psdir = $(docdir)
+localedir = $(datarootdir)/locale
+htmldir = $(docdir)
+datadir = $(datarootdir)
+includedir = $(prefix)/include
+infodir = $(DESTDIR)/usr/share/info
+sysconfdir = $(prefix)/etc
+mandir = $(DESTDIR)/usr/share/man
+libdir = $(DESTDIR)/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib
+sharedstatedir = $(prefix)/com
+oldincludedir = $(DESTDIR)/usr/include
+pdfdir = $(docdir)
+sitearchdir = $(sitelibdir)/$(sitearch)
+bindir = $(exec_prefix)/bin
+localstatedir = $(prefix)/var
+sitelibdir = $(sitedir)/$(ruby_version)
+libexecdir = $(exec_prefix)/libexec
+
+CC = gcc
+LIBRUBY = $(LIBRUBY_SO)
+LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
+LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
+LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)
+
+RUBY_EXTCONF_H = 
+CFLAGS   =  -fno-common -arch i386 -Os -pipe -fno-common -Wall  
+INCFLAGS = -I. -I. -I/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin9.0 -I.
+CPPFLAGS =  -I/usr/local/mysql/include 
+CXXFLAGS = $(CFLAGS) 
+DLDFLAGS = -L. -arch i386  
+LDSHARED = cc -arch i386 -pipe -bundle
+AR = ar
+EXEEXT = 
+
+RUBY_INSTALL_NAME = ruby
+RUBY_SO_NAME = ruby
+arch = universal-darwin9.0
+sitearch = universal-darwin9.0
+ruby_version = 1.8
+ruby = /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+RUBY = $(ruby)
+RM = rm -f
+MAKEDIRS = mkdir -p
+INSTALL = /usr/bin/install -c
+INSTALL_PROG = $(INSTALL) -m 0755
+INSTALL_DATA = $(INSTALL) -m 644
+COPY = cp
+
+#### End of system configuration section. ####
+
+preload = 
+
+libpath = . $(libdir) /usr/local/mysql/lib/mysql -lmysqlclient_r -lz -lm
+LIBPATH =  -L"." -L"$(libdir)" -L""/usr/local/mysql/lib/mysql -lmysqlclient_r -lz -lm""
+DEFFILE = 
+
+CLEANFILES = 
+DISTCLEANFILES = 
+
+extout = 
+extout_prefix = 
+target_prefix = 
+LOCAL_LIBS = 
+LIBS = $(LIBRUBYARG_SHARED) -lmysqlclient  -lpthread -ldl -lm  
+SRCS = mysql_c.c
+OBJS = mysql_c.o
+TARGET = mysql_c
+DLLIB = $(TARGET).bundle
+EXTSTATIC = 
+STATIC_LIB = 
+
+RUBYCOMMONDIR = $(sitedir)$(target_prefix)
+RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
+RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+
+TARGET_SO     = $(DLLIB)
+CLEANLIBS     = $(TARGET).bundle $(TARGET).il? $(TARGET).tds $(TARGET).map
+CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
+
+all:		$(DLLIB)
+static:		$(STATIC_LIB)
+
+clean:
+		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
+
+distclean:	clean
+		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
+		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
+
+realclean:	distclean
+install: install-so install-rb
+
+install-so: $(RUBYARCHDIR)
+install-so: $(RUBYARCHDIR)/$(DLLIB)
+$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
+	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
+install-rb: pre-install-rb install-rb-default
+install-rb-default: pre-install-rb-default
+pre-install-rb: Makefile
+pre-install-rb-default: Makefile
+$(RUBYARCHDIR):
+	$(MAKEDIRS) $@
+
+site-install: site-install-so site-install-rb
+site-install-so: install-so
+site-install-rb: install-rb
+
+.SUFFIXES: .c .m .cc .cxx .cpp .C .o
+
+.cc.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.cxx.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.cpp.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.C.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.c.o:
+	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
+
+$(DLLIB): $(OBJS)
+	@-$(RM) $@
+	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
+
+
+
+$(OBJS): ruby.h defines.h

data/ext/conftest.dSYM/Contents/Info.plist

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+	<dict>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>English</string>
+		<key>CFBundleIdentifier</key>
+		<string>com.apple.xcode.dsym.conftest</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundlePackageType</key>
+		<string>dSYM</string>
+		<key>CFBundleShortVersionString</key>
+		<string>1.0</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleVersion</key>
+		<string>1.0</string>
+		<key>dSYM_UUID</key>
+		<dict>
+			<key>i386</key>
+			<string>05 b9 4d f7 0d 04 81 0a  df 53 f8 8d ab f7 aa 08</string>
+		</dict>
+	</dict>
+</plist>

data/ext/extconf.rb

@@ -1,46 +1,53 @@
-require 'mkmf'
-require 'open3'
+if `uname -sr` =~ /^Darwin/
+  ENV["RC_ARCHS"] = `uname -m`.chomp
+  unless File.exists?("/usr/local/mysql/lib/mysql")
+    `sudo ln -s /usr/local/mysql/lib /usr/local/mysql/lib/mysql` rescue nil
+  end
+end
 
-# Heimidal hack
-ENV["ARCHFLAGS"] = '-arch i386'
-if `uname -sr` =~ /^Darwin 9/
-  `sudo ln -s /usr/local/mysql/lib /usr/local/mysql/lib/mysql` rescue nil
-  `sudo ln -s /usr/local/mysql/bin/mysql_config /usr/local/mysql/bin/mysql_config5` rescue nil
+# Figure out where mysql_config is
+if !`which mysql_config`.chomp.empty?
+  @mysql_config_bin = "mysql_config"
+elsif !`which mysql_config5`.chomp.empty?
+  @mysql_config_bin = "mysql_config5"  
+else
+  puts "Cannot find mysql_config in your path. Please enter a location: "
+  location = gets.chomp
+  if File.exists?(location)
+    @mysql_config_bin = location
+  else
+    puts "Cannot find that file. Exiting."
+    exit
+  end
 end
 
+require 'mkmf'
+require 'open3'
+
 def config_value(type)
   ENV["MYSQL_#{type.upcase}"] || mysql_config(type)
 end
 
-def mysql_config(type)
+@mysql_config = {}
 
-  sin, sout, serr = Open3.popen3("mysql_config5 --#{type}")
-  
-  unless serr.read.empty?
-    sin, sout, serr = Open3.popen3("mysql_config --#{type}")
-  end
+def mysql_config(type)
+  return @mysql_config[type] if @mysql_config[type]
 
-  # If mysql_config is not in your path
-  unless serr.read.empty?
-    sin, sout, serr = Open3.popen3("/usr/local/mysql/bin/mysql_config --#{type}")
-  end
-  
-  unless serr.read.empty?
-    sin, sout, serr = Open3.popen3("/usr/local/mysql/bin/mysql_config5 --#{type}")
-  end  
+  sin, sout, serr = Open3.popen3("#{@mysql_config_bin} --#{type}")
   
   unless serr.read.empty?
     raise "mysql_config not found"
   end
   
-  sout.readline.chomp[2..-1]
+  @mysql_config[type] = sout.readline.chomp[2..-1]
+  @mysql_config[type]  
 end
 
 $inc, $lib = dir_config('mysql', config_value('include'), config_value('libs_r')) 
 
 def have_build_env
   libs = ['m', 'z', 'socket', 'nsl']
-  while not find_library('mysqlclient', 'mysql_query', config_value('libs'), $lib, "#{$lib}/mysql") do
+  while not find_library('mysqlclient', "mysql_query", config_value('libs'), $lib, "#{$lib}/mysql") do
     exit 1 if libs.empty?
     have_library(libs.shift)
   end

data/ext/mkmf.log

@@ -0,0 +1,24 @@
+find_library: checking for mysql_query() in -lmysqlclient... -------------------- yes
+
+"gcc -o conftest -I. -I/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin9.0 -I. -I/usr/local/mysql/include  -arch i386 -Os -pipe -fno-common conftest.c  -L"." -L"/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib" -L""/usr/local/mysql/lib/mysql -lmysqlclient_r -lz -lm"" -L. -arch i386     -lruby -lmysqlclient  -lpthread -ldl -lm  "
+conftest.c: In function ‘t’:
+conftest.c:3: error: ‘mysql_query’ undeclared (first use in this function)
+conftest.c:3: error: (Each undeclared identifier is reported only once
+conftest.c:3: error: for each function it appears in.)
+checked program was:
+/* begin */
+1: /*top*/
+2: int main() { return 0; }
+3: int t() { void ((*volatile p)()); p = (void ((*)()))mysql_query; return 0; }
+/* end */
+
+"gcc -o conftest -I. -I/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin9.0 -I. -I/usr/local/mysql/include  -arch i386 -Os -pipe -fno-common conftest.c  -L"." -L"/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib" -L""/usr/local/mysql/lib/mysql -lmysqlclient_r -lz -lm"" -L. -arch i386     -lruby -lmysqlclient  -lpthread -ldl -lm  "
+checked program was:
+/* begin */
+1: /*top*/
+2: int main() { return 0; }
+3: int t() { mysql_query(); return 0; }
+/* end */
+
+--------------------
+

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: do_mysql
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
-date: 2007-11-12 00:00:00 -08:00
+  version: 0.2.2
+date: 2007-11-18 00:00:00 -08:00
 summary: A DataObject.rb driver for mysql
 require_paths: 
 - lib
@@ -34,9 +34,19 @@ files:
 - Rakefile
 - TODO
 - lib/do_mysql.rb
+- ext/conftest.dSYM
+- ext/conftest.dSYM/Contents
+- ext/conftest.dSYM/Contents/Info.plist
+- ext/conftest.dSYM/Contents/Resources
+- ext/conftest.dSYM/Contents/Resources/DWARF
+- ext/conftest.dSYM/Contents/Resources/DWARF/conftest
 - ext/extconf.rb
+- ext/Makefile
+- ext/mkmf.log
+- ext/mysql_c.bundle
 - ext/mysql_c.c
 - ext/mysql_c.i
+- ext/mysql_c.o
 test_files: []
 
 rdoc_options: []