rtaglib 0.2.3 → 0.3.0

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.3.0 / 2009-08-16
+* New build configuration, based on Rakefiles instead of extconf.rb . Allows to compile cleanly on mswin32, mingw and *nix
+* Input string should be created with TagLib::String.new. Allows to insert UTF8 or Latin-1.
+
 === 0.2.3 / 2009-05-20
 
 * Better configuration for compilation on *nix archs.

data/Manifest.txt

@@ -2,24 +2,99 @@ History.txt
 Manifest.txt
 README.txt
 Rakefile
-ext/tagfile/extconf.rb
+data/440Hz-5sec.flac
+data/440Hz-5sec.mp3
+data/440Hz-5sec.mpc
+data/440Hz-5sec.ogg
+data/440Hz-5sec.wv
+data/test_jason.mp3
+data/test_jason.ogg
+ext/Rakefile
+ext/tagfile/Rakefile.rb
+ext/tagfile/rake_ext_conf.rb
 ext/tagfile/tagfile.c
-ext/taglib/extconf.rb
-ext/taglib/taglib.cxx
+ext/taglib/Rakefile.rb
+ext/taglib/rake_ext_conf.rb
+ext/taglib/taglib-mswin32/bin/tag.dll
+ext/taglib/taglib-mswin32/bin/tag_c.dll
+ext/taglib/taglib-mswin32/bin/tag_cd.dll
+ext/taglib/taglib-mswin32/bin/tagd.dll
+ext/taglib/taglib-mswin32/bin/taglib-config
+ext/taglib/taglib-mswin32/include/taglib/apefooter.h
+ext/taglib/taglib-mswin32/include/taglib/apeitem.h
+ext/taglib/taglib-mswin32/include/taglib/apetag.h
+ext/taglib/taglib-mswin32/include/taglib/attachedpictureframe.h
+ext/taglib/taglib-mswin32/include/taglib/audioproperties.h
+ext/taglib/taglib-mswin32/include/taglib/commentsframe.h
+ext/taglib/taglib-mswin32/include/taglib/fileref.h
+ext/taglib/taglib-mswin32/include/taglib/flacfile.h
+ext/taglib/taglib-mswin32/include/taglib/flacproperties.h
+ext/taglib/taglib-mswin32/include/taglib/generalencapsulatedobjectframe.h
+ext/taglib/taglib-mswin32/include/taglib/id3v1genres.h
+ext/taglib/taglib-mswin32/include/taglib/id3v1tag.h
+ext/taglib/taglib-mswin32/include/taglib/id3v2extendedheader.h
+ext/taglib/taglib-mswin32/include/taglib/id3v2footer.h
+ext/taglib/taglib-mswin32/include/taglib/id3v2frame.h
+ext/taglib/taglib-mswin32/include/taglib/id3v2framefactory.h
+ext/taglib/taglib-mswin32/include/taglib/id3v2header.h
+ext/taglib/taglib-mswin32/include/taglib/id3v2synchdata.h
+ext/taglib/taglib-mswin32/include/taglib/id3v2tag.h
+ext/taglib/taglib-mswin32/include/taglib/mpcfile.h
+ext/taglib/taglib-mswin32/include/taglib/mpcproperties.h
+ext/taglib/taglib-mswin32/include/taglib/mpegfile.h
+ext/taglib/taglib-mswin32/include/taglib/mpegheader.h
+ext/taglib/taglib-mswin32/include/taglib/mpegproperties.h
+ext/taglib/taglib-mswin32/include/taglib/oggfile.h
+ext/taglib/taglib-mswin32/include/taglib/oggflacfile.h
+ext/taglib/taglib-mswin32/include/taglib/oggpage.h
+ext/taglib/taglib-mswin32/include/taglib/oggpageheader.h
+ext/taglib/taglib-mswin32/include/taglib/relativevolumeframe.h
+ext/taglib/taglib-mswin32/include/taglib/speexfile.h
+ext/taglib/taglib-mswin32/include/taglib/speexproperties.h
+ext/taglib/taglib-mswin32/include/taglib/tag.h
+ext/taglib/taglib-mswin32/include/taglib/tag_c.h
+ext/taglib/taglib-mswin32/include/taglib/taglib.h
+ext/taglib/taglib-mswin32/include/taglib/taglib_export.h
+ext/taglib/taglib-mswin32/include/taglib/tbytevector.h
+ext/taglib/taglib-mswin32/include/taglib/tbytevectorlist.h
+ext/taglib/taglib-mswin32/include/taglib/textidentificationframe.h
+ext/taglib/taglib-mswin32/include/taglib/tfile.h
+ext/taglib/taglib-mswin32/include/taglib/tlist.h
+ext/taglib/taglib-mswin32/include/taglib/tlist.tcc
+ext/taglib/taglib-mswin32/include/taglib/tmap.h
+ext/taglib/taglib-mswin32/include/taglib/tmap.tcc
+ext/taglib/taglib-mswin32/include/taglib/trueaudiofile.h
+ext/taglib/taglib-mswin32/include/taglib/trueaudioproperties.h
+ext/taglib/taglib-mswin32/include/taglib/tstring.h
+ext/taglib/taglib-mswin32/include/taglib/tstringlist.h
+ext/taglib/taglib-mswin32/include/taglib/uniquefileidentifierframe.h
+ext/taglib/taglib-mswin32/include/taglib/unknownframe.h
+ext/taglib/taglib-mswin32/include/taglib/unsynchronizedlyricsframe.h
+ext/taglib/taglib-mswin32/include/taglib/urllinkframe.h
+ext/taglib/taglib-mswin32/include/taglib/vorbisfile.h
+ext/taglib/taglib-mswin32/include/taglib/vorbisproperties.h
+ext/taglib/taglib-mswin32/include/taglib/wavpackfile.h
+ext/taglib/taglib-mswin32/include/taglib/wavpackproperties.h
+ext/taglib/taglib-mswin32/include/taglib/xingheader.h
+ext/taglib/taglib-mswin32/include/taglib/xiphcomment.h
+ext/taglib/taglib-mswin32/lib/pkgconfig/taglib_c.pc
+ext/taglib/taglib-mswin32/lib/tag.lib
+ext/taglib/taglib-mswin32/lib/tag_c.lib
+ext/taglib/taglib_i386-mingw32.source
+ext/taglib/taglib_i386-mswin32.source
+ext/taglib/taglib_x86_64-linux.source
 lib/TagLib.rb
 lib/TagLib_doc.rb
+lib/rtaglib_mswin32.rb
+lib/tagfile.rb
 swig/Doxyfile
 swig/Rakefile
-swig/extconf.rb
+swig/TagLib_doc.rb
 swig/make_doc.rb
 swig/process_cxx.rb
+swig/rake_ext_conf.rb
 swig/taglib.i
 swig/test.rb
-test/data/440Hz-5sec.flac
-test/data/440Hz-5sec.mp3
-test/data/440Hz-5sec.mpc
-test/data/440Hz-5sec.ogg
-test/data/440Hz-5sec.wv
 test/test_read.rb
 test/test_taglib.rb
 test/test_write.rb

data/Rakefile

@@ -2,7 +2,16 @@
 # -*- ruby -*-
 require 'rake/testtask'
 require 'rake/rdoctask'
+require 'rubygems'
+require 'fileutils'
+require 'hoe'
+$:.unshift("./ext")
+$:.unshift("./lib")
+
 
+
+
+taglib_source="taglib_#{PLATFORM}.source"
 desc "compile and test"
 task :default => [:compile, :test]
 
@@ -12,15 +21,16 @@ BASE_TAGLIB=File.dirname(__FILE__)+"/ext/taglib"
 
 
 
-file "#{BASE_TAGFILE}/tagfile.so" => ["#{BASE_TAGFILE}/tagfile.c", "#{BASE_TAGFILE}/Makefile"] do |t|
-	system %(cd "#{BASE_TAGFILE}" && make)
+file "#{BASE_TAGFILE}/tagfile.so" => ["#{BASE_TAGFILE}/tagfile.c", "#{BASE_TAGFILE}/Rakefile.rb"] do |t|
+	system %(cd "#{BASE_TAGFILE}" && rake)
 end
 
-file "#{BASE_TAGLIB}/taglib.so" => ["#{BASE_TAGLIB}/taglib.cxx", "#{BASE_TAGLIB}/Makefile"] do |t|
-	system %(cd "#{BASE_TAGLIB}" && make)
+file "#{BASE_TAGLIB}/TagLib.so" => ["#{BASE_TAGLIB}/#{taglib_source}", "#{BASE_TAGLIB}/rake_ext_conf.rb", "#{BASE_TAGLIB}/Rakefile.rb"] do |t|
+	system %(cd "#{BASE_TAGLIB}" && rake)
 end
+
 if system %(which swig)
-    file "#{BASE_TAGLIB}/taglib.cxx" => ["swig/taglib.i","swig/extconf.rb"] do |t|
+    file "#{BASE_TAGLIB}/#{taglib_source}" => ["swig/taglib.i", "swig/rake_ext_conf.rb", "swig/Rakefile"] do |t|
     system %{cd swig && rake}
     end
 end
@@ -28,20 +38,16 @@ end
 file "lib/TagLib_doc.rb" => "swig/TagLib_doc.rb" do |t|
     system %(cd swig && rake copy)
 end
-exts=[BASE_TAGFILE,BASE_TAGLIB]
-exts.each {|base|
-    file "#{base}/Makefile" => ["#{base}/extconf.rb"] do |t|
-    system %(cd "#{base}" && ruby "extconf.rb")
-end
-}
 
 desc "compile the extensions"
-task :compile => ["#{BASE_TAGFILE}/tagfile.so","#{BASE_TAGLIB}/taglib.so"]
-
-Rake::TestTask.new do |t|
-  t.libs << "ext"
-  t.test_files = FileList['test/test*.rb']
-  t.verbose = true
+task :compile => ["#{BASE_TAGFILE}/tagfile.so","#{BASE_TAGLIB}/TagLib.so"]
+
+task :clean do |t|
+	FileUtils.rm_rf("pkg")
+	FileUtils.rm_rf("doc")
+	[BASE_TAGFILE, BASE_TAGLIB,"swig"].each{|dir|
+		system %(cd #{dir} && rake clean)
+	}
 end
 
 Rake::RDocTask.new(:rdoc) do |rdoc|
@@ -50,11 +56,6 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files=["README.txt", "ext/tagfile/tagfile.c", "lib/TagLib_doc.rb"]
 end
 
-require 'rubygems'
-require 'hoe'
-$LOAD_PATH << "./ext"
-require "./lib/TagLib.rb"
-
 task :svn => [:default] do |t|
     system %(cd #{File.dirname(__FILE__)})
     system %(svn commit)
@@ -62,10 +63,12 @@ task :svn => [:default] do |t|
 end
 
 
+require 'TagLib'
+Hoe.spec 'rtaglib' do |p|
 
-Hoe.new('rtaglib', TagLib::VERSION) do |p|
-  p.developer('cdx', 'clbustos@surnet.cl')
-  p.author="Claudio Bustos"
+p.name="rtaglib"
+p.version=TagLib::VERSION
+  p.developer('cdx', 'clbustos@gmail.com')
   p.summary="Bindings for taglib"
   p.description= <<-EOF
   Rtaglib is a binding for Taglib's library (http://developer.kde.org/~wheeler/taglib.html).
@@ -78,9 +81,9 @@ EOF
 p.url = "http://rtaglib.rubyforge.org/"
 p.test_globs=['test/test_*.rb']
 p.remote_rdoc_dir = '' # Release to root
-p.rdoc_pattern=/(lib\/TagLib_doc.rb|ext\/tagfile\/.*\.c|\.txt)/
+#p.rdoc_pattern=/(lib\/TagLib_doc.rb|ext\/tagfile\/.*\.c|\.txt)/
 #p.clean_globs = ['ext/taglib/*.log','ext/taglib/*.o','ext/taglib/*.so', 'ext/tagfile/*.log','ext/tagfile/*.o','ext/tagfile/*.so']
 #p.platform = Gem::Platform::RUBY
-p.spec_extras= {'requirements'=>'libtag >=1.5', 'autorequire'=>'', 'extensions' => ['ext/tagfile/extconf.rb','ext/taglib/extconf.rb']}
+p.spec_extras= {'requirements'=>'libtag >=1.5', 'extensions' => ["ext/Rakefile"]}
 end
 # vim: syntax=Ruby

data/ext/Rakefile

@@ -0,0 +1,10 @@
+require 'rake'
+task :default=>["tagfile/tagfile.so","taglib/TagLib.so"]
+
+file "tagfile/tagfile.so" => ["tagfile/Rakefile.rb"] do |t|
+	system %(cd tagfile && rake)
+end
+
+file "taglib/TagLib.so" => ["taglib/Rakefile.rb"] do |t|
+	system %(cd taglib && rake)
+end

data/ext/tagfile/Rakefile.rb

@@ -0,0 +1,42 @@
+require 'rake'
+require 'fileutils'
+
+c_file="tagfile.c"
+ext_file="tagfile.so"
+
+
+if PLATFORM=~/mswin32/
+	task :default => [:compile, :manifest]
+else
+	task :default => [:compile]
+end
+
+task :compile => ["Makefile",  c_file] do |t|
+	if PLATFORM=~/mswin32/
+		system %(nmake)
+	else
+		system %(make)
+	end
+end
+
+file "Makefile" => ["rake_ext_conf.rb"] do |t|
+	system %(ruby rake_ext_conf.rb)
+end
+
+
+task :manifest => [ext_file, "#{ext_file}.manifest"] do |t|
+	system %(mt.exe -manifest #{ext_file}.manifest -outputresource:#{ext_file};2)
+end
+
+task :clean do |t|
+	%w{so o log exp def}.each{|g|
+		Dir.glob("*.#{g}").each {|f|
+			FileUtils.rm(f)
+		}
+	}
+	if File.exists? "Makefile"
+		system %(make clean)
+		system %(nmake clean)
+	end	
+	FileUtils.rm("Makefile") if File.exists? "Makefile"
+end

data/ext/tagfile/rake_ext_conf.rb

@@ -0,0 +1,29 @@
+require 'mkmf'
+puts "Building for #{PLATFORM}"
+if(PLATFORM=~/mswin32/)
+	package_dir=File.expand_path(File.dirname(__FILE__)+"/..")	
+	prefix=package_dir+"/taglib/taglib-mswin32"
+	puts "Building for MsWin32"
+	$CFLAGS+= " -I\"#{prefix}\\include\" -I\"#{prefix}\\include\\taglib\""
+        $LDFLAGS += " -link -libpath:\"#{prefix}\\lib\" "
+
+elsif(PLATFORM=~/mingw/)
+	puts "Building for MinGW"
+	$libs = append_library($libs, "stdc++")
+	$libs = append_library($libs, "supc++")
+	$CFLAGS= " -I/mingw/include/taglib"
+else
+    taglib_config = find_executable("taglib-config")
+    if taglib_config
+        prefix = `#{taglib_config} --prefix`.strip
+        $CFLAGS += " -I#{prefix}/include"
+        $LDFLAGS += " -L#{prefix}/lib"
+    else
+        prefix = "/usr"
+	end
+	$libs = append_library($libs, "supc++")
+    $CFLAGS += " -I#{prefix}/include/taglib"
+end
+if have_library("tag_c")
+    create_makefile("tagfile")
+end

data/ext/tagfile/tagfile.c

@@ -2,15 +2,17 @@
 #include <taglib/tag_c.h>
 #define GET_TL_TAG(self,tag) \
 taglib_t *tl; \
+TagLib_Tag *tag; \
 Data_Get_Struct(self, taglib_t, tl); \
 if(NULL==tl->file || tl->open==0) {tl_closed();} \
-TagLib_Tag *tag=tl->tag;
+tag=tl->tag;
 
 #define GET_TL_CHECK(self,file) \
 taglib_t *tl; \
+TagLib_File *file; \
 Data_Get_Struct(self, taglib_t, tl); \
 if(NULL==tl->file || tl->open==0) {tl_closed();} \
-TagLib_File *file=tl->file;
+file=tl->file;
 
 
 typedef struct {
@@ -129,7 +131,9 @@ cTagFileFile_new(int argc, VALUE * argv, VALUE class)
     TagLib_File    *tlf;
     VALUE           path;
     VALUE           file_type;
-    char           *cpath;
+	VALUE           c_argv[2];
+	VALUE tdata;
+     char           *cpath;
     rb_scan_args(argc, argv, "11", &path, &file_type);
     Check_Type(path, T_STRING);
     SafeStringValue(path);
@@ -155,8 +159,7 @@ cTagFileFile_new(int argc, VALUE * argv, VALUE class)
 	if (NULL == tl->tag) {
 	    rb_raise(eBadAudioProperties, "Bad Audio");
 	}
-	VALUE           c_argv[2];
-	VALUE           tdata =
+	tdata =
 	    Data_Wrap_Struct(class, 0, _tag_lib_file_free, tl);
 	c_argv[0] = path;
 	c_argv[1] = file_type;
@@ -199,14 +202,15 @@ VALUE
 _get_string(VALUE self, char *(*func) ())
 {
     VALUE           string;
+    char           *cstring;
     GET_TL_TAG(self, tag);
-    char           *cstring = func(tag);
+    cstring = func(tag);
     string = rb_str_new2(cstring);
     taglib_tag_free_strings();
     return string;
 }
 
-VALUE
+VALUE 
 _get_uint(VALUE self, unsigned int (*func) ())
 {
     GET_TL_TAG(self, tag);

data/ext/taglib/Rakefile.rb

@@ -0,0 +1,48 @@
+require 'rake'
+require 'fileutils'
+c_source="taglib_#{PLATFORM}.source"
+cpp_file="taglib_#{PLATFORM}.cxx"
+
+if PLATFORM=~/mswin32/
+	task :default => [:compile, :manifest]
+else
+	task :default => [:compile]
+end
+
+task :compile => ["Makefile",  cpp_file] do |t|
+	if PLATFORM=~/mswin32/
+		system %(nmake)
+	else
+		system %(make)
+	end
+end
+
+file cpp_file => c_source do |t|
+	Dir.glob("*.cpp").each {|f|
+		FileUtils.rm(f)
+	}
+	FileUtils.cp(c_source, cpp_file)
+end
+
+
+file "Makefile" => ["rake_ext_conf.rb", cpp_file] do |t|
+	system %(ruby rake_ext_conf.rb)
+end
+
+
+task :manifest => ["TagLib.so", "TagLib.so.manifest"] do |t|
+	system %(mt.exe -manifest TagLib.so.manifest -outputresource:TagLib.so;2)
+end
+
+task :clean do |t|
+	%w{so o log exp def cxx}.each{|g|
+		Dir.glob("*.#{g}").each {|f|
+			FileUtils.rm(f)
+		}
+	}
+	if File.exists? "Makefile"
+		system %(make clean)
+		system %(nmake clean)
+	end	
+	FileUtils.rm("Makefile") if File.exists? "Makefile"
+end

data/ext/taglib/rake_ext_conf.rb

@@ -0,0 +1,33 @@
+require 'mkmf'
+if(PLATFORM=~/mswin32/)
+	if(File.expand_path(File.dirname(__FILE__))=~/swig/)
+	package_dir=File.expand_path(File.dirname(__FILE__)+"/..")	
+	prefix=package_dir+"/ext/taglib/taglib-mswin32"
+	else
+	prefix="./taglib-mswin32"
+	end
+	puts "Building for MsWin32"
+	$CFLAGS+= " -I\"#{prefix}\\include\" -I\"#{prefix}\\include\\taglib\""
+        $LDFLAGS += " -link -libpath:\"#{prefix}\\lib\" "
+
+elsif(PLATFORM=~/mingw/)
+	puts "Building for MinGW"
+	$libs = append_library($libs, "stdc++")
+	$libs = append_library($libs, "supc++")
+	$CFLAGS= " -I/mingw/include/taglib"
+else
+    puts "Building for other architecture"
+    taglib_config = find_executable("taglib-config")
+    if taglib_config
+        prefix = `#{taglib_config} --prefix`.strip
+        $CFLAGS += " -I#{prefix}/include"
+        $LDFLAGS += " -L#{prefix}/lib"
+    else
+        prefix = "/usr"
+	end
+	$libs = append_library($libs, "supc++")
+    $CFLAGS += " -I#{prefix}/include/taglib"
+end
+if have_library("tag")
+    create_makefile("TagLib")
+end