ruby-dcl 1.8.0 → 1.8.1

data/demo/rakuraku/miss/miss1.rb

@@ -3,7 +3,6 @@
 #   $Id$
 #
 
-require "narray"
 require "numru/dcl"
 
 include NumRu

data/demo/rakuraku/miss/miss2.rb

@@ -4,7 +4,6 @@
 #
 
 
-require "narray"
 require "numru/dcl"
 include NumRu
 include Math

data/demo/rakuraku/quick/quick1.rb

@@ -3,7 +3,6 @@
 #   $Id$
 #
 
-require "narray"
 require "numru/dcl"
 
 include NumRu

data/demo/rakuraku/quick/quick2.rb

@@ -3,7 +3,6 @@
 #   $Id$
 #
 
-require "narray"
 require "numru/dcl"
 
 include NumRu

data/demo/rakuraku/quick/quick3.rb

@@ -3,7 +3,6 @@
 #   $Id$
 #
 
-require "narray"
 require "numru/dcl"
 
 include NumRu

data/demo/rakuraku/quick/quick4.rb

@@ -3,7 +3,6 @@
 #   $Id$
 #
 
-require "narray"
 require "numru/dcl"
 
 include NumRu

data/demo/rakuraku/quick/quick5.rb

@@ -3,7 +3,6 @@
 #   $Id$
 #
 
-require "narray"
 require "numru/dcl"
 
 include NumRu

data/demo/rakuraku/u2d/u2d1.rb

@@ -4,7 +4,6 @@
 #
 
 
-require "narray"
 require "numru/dcl"
 include NumRu
 include Math

data/demo/rakuraku/u2d/u2d2.rb

@@ -4,7 +4,6 @@
 #
 
 
-require "narray"
 require "numru/dcl"
 include NumRu
 include Math

data/demo/rakuraku/u2d/u2d3.rb

@@ -4,7 +4,6 @@
 #
 
 
-require "narray"
 require "numru/dcl"
 include NumRu
 include Math

data/demo/rakuraku/u2d/u2d4.rb

@@ -4,7 +4,6 @@
 #
 
 
-require "narray"
 require "numru/dcl"
 include NumRu
 include Math

data/demo/rakuraku/u2d/u2d5.rb

@@ -4,7 +4,6 @@
 #
 
 
-require "narray"
 require "numru/dcl"
 include NumRu
 include Math

data/demo/rakuraku/u2d/u2d6.rb

@@ -4,7 +4,6 @@
 #
 
 
-require "narray"
 require "numru/dcl"
 include NumRu
 include Math

data/demo/rakuraku/u2d/u2d7.rb

@@ -4,7 +4,6 @@
 #
 
 
-require "narray"
 require "numru/dcl"
 include NumRu
 include Math

data/demo/rakuraku/uspack/uspac1.rb

@@ -4,7 +4,6 @@
 #
 
 
-require "narray"
 require "numru/dcl"
 include NumRu
 include Math

data/demo/rakuraku/uspack/uspac2.rb

@@ -4,7 +4,6 @@
 #
 
 
-require "narray"
 require "numru/dcl"
 include NumRu
 include Math

data/demo/rakuraku/uspack/uspac3.rb

@@ -4,7 +4,6 @@
 #
 
 
-require "narray"
 require "numru/dcl"
 include NumRu
 include Math

data/demo/rakuraku/uspack/uspac4.rb

@@ -4,7 +4,6 @@
 #
 
 
-require "narray"
 require "numru/dcl"
 include NumRu
 include Math

data/demo/rakuraku/uxyz/uxyz1.rb

@@ -4,7 +4,6 @@
 #
 
 
-require "narray"
 require "numru/dcl"
 include NumRu
 include Math

data/demo/rakuraku/uxyz/uxyz2.rb

@@ -4,7 +4,6 @@
 #
 
 
-require "narray"
 require "numru/dcl"
 include NumRu
 include Math

data/demo/rakuraku/uxyz/uxyz3.rb

@@ -4,7 +4,6 @@
 #
 
 
-require "narray"
 require "numru/dcl"
 include NumRu
 include Math

data/demo/rakuraku/uxyz/uxyz4.rb

@@ -4,7 +4,6 @@
 #
 
 
-require "narray"
 require "numru/dcl"
 include NumRu
 include Math

data/demo/rakuraku/uxyz/uxyz5.rb

@@ -4,7 +4,6 @@
 #
 
 
-require "narray"
 require "numru/dcl"
 include NumRu
 include Math

data/demo/rakuraku/uxyz/uxyz6.rb

@@ -4,7 +4,6 @@
 #
 
 
-require "narray"
 require "numru/dcl"
 include NumRu
 include Math

data/demo/rakuraku/uxyz/uxyz7.rb

@@ -4,7 +4,6 @@
 #
 
 
-require "narray"
 require "numru/dcl"
 include NumRu
 include Math

