rbcdio 0.01 → 0.02

data/configure.ac

@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Rocky Bernstein <rocky@panix.com>
+# Copyright (C) 2006, 2007 Rocky Bernstein <rocky@gnu.org>
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,12 +18,12 @@
 ## Note: the version number (the 2nd parameter in AC_INIT) 
 ## is picked up inside the Python debugger script.
 
-AC_INIT([rubycdio],[0.01],[libcdio-rubycdio-devel@gnu.org])
+AC_INIT([rubycdio],[0.02],[libcdio-rubycdio-devel@gnu.org])
 
 ##
 ## Check for Python interpreter and make we have a recent version.
 ##
-AC_REVISION([$Id: configure.ac,v 1.4 2006/12/08 12:21:53 rocky Exp $])dnl
+AC_REVISION([$Id: configure.ac,v 1.6 2007/10/13 17:11:45 rocky Exp $])dnl
 
 ##
 ## In maintainer mode we produce a ChangeLog
@@ -140,7 +140,7 @@ AC_SUBST(LDSHARED)
 AC_SUBST(SWIG_FLAGS)
 
 ##
-## Test program needs location of pycdio shared library
+## Test program needs location of rbcdio shared library
 ## This is a hack, but I at present I'm not sure what the best thing to
 ## do is.
 RUBYCDIO_LIBDIR=`pwd`

data/doc/created.rid

@@ -1 +1 @@
-Thu Dec 21 18:45:11 EST 2006
+Fri, 26 Oct 2007 21:25:29 -0400

data/doc/fr_file_index.html

@@ -24,6 +24,7 @@
     <a href="files/example/README.html">example/README</a><br />
     <a href="files/example/audio_rb.html">example/audio.rb</a><br />
     <a href="files/example/cd-read_rb.html">example/cd-read.rb</a><br />
+    <a href="files/example/cdchange_rb.html">example/cdchange.rb</a><br />
     <a href="files/example/device_rb.html">example/device.rb</a><br />
     <a href="files/example/drivers_rb.html">example/drivers.rb</a><br />
     <a href="files/example/drives_rb.html">example/drives.rb</a><br />

data/example/README

@@ -7,6 +7,11 @@ libcdio supports Disc Images as well as a realCD-ROM, a CDRWIN
 (BIN/CUE), cdrdao (TOC) or Nero NRG disc image can be played as
 well. Run --help to get a list of options
 
+== cdchagne.rb
+
+A program to test if a CD has been changed since the last
+change test.
+
 == device.rb
 
 A program to show drive capabilities. Various drives on various OS/s
@@ -44,4 +49,4 @@ A program to show using ISO9660::IFS to extract a file.
 A program to list track numbers and logical sector numbers of a
 Compact Disc.
 
-$Id: README,v 1.3 2006/12/03 03:11:30 rocky Exp $
+$Id: README,v 1.4 2007/10/13 23:00:18 rocky Exp $

data/example/audio.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# $Id: audio.rb,v 1.9 2006/12/16 13:24:48 rocky Exp $
+# $Id: audio.rb,v 1.10 2007/10/13 23:25:41 rocky Exp $
 #
 # A program to show use of audio controls. See cdda-player from the
 # libcdio distribution for a more complete program.
@@ -27,7 +27,6 @@ if(File::exists?(mypath + "/../ext/cdio/rubycdio.so"))
   $: << File.dirname(__FILE__) + '/../lib'
 else
   require 'rubygems'
-  require_gem "rbcdio"
 end
 require "cdio"
 require 'getoptlong'

data/example/cd-read.rb

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
-# $Id: cd-read.rb,v 1.10 2006/12/21 11:55:23 rocky Exp $
+# $Id: cd-read.rb,v 1.11 2007/10/13 23:25:41 rocky Exp $
 #
 # A program to read CD blocks. See read-cd from the libcdio distribution
 # more complete program.
 
 #
-#    Copyright (C) 2006 Rocky Bernstein <rocky@gnu.org>
+#    Copyright (C) 2006, 2007 Rocky Bernstein <rocky@gnu.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -27,7 +27,6 @@ if(File::exists?(mypath + "/../lib/cdio.rb"))
   $: << File.dirname(__FILE__) + '/../ext/cdio'
 else
   require 'rubygems'
-  require_gem "rbcdio"
 end
 require "cdio"
 require 'getoptlong'

data/example/cdchange.rb

