rwv2 0.6.0 → 0.6.1

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.6.1 / 04.01.2012
+
+* Update rwv2.cpp and rwv2_handlers.h, replacing STR2CSTR with StringValueCStr
+  
+  * getting ready for Ruby 1.9.3
+
 === 0.6.0 / 22.12.2010
 
 * gem package is out!

data/Manifest.txt

@@ -1,7 +1,7 @@
-COPYING
 History.txt
 INSTALL
 InstalledFiles
+LICENCE.txt
 Manifest.txt
 README
 README.txt

data/config.save

@@ -1,12 +1,12 @@
+prefix=/usr/local
+std-ruby=$prefix/lib/ruby/1.9.1
+site-ruby-common=$prefix/lib/ruby/site_ruby
+site-ruby=$prefix/lib/ruby/site_ruby/1.9.1
 bin-dir=$prefix/bin
-site-ruby=$prefix/lib/ruby/site_ruby/1.8
-prefix=/usr
-ruby-path=/usr/bin/ruby18
-make-prog=make
 rb-dir=$site-ruby
-without-ext=no
-ruby-prog=/usr/bin/ruby18
-site-ruby-common=$prefix/lib/ruby/site_ruby
-std-ruby=$prefix/lib/ruby/1.8
+so-dir=$prefix/lib/ruby/site_ruby/1.9.1/i686-linux
 data-dir=$prefix/share
-so-dir=$prefix/lib/ruby/site_ruby/1.8/i686-linux
+ruby-path=/usr/local/bin/ruby
+ruby-prog=/usr/local/bin/ruby
+make-prog=make
+without-ext=no

data/ext/rwv2/Makefile

@@ -1,65 +1,98 @@
 
 SHELL = /bin/sh
 
+# V=0 quiet, V=1 verbose.  other values don't work.
+V = 0
+Q1 = $(V:1=)
+Q = $(Q1:0=@)
+n=$(NULLCMD)
+ECHO1 = $(V:1=@$n)
+ECHO = $(ECHO1:0=@echo)
+
 #### Start of system configuration section. ####
 
 srcdir = /home/zeno/.software/rwv2/ext/rwv2
-topdir = /usr/lib/ruby/1.8/i686-linux
-hdrdir = $(topdir)
-VPATH = $(srcdir):$(topdir):$(hdrdir)
-prefix = $(DESTDIR)/usr
-exec_prefix = $(DESTDIR)/usr
-sitedir = $(DESTDIR)/usr/lib/ruby/site_ruby
-rubylibdir = $(libdir)/ruby/$(ruby_version)
-docdir = $(datarootdir)/doc/$(PACKAGE)
-dvidir = $(docdir)
-datarootdir = $(prefix)/share
-archdir = $(rubylibdir)/$(arch)
-sbindir = $(exec_prefix)/sbin
-psdir = $(docdir)
+topdir = /usr/local/include/ruby-1.9.1
+hdrdir = /usr/local/include/ruby-1.9.1
+arch_hdrdir = /usr/local/include/ruby-1.9.1/$(arch)
+VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
+prefix = $(DESTDIR)/usr/local
+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)
-datadir = $(DESTDIR)/usr/share
+infodir = $(datarootdir)/info
+docdir = $(datarootdir)/doc/$(PACKAGE)
+oldincludedir = $(DESTDIR)/usr/include
 includedir = $(prefix)/include
-infodir = $(DESTDIR)/usr/share/info
-sysconfdir = $(DESTDIR)/etc
-mandir = $(DESTDIR)/usr/share/man
-libdir = $(exec_prefix)/lib
+localstatedir = $(prefix)/var
 sharedstatedir = $(prefix)/com
-oldincludedir = $(DESTDIR)/usr/include
-pdfdir = $(docdir)
-sitearchdir = $(sitelibdir)/$(sitearch)
-localstatedir = $(DESTDIR)/var/lib
+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)
-libexecdir = $(exec_prefix)/libexec
+sitearchdir = $(sitelibdir)/$(sitearch)
+vendorlibdir = $(vendordir)/$(ruby_version)
+vendorarchdir = $(vendorlibdir)/$(sitearch)
 
-CC = i686-pc-linux-gnu-gcc
+NULLCMD = :
+
+CC = gcc
+CXX = g++
 LIBRUBY = $(LIBRUBY_SO)
 LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
 LIBRUBYARG_SHARED = -Wl,-R -Wl,$(libdir) -L$(libdir) -l$(RUBY_SO_NAME)
-LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
+LIBRUBYARG_STATIC = -Wl,-R -Wl,$(libdir) -L$(libdir) -l$(RUBY_SO_NAME)-static
+OUTFLAG = -o 
+COUTFLAG = -o 
 
 RUBY_EXTCONF_H = 
-CFLAGS   =  -fPIC -Os -march=pentium4 -pipe -fno-strict-aliasing  -fPIC 
-INCFLAGS = -I. -I. -I/usr/lib/ruby/1.8/i686-linux -I/home/zeno/.software/rwv2/ext/rwv2
+cflags   =  $(optflags) $(debugflags) $(warnflags)
+optflags = -O3
+debugflags = -ggdb
+warnflags = -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wimplicit-function-declaration
+CFLAGS   = -fPIC $(cflags)  -fPIC 
+INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
 DEFS     = -D_FILE_OFFSET_BITS=64
-CPPFLAGS =  -I./include  -D_FILE_OFFSET_BITS=64
-CXXFLAGS = $(CFLAGS) 
-DLDFLAGS = -L. -Wl,-O1 -Wl,--sort-common -Wl,--as-needed -rdynamic -Wl,-export-dynamic  
+CPPFLAGS =  -I./include  $(DEFS) $(cppflags)
+CXXFLAGS = $(CFLAGS) $(cxxflags)
+ldflags  = -L.  -rdynamic -Wl,-export-dynamic
+dldflags = 
+ARCH_FLAG = 
+DLDFLAGS = $(ldflags) $(dldflags)
 LDSHARED = $(CC) -shared
-AR = i686-pc-linux-gnu-ar
+LDSHAREDXX = $(CXX) -shared
+AR = ar
 EXEEXT = 
 
-RUBY_INSTALL_NAME = ruby18
-RUBY_SO_NAME = ruby18
+RUBY_BASE_NAME = ruby
+RUBY_INSTALL_NAME = ruby
+RUBY_SO_NAME = ruby
 arch = i686-linux
-sitearch = i686-linux
-ruby_version = 1.8
-ruby = /usr/bin/ruby18
+sitearch = $(arch)
+ruby_version = 1.9.1
+ruby = /usr/local/bin/ruby
 RUBY = $(ruby)
 RM = rm -f
-MAKEDIRS = mkdir -p
+RM_RF = $(RUBY) -run -e rm -- -rf
+RMDIRS = rmdir --ignore-fail-on-non-empty -p
+MAKEDIRS = /bin/mkdir -p
 INSTALL = /usr/bin/install -c
 INSTALL_PROG = $(INSTALL) -m 0755
 INSTALL_DATA = $(INSTALL) -m 644
@@ -75,6 +108,7 @@ DEFFILE =
 
 CLEANFILES = mkmf.log
 DISTCLEANFILES = 
+DISTCLEANDIRS = 
 
 extout = 
 extout_prefix = 
@@ -88,63 +122,92 @@ 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 $(TARGET).il? $(TARGET).tds $(TARGET).map
-CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
-
-all:		$(DLLIB)
-static:		$(STATIC_LIB)
-
-clean:
+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:	clean
+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
+realclean: distclean
 install: install-so install-rb
 
 install-so: $(RUBYARCHDIR)
 install-so: $(RUBYARCHDIR)/$(DLLIB)
-$(RUBYARCHDIR)/$(DLLIB): $(RUBYARCHDIR) $(DLLIB)
-	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
+$(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 rwv2 libraries
 $(RUBYARCHDIR):
-	$(MAKEDIRS) $@
+	$(Q) $(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
+.SUFFIXES: .c .m .cc .mm .cxx .cpp .C .o
 
 .cc.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.mm.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
 
 .cxx.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
 
 .cpp.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
 
 .C.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
 
 .c.o:
-	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
+	$(ECHO) compiling $(<)
+	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
+
+.m.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
 
 $(DLLIB): $(OBJS) Makefile
-	@-$(RM) $@
-	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
+	$(ECHO) linking shared-object $(DLLIB)
+	@-$(RM) $(@)
+	$(Q) $(LDSHAREDXX) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
 
 
 
-$(OBJS): ruby.h defines.h
+$(OBJS): $(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h $(arch_hdrdir)/ruby/config.h

data/ext/rwv2/include/rwv2_handlers.h

@@ -30,7 +30,7 @@
 #include "wv2/ustring.h"
 #include "wv2/word97_generated.h"
 #include "wv2/paragraphproperties.h"
-
+#include <string.h>
 
 #include "rwv2.h"
 #include "rwv2_properties.h"
@@ -43,7 +43,8 @@ extern "C" {
 	} \
 	VALUE val = rb_funcall(target, rb_intern(funcname), 0); \
 	long len; \
-	char * cstr = rb_str2cstr(val, &len); \
+	char * cstr = StringValueCStr(val); \
+  len = strlen(cstr); \
 	if(len != 1) { \
 		rb_raise(rb_eRuntimeError, "InlineReplacementHandler#%s() must return single Character!", funcname); \
 	} \

data/ext/rwv2/mkmf.log

@@ -1,11 +1,21 @@
 have_library: checking for main() in -lwv2... -------------------- yes
 
-"i686-pc-linux-gnu-gcc -o conftest -I. -I/usr/lib/ruby/1.8/i686-linux -I/home/zeno/.software/rwv2/ext/rwv2 -I./include  -D_FILE_OFFSET_BITS=64 -Os -march=pentium4 -pipe -fno-strict-aliasing  -fPIC conftest.c  -L. -L/usr/lib -Wl,-R/usr/lib -L./lib -L. -Wl,-O1 -Wl,--sort-common -Wl,--as-needed -rdynamic -Wl,-export-dynamic    -lstdc++  -lruby18-static -lwv2 -lstdc++  -lpthread -lrt -ldl -lcrypt -lm   -lc"
+"gcc -o conftest -I/usr/local/include/ruby-1.9.1/i686-linux -I/usr/local/include/ruby-1.9.1/ruby/backward -I/usr/local/include/ruby-1.9.1 -I/home/zeno/.software/rwv2/ext/rwv2 -I./include  -D_FILE_OFFSET_BITS=64   -O3 -ggdb -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wimplicit-function-declaration  -fPIC conftest.c  -L. -L/usr/local/lib -Wl,-R/usr/local/lib -L./lib -L.  -rdynamic -Wl,-export-dynamic    -lstdc++  -Wl,-R -Wl,/usr/local/lib -L/usr/local/lib -lruby  -lpthread -lrt -ldl -lcrypt -lm   -lc"
 checked program was:
 /* begin */
-1: /*top*/
-2: int main() { return 0; }
-3: int t() { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
+1: #include "ruby.h"
+2: 
+3: int main() {return 0;}
+/* end */
+
+"gcc -o conftest -I/usr/local/include/ruby-1.9.1/i686-linux -I/usr/local/include/ruby-1.9.1/ruby/backward -I/usr/local/include/ruby-1.9.1 -I/home/zeno/.software/rwv2/ext/rwv2 -I./include  -D_FILE_OFFSET_BITS=64   -O3 -ggdb -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wimplicit-function-declaration  -fPIC conftest.c  -L. -L/usr/local/lib -Wl,-R/usr/local/lib -L./lib -L.  -rdynamic -Wl,-export-dynamic    -lstdc++  -Wl,-R -Wl,/usr/local/lib -L/usr/local/lib -lruby -lwv2 -lstdc++  -lpthread -lrt -ldl -lcrypt -lm   -lc"
+checked program was:
+/* begin */
+1: #include "ruby.h"
+2: 
+3: /*top*/
+4: int main() {return 0;}
+5: int t() { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
 /* end */
 
 --------------------

data/ext/rwv2/rwv2.cpp

@@ -25,6 +25,7 @@
 #include "wv2/parserfactory.h"
 #include "rwv2_parser.h"
 #include "errno.h"
+#include <string.h>
 
 extern "C" {
 
@@ -43,25 +44,25 @@ VALUE rwv2_create_parser(VALUE self, VALUE filename) {
 	Rwv2Parser * stub;
 	parser = Data_Make_Struct(cRwv2Parser, Rwv2Parser, 
 														rwv2_parser_mark, rwv2_parser_free, stub);
-	stub->parser = wvWare::ParserFactory::createParser(STR2CSTR(filename));
+
+	stub->parser = wvWare::ParserFactory::createParser(StringValueCStr(filename));
 	if(!stub->parser)
 	{
     if(errno == 0)
-      rb_raise(rb_eArgError,"'%s' is not a word-document.", STR2CSTR(filename));
+      rb_raise(rb_eArgError,"'%s' is not a word-document.", StringValueCStr(filename));
     else
-      rb_sys_fail(STR2CSTR(filename));
+      rb_sys_fail(StringValuePtr(filename));
 	}
 	return parser;
 }
 VALUE rwv2_create_parser_from_content(VALUE self, VALUE content) {
 	VALUE parser;
 	Rwv2Parser * stub;
-	parser = Data_Make_Struct(cRwv2Parser, Rwv2Parser, 
-														rwv2_parser_mark, rwv2_parser_free, stub);
+	parser = Data_Make_Struct(cRwv2Parser, Rwv2Parser, rwv2_parser_mark, rwv2_parser_free, stub);
 	long int len;
-	char * src = rb_str2cstr(content, &len);
-	stub->parser = wvWare::ParserFactory::createParser(
-			(const unsigned char *) src, len);
+	char * src = StringValuePtr(content);
+  len = strlen(src);
+	stub->parser = wvWare::ParserFactory::createParser((const unsigned char *) src, len);
   if(!stub->parser)
   {
     rb_raise(rb_eArgError,"Input is not a word-document.");

data/lib/rwv2/rwv2.rb

@@ -25,4 +25,4 @@
 require 'rwv2'
 require 'rwv2/handlers'
 
-VERSION = '0.6.0'
+VERSION = '0.6.1'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rwv2
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
+  hash: 5
+  prerelease: 
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Masaomi Hatakeyama, Zeno R.R. Davatz
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-22 00:00:00 +01:00
+date: 2012-01-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 47
+        hash: 41
         segments: 
         - 2
-        - 8
-        - 0
-        version: 2.8.0
+        - 9
+        - 1
+        version: 2.9.1
   type: :development
   version_requirements: *id001
 description: |-
@@ -46,13 +46,14 @@ extensions: []
 
 extra_rdoc_files: 
 - History.txt
+- LICENCE.txt
 - Manifest.txt
 - README.txt
 files: 
-- COPYING
 - History.txt
 - INSTALL
 - InstalledFiles
+- LICENCE.txt
 - Manifest.txt
 - README
 - README.txt
@@ -91,6 +92,7 @@ files:
 - test/data/test8.doc
 - test/data/test9.doc
 - test/test_parser.rb
+- .gemtest
 has_rdoc: true
 homepage: http://scm.ywesee.com/?p=rwv2/.git;a=summary
 licenses: []
@@ -122,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rwv2
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: "Wrapper for the wv2 library: parses Microsoft Word files"