data/demo/rakuraku/uxyz/uxyz8.rb

@@ -4,7 +4,6 @@
 #
 
 
-require "narray"
 require "numru/dcl"
 include NumRu
 include Math

data/demo/rubydcloriginal/uemrkz1.rb

@@ -1,4 +1,3 @@
-require "narray"
 require "numru/dcl"
 include NumRu
 include NMath

data/ext/numru/extconf.rb

@@ -4,23 +4,58 @@ require "mkmf"
 require "rbconfig"
 so = RbConfig::CONFIG["DLEXT"]
 
-#if Gem.respond_to?(:find_files) and Gem.find_files("numru/narray/narray.h").length > 0
-#  narray_include = File.expand_path(File.dirname(Gem.find_files("numru/narray/narray.h")[0]))
-#  narray_lib = File.expand_path(File.dirname(Gem.find_files("numru/narray/narray." + so)[0]))
-#elsif Gem.respond_to?(:find_files) and Gem.find_files("narray.h").length > 0
+raise("Your gem is too old") unless Gem.respond_to?(:find_files) 
 
-if Gem.respond_to?(:find_files) and Gem.find_files("narray.h").length > 0
+env = ENV['NARRAY_TYPE']
+if env == "NArray" || env == "narray"
+  na_type = "narray"
+elsif env == "NumRu::NArray" || env == "numru-narray"
+  na_type = "numru-narray"
+elsif !env.nil?
+  raise "Unsupported value for the environment variable NARRAY_TYPE: #{env}"
+else
+  if Gem.find_files("narray.h").length > 0
+    na_type = "narray"
+  elsif Gem.find_files("numru/narray/narray.h").length > 0
+    na_type = "numru-narray"
+  end
+end
+
+case na_type
+when "narray"
   narray_include = File.expand_path(File.dirname(Gem.find_files("narray.h")[0]))
   narray_lib = File.expand_path(File.dirname(Gem.find_files("narray." + so)[0]))
-else
-  gem_home=(`gem environment GEM_HOME`).chomp
-  narray_dir = Dir.glob("#{gem_home}/gems/narray-*/ext/narray").sort[-1]
-  if narray_dir
-    narray_include = narray_lib = narray_dir
-  else
-    narray_include = narray_lib = [ $sitearchdir, $vendorarchdir]
+  File.open("../../lib/numru/dcl/narray_type.rb","w"){|f| f.puts <<EOS
+module NumRu
+  module DCL
+    SUPPORT_BIGMEM = false
   end
 end
+EOS
+  }
+when "numru-narray"
+  narray_include = File.expand_path(File.dirname(Gem.find_files("numru/narray/narray.h")[0]))
+  narray_lib = File.expand_path(File.dirname(Gem.find_files("numru/narray/narray." + so)[0]))
+  File.open("../../lib/numru/dcl/narray_type.rb","w"){|f| f.puts <<EOS
+module NumRu
+  module DCL
+    SUPPORT_BIGMEM = true
+  end
+end
+EOS
+  }
+end
+
+### disabled (for very old gem, perhaps <= 1.2) -->
+#  gem_home=(`gem environment GEM_HOME`).chomp
+#  narray_dir = Dir.glob("#{gem_home}/gems/narray-*/ext/narray").sort[-1]
+#  if narray_dir
+#    narray_include = narray_lib = narray_dir
+#  else
+#    narray_include = narray_lib = [ $sitearchdir, $vendorarchdir]
+#  end
+### <-- disabled
+
 dir_config('narray', narray_include, narray_lib)
 if ( ! ( have_header("narray.h") && have_header("narray_config.h") ) ) then
    print <<-EOS

data/ext/numru/init.c.default

@@ -125,12 +125,6 @@ Init_dcl_raw()
     mDCL = rb_define_module_under(mNumRu, "DCL");
     rb_define_const(mDCL, "DCLVERSION", rb_str_new2(DCLVersion));
 
-#ifdef NARRAY_BIGMEM
-    rb_define_const(mDCL, "SUPPORT_BIGMEM", Qtrue);
-#else
-    rb_define_const(mDCL, "SUPPORT_BIGMEM", Qfalse);
-#endif
-
     init_grph1_csgi(mDCL);
     init_grph1_scpack(mDCL);
     init_grph1_sgpack(mDCL);

data/lib/numru/dcl/dcl.rb

@@ -1,10 +1,23 @@
-begin
+require "numru/dcl/narray_type.rb"
+
+if NumRu::DCL::SUPPORT_BIGMEM
+  if Object.const_defined?(:NArray)
+    raise "Incompatibility found. The loaded NumRu::DCL was compiled to " +
+          "use NumRu::NArray, but here NArray has already been loaded."
+  end
   require "numru/narray"