@@ -0,0 +1,71 @@
+#!/usr/bin/env ruby
+#$Id: cdchange.rb,v 1.2 2007/10/13 23:31:51 rocky Exp $ -*- Python -*-
+# 
+# A Program to show CD media changing
+#
+#
+#    Copyright (C) 2007 Rocky Bernstein <rocky@gnu.org>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+mypath = File.dirname(__FILE__)
+
+if(File::exists?(mypath + "/../lib/cdio.rb"))
+  $: << File.dirname(__FILE__) + '/../lib'
+  $: << File.dirname(__FILE__) + '/../ext/cdio'
+else
+  require 'rubygems'
+end
+require "cdio"
+
+sleep_time = 15
+if ARGV[0]
+    begin
+        d = Cdio::Device.new(ARGV.first)
+    rescue IOError
+      print "Problem opening CD-ROM: %s" % sys.argv[1]
+      exit 1
+    end
+    if ARGV[1]
+      begin
+        sleep_time = ARGV[1].to_i
+      rescue
+        print "Invalid sleep parameter #{ARGV[1]}"
+        exit 2
+      end
+    end
+else
+    begin
+        d = Cdio::Device.new(nil, Rubycdio::DRIVER_UNKNOWN)
+    rescue IOError
+      print "Problem finding a CD-ROM"
+      exit 1
+    end
+end
+
+if d.media_changed?
+  print "Initial media status: changed"
+else
+  print "Initial media status: not changed"
+end
+
+print "Giving you #{sleep_time} seconds to change CD if you want to do so."
+sleep(sleep_time)
+if d.media_changed?
+  print "Media status: changed"
+else
+    print "Media status: not changed"
+end
+d.close()

data/example/device.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
-# $Id: device.rb,v 1.10 2006/12/16 14:29:06 rocky Exp $
+# $Id: device.rb,v 1.11 2007/10/13 23:25:41 rocky Exp $
 #
 # A Program to show CD-ROM device information
 
-#    Copyright (C) 2006 Rocky Bernstein <rocky@gnu.org>
+#    Copyright (C) 2006, 2007 Rocky Bernstein <rocky@gnu.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -25,7 +25,6 @@ if(File::exists?(mypath + "/../lib/cdio.rb"))
   $: << File.dirname(__FILE__) + '/../lib'
 else
   require 'rubygems'
-  require_gem "rbcdio"
 end
 require "cdio"
 

data/example/drivers.rb

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
-# $Id: drivers.rb,v 1.10 2006/12/16 14:29:06 rocky Exp $
+# $Id: drivers.rb,v 1.11 2007/10/13 23:25:41 rocky Exp $
 #
 # Program to read CD blocks. See read-cd from the libcdio distribution
 # for a more complete program.
 
 #
-#    Copyright (C) 2006 Rocky Bernstein <rocky@panix.com>
+#    Copyright (C) 2006, 2007 Rocky Bernstein <rocky@gnu.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -27,7 +27,6 @@ if(File::exists?(mypath + "/../lib/cdio.rb"))
   $: << File.dirname(__FILE__) + '/../lib'
 else
   require 'rubygems'
-  require_gem "rbcdio"
 end
 require "cdio"
 

data/example/drives.rb

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
-# $Id: drives.rb,v 1.8 2006/12/16 14:29:06 rocky Exp $
+# $Id: drives.rb,v 1.9 2007/10/13 23:25:41 rocky Exp $
 #
 # Program to read CD blocks. See read-cd from the libcdio distribution
 # for a more complete program.
 
 #
-#    Copyright (C) 2006 Rocky Bernstein <rocky@gnu.org>
+#    Copyright (C) 2006, 2007 Rocky Bernstein <rocky@gnu.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -27,7 +27,6 @@ if(File::exists?(mypath + "/../lib/cdio.rb"))
   $: << File.dirname(__FILE__) + '/../ext/cdio'
 else
   require 'rubygems'
-  require_gem "rbcdio"
 end
 require "cdio"
 

data/example/eject.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
-# $Id: eject.rb,v 1.10 2006/12/16 13:24:48 rocky Exp $
+# $Id: eject.rb,v 1.11 2007/10/13 23:25:41 rocky Exp $
 #  
 # A program to eject and close CD-ROM drive
 
-#    Copyright (C) 2006 Rocky Bernstein <rocky@gnu.org>
+#    Copyright (C) 2006, 2007 Rocky Bernstein <rocky@gnu.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -25,7 +25,6 @@ if(File::exists?(mypath + "/../lib/cdio.rb"))
   $: << File.dirname(__FILE__) + '/../ext/cdio'
 else
   require 'rubygems'
-  require_gem "rbcdio"
 end
 require "cdio"
 

data/example/iso1.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# $Id: iso1.rb,v 1.9 2006/12/16 13:24:48 rocky Exp $
+# $Id: iso1.rb,v 1.10 2007/10/13 23:25:41 rocky Exp $
 #
 # A simple program to show using libiso9660 to list files in a directory of
 # an ISO-9660 image.
@@ -8,7 +8,7 @@
 # use in the listing. Otherwise a compiled-in default ISO 9660 image
 # name (that comes with the libcdio distribution) will be used.
 
-#  Copyright (C) 2006 Rocky Bernstein <rocky@gnu.org>
+#  Copyright (C) 2006, 2007 Rocky Bernstein <rocky@gnu.org>
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -31,7 +31,6 @@ if(File::exists?(mypath + "/../lib/cdio.rb"))
   $: << File.dirname(__FILE__) + '/../ext/iso9660'
 else
   require 'rubygems'
-  require_gem "rbcdio"
 end
   
 require "iso9660"

data/example/iso2.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# $Id: iso2.rb,v 1.7 2006/12/16 03:44:48 rocky Exp $
+# $Id: iso2.rb,v 1.8 2007/10/13 23:25:41 rocky Exp $
 # A program to show using iso9660 to extract a file
 # from an ISO-9660 image.
 #
@@ -7,7 +7,7 @@
 # use in the extraction. Otherwise a compiled in default ISO 9660
 # image name (that comes with the libcdio distribution) will be used.
 
-#  Copyright (C) 2006 Rocky Bernstein <rocky@gnu.org>
+#  Copyright (C) 2006, 2007 Rocky Bernstein <rocky@gnu.org>
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -30,7 +30,6 @@ if(File::exists?(mypath + "/../lib/cdio.rb"))
   $: << File.dirname(__FILE__) + '/../ext/iso9660'
 else
   require 'rubygems'
-  require_gem "rbcdio"
 end
 
 require "iso9660"

data/example/iso3.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# $Id: iso3.rb,v 1.7 2006/12/16 13:24:48 rocky Exp $
+# $Id: iso3.rb,v 1.8 2007/10/13 23:25:42 rocky Exp $
 #
 # A program to show using ISO9660::IFS to extract a file
 # from an ISO-9660 image.
@@ -8,7 +8,7 @@
 # use in the extraction. Otherwise a compiled in default ISO 9660
 # image name (that comes with the libcdio distribution) will be used.
 
-#  Copyright (C) 2006 Rocky Bernstein <rocky@cpan.org>
+#  Copyright (C) 2006, 2007 Rocky Bernstein <rocky@gnu.org>
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -31,7 +31,6 @@ if(File::exists?(mypath + "/../lib/cdio.rb"))
   $: << File.dirname(__FILE__) + '/../ext/iso9660'
 else
   require 'rubygems'
-  require_gem "rbcdio"
 end
 
 require "iso9660"

data/example/tracks.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
-# $Id: tracks.rb,v 1.10 2006/12/16 13:24:48 rocky Exp $
+# $Id: tracks.rb,v 1.11 2007/10/13 23:25:42 rocky Exp $
 #
 # A program to show CD information
 
-#    Copyright (C) 2006 Rocky Bernstein <rocky@gnu.org>
+#    Copyright (C) 2006, 2007 Rocky Bernstein <rocky@gnu.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -25,7 +25,6 @@ if(File::exists?(mypath + "/../lib/cdio.rb"))
   $: << File.dirname(__FILE__) + '/../ext/cdio'
 else
   require 'rubygems'
-  require_gem "rbcdio"
 end
 require "cdio"
 

data/ext/cdio/Makefile

@@ -7,12 +7,19 @@ srcdir = .
 topdir = /usr/lib/ruby/1.8/i586-linux
 hdrdir = $(topdir)
 VPATH = $(srcdir):$(topdir):$(hdrdir)
-prefix = $(DESTDIR)/usr
+prefix = $(DESTDIR)/usr/local
 exec_prefix = $(DESTDIR)/usr
 sitedir = $(libdir)/ruby/site_ruby
 rubylibdir = $(libdir)/ruby/$(ruby_version)
+docdir = $(datarootdir)/doc/$(PACKAGE)
+dvidir = $(docdir)
+datarootdir = $(prefix)/share
 archdir = $(rubylibdir)/$(arch)
 sbindir = $(DESTDIR)/usr/sbin
+psdir = $(docdir)
+vendordir = $(libdir)/ruby/vendor_ruby
+localedir = $(datarootdir)/locale
+htmldir = $(docdir)
 datadir = $(DESTDIR)/usr/share
 includedir = $(DESTDIR)/usr/include
 infodir = $(DESTDIR)/usr/share/info
@@ -21,22 +28,27 @@ mandir = $(DESTDIR)/usr/share/man
 libdir = $(DESTDIR)/usr/lib
 sharedstatedir = $(DESTDIR)/usr/com
 oldincludedir = $(DESTDIR)/usr/include
+pdfdir = $(docdir)
 sitearchdir = $(sitelibdir)/$(sitearch)
+vendorarchdir = $(vendorlibdir)/$(vendorarch)
 bindir = $(DESTDIR)/usr/bin
 localstatedir = $(DESTDIR)/var
+vendorlibdir = $(vendordir)/$(ruby_version)
 sitelibdir = $(sitedir)/$(ruby_version)
 libexecdir = $(DESTDIR)/usr/lib
 
 CC = gcc
 LIBRUBY = $(LIBRUBY_SO)
 LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = -Wl,-R -Wl,$(libdir) -L$(libdir) -l$(RUBY_SO_NAME)
+LIBRUBYARG_SHARED = -Wl,-R -Wl,$(libdir) -L. -L$(libdir) -l$(RUBY_SO_NAME)
 LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
 
-CFLAGS   =  -fPIC -O2 -march=i586 -mtune=i686 -fmessage-length=0 -Wall -D_FORTIFY_SOURCE=2 -g -g -fno-strict-aliasing  -fPIC 
-CPPFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)  
+RUBY_EXTCONF_H = 
+CFLAGS   =  -fPIC -O2 -march=i586 -mtune=i686 -fmessage-length=0 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -g -g -fno-strict-aliasing  -fPIC 
+INCFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)
+CPPFLAGS =  
 CXXFLAGS = $(CFLAGS) 
-DLDFLAGS =   
+DLDFLAGS = -L.  -rdynamic -Wl,-export-dynamic  
 LDSHARED = $(CC) -shared
 AR = ar
 EXEEXT = 
@@ -45,6 +57,7 @@ RUBY_INSTALL_NAME = ruby
 RUBY_SO_NAME = ruby
 arch = i586-linux
 sitearch = i586-linux
+vendorarch = i586-linux
 ruby_version = 1.8
 ruby = /usr/bin/ruby
 RUBY = $(ruby)
@@ -59,8 +72,8 @@ COPY = cp
 
 preload = 
 
-libpath = $(libdir)
-LIBPATH =  -L'$(libdir)' -Wl,-R'$(libdir)'
+libpath = . $(libdir)
+LIBPATH =  -L'.' -L'$(libdir)' -Wl,-R'$(libdir)'
 DEFFILE = 
 
 CLEANFILES = 
@@ -69,12 +82,13 @@ DISTCLEANFILES =
 extout = 
 extout_prefix = 
 target_prefix = 
-LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED) -lcdio  -ldl -lcrypt -lm   -lc
+LOCAL_LIBS = -L/usr/local/lib -lcdio -lm  
+LIBS = $(LIBRUBYARG_SHARED)  -ldl -lcrypt -lm   -lc
 SRCS = rubycdio_wrap.c
 OBJS = rubycdio_wrap.o
 TARGET = rubycdio
 DLLIB = $(TARGET).so
+EXTSTATIC = 
 STATIC_LIB = 
 
 RUBYCOMMONDIR = $(sitedir)$(target_prefix)
@@ -92,7 +106,7 @@ clean:
 		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
 
 distclean:	clean
-		@-$(RM) Makefile extconf.h conftest.* mkmf.log
+		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
 		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
 
 realclean:	distclean
@@ -116,23 +130,23 @@ site-install-rb: install-rb
 .SUFFIXES: .c .m .cc .cxx .cpp .C .o
 
 .cc.o:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
 
 .cxx.o:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
 
 .cpp.o:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
 
 .C.o:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
 
 .c.o:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
 
 $(DLLIB): $(OBJS)
 	@-$(RM) $@
-	$(LDSHARED) $(DLDFLAGS) $(LIBPATH) -o $@ $(OBJS) $(LOCAL_LIBS) $(LIBS)
+	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)