-rescue LoadError
+else
+  if ( RUBY_VERSION>="1.9" ? NumRu.const_defined?(:NArray,false) :
+       NumRu.const_defined?(:NArray) )
+    raise "Incompatibility found. The loaded NumRu::DCL was compiled to " +
+          "use NArray, but here NumRu::NArray has already been loaded."
+  end
   require "narray"
 end
+
 require "numru/dcl_raw"
 
+
 module NumRu
     module DCL
       init_arg($0,ARGV) if DCLVERSION >= "5.3.2"

data/lib/numru/dcl/version.rb

@@ -1,5 +1,5 @@
 module NumRu
     module DCL
-      VERSION = "1.8.0"
+      VERSION = "1.8.1"
     end
 end

data/ruby-dcl.gemspec

@@ -5,11 +5,14 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'numru/dcl/version'
 
-genwrapper_extfile = Dir::glob('ext/**/*.c')
-genwrapper_libfile = Dir::glob('lib/**/*.rb')
-filelist = `git ls-files | egrep -v '^GenWrapper|^.git|^ToDo'`.split("\n")
-filelist.concat(genwrapper_extfile)
-filelist.concat(genwrapper_libfile)
+#old# filelist = `git ls-files | egrep -v '^GenWrapper|^.git|^ToDo'`.split("\n")
+#old# filelist.concat(Dir::glob('ext/**/*.c'))
+#old# filelist.concat(Dir::glob('lib/**/*.rb'))
+
+filelist = %w!ChangeLog Gemfile LICENSE.txt Rakefile ruby-dcl.gemspec!
+filelist.concat( Dir::glob("ext/**/*.c\0ext/**/*.rb\0ext/**/*.default") )
+filelist.concat( Dir::glob('lib/**/*.rb') )
+filelist.concat( Dir::glob("demo/**/*.rb\0demo/**/*.dat") )
 filelist.uniq!
 
 Gem::Specification.new do |spec|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-dcl
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - T. Horinouchi
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2016-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray
@@ -66,10 +66,9 @@ extensions:
 - ext/numru/extconf.rb
 extra_rdoc_files: []
 files:
-- ".ChangeLog.until20150318"
+- ChangeLog
 - Gemfile
 - LICENSE.txt
-- README
 - Rakefile
 - demo/gokuraku/hop/hop.rb
 - demo/gokuraku/jump/jump1.rb
@@ -135,6 +134,7 @@ files:
 - demo/grph2/udegpk/u2df09f.rb
 - demo/grph2/uipack/uipk01.rb
 - demo/grph2/uipack/uipk02.rb
+- demo/grph2/uipack/uipk03.rb
 - demo/grph2/ulpack/ulpk01.rb
 - demo/grph2/ulpack/ulpk01n.rb
 - demo/grph2/ulpack/ulpk02.rb
@@ -185,7 +185,6 @@ files:
 - demo/grph2/uxyzpk/uxyz08.rb
 - demo/grph2/uxyzpk/uxyz09.rb
 - demo/grph2/uxyzpk/uxyz10.rb
-- demo/grph2/ximage/MEMO
 - demo/grph2/ximage/tomsclm.dat
 - demo/grph2/ximage/ximg01.rb
 - demo/math1/clsplib/cslb01.rb
@@ -275,7 +274,6 @@ files:
 - ext/numru/grph2_uxpack.c
 - ext/numru/grph2_uypack.c
 - ext/numru/grph2_uzpack.c
-- ext/numru/init.c
 - ext/numru/init.c.default
 - ext/numru/math1_blklib.c
 - ext/numru/math1_chrlib.c
@@ -312,10 +310,6 @@ files:
 - lib/numru/dcl.rb
 - lib/numru/dcl/dcl.rb
 - lib/numru/dcl/version.rb
-- obsolete/README
-- obsolete/dcl_ext.html
-- obsolete/dcl_ext.rb
-- ruby-dcl-bigmem.gemspec
 - ruby-dcl.gemspec
 homepage: http://www.gfd-dennou.org/arch/ruby/products/ruby-dcl/
 licenses:
@@ -407,6 +401,7 @@ test_files:
 - demo/grph2/udegpk/u2df09f.rb
 - demo/grph2/uipack/uipk01.rb
 - demo/grph2/uipack/uipk02.rb
+- demo/grph2/uipack/uipk03.rb
 - demo/grph2/ulpack/ulpk01.rb
 - demo/grph2/ulpack/ulpk01n.rb
 - demo/grph2/ulpack/ulpk02.rb
@@ -457,7 +452,6 @@ test_files:
 - demo/grph2/uxyzpk/uxyz08.rb
 - demo/grph2/uxyzpk/uxyz09.rb
 - demo/grph2/uxyzpk/uxyz10.rb
-- demo/grph2/ximage/MEMO
 - demo/grph2/ximage/tomsclm.dat
 - demo/grph2/ximage/ximg01.rb
 - demo/math1/clsplib/cslb01.rb