[SCM] ruby-netcdf branch, master, updated. 17a746c4cce347676a620472b63a90e21f82ec08
The following commit has been merged in the master branch:
commit 2dcc65ebf064ca21de8db6dcb5250d0b64f30aa5
Author: Youhei SASAKI uwab...@gfd-dennou.org
Date: Thu Feb 17 18:29:55 2011 +0900
Imported Upstream version 0.6.5
diff --git a/ChangeLog b/ChangeLog
index 1adf9ce..cee61b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+Thu Feb 17 2011 T Horinouchi
+ * ruby-netcdf-0.6.5 released (relase tag: ruby-netcdf-0_6_5)
+Thu Feb 17 2011 T Horinouchi
+ * extconf.rb: Debug to have the --disable-opendap option really work
+Sat Feb 12 2011 T Horinouchi
+ * ruby-netcdf-0.6.5 preview release.
+Thu Dec 23 2010 T Koshiro
+ * test/aref_aset.rb : updated for Ruby 1.9.2
+ * lib/netcdf.rb: NetCDF.clean_tmpfile : lambda - proc
+ * verified that all test programs work fine with Ruby 1.9.2.
+
+Tue Dec 14 2010 T Koshiro
+ * netcdfraw.c : nctype2natype : char* - const char*
+ * test/aref_aset.rb, test/factor_offset.rb : bug fix.
+
+Mon Dec 13 2010 T Koshiro
+ * netcdfraw.c : patch for Ruby 1.9.2
+ - by S Kouketsu (dennou-ruby:003191)
+ - by T Koshiro (dennou-ruby:003226)
+
Mon Mar 15 2010 T Horinouchi
* ruby-netcdf-0.6.4 released (relase tag: ruby-netcdf-0_6_4)
diff --git a/extconf.rb b/extconf.rb
index ff42f7e..da90b7c 100644
--- a/extconf.rb
+++ b/extconf.rb
@@ -27,8 +27,8 @@ elsif xsystem(opendap-config --libs)
prefix_dods = `opendap-config --prefix`.gsub(/\n/, )
end
-if (enable_config('opendap',true) ( xsystem(opendap-config --libs)) ||
- xsystem(ncdap-config --libs) )
+if (enable_config('opendap',true) ( xsystem(opendap-config --libs) ||
+ xsystem(ncdap-config --libs) ) )
dir_config(libncdods,prefix_dods)
diff --git a/lib/netcdf.rb b/lib/netcdf.rb
index 3c26da4..6ff50bf 100644
--- a/lib/netcdf.rb
+++ b/lib/netcdf.rb
@@ -70,7 +70,7 @@ module NumRu
class NetCDF
def clean_tmpfile(path)
- lambda{
+ proc {
print removing , path, ... if $DEBUG
if File.exist?(path)
File.unlink(path)
diff --git a/netcdfraw.c b/netcdfraw.c
index c8e9797..6ecc045 100644
--- a/netcdfraw.c
+++ b/netcdfraw.c
@@ -6,16 +6,22 @@
/* for compatibility with ruby 1.6 */
#ifndef RSTRING_PTR
-#define RSTRING_PTR(a) (RSTRING(a)-ptr)
+#define RSTRING_PTR(s) (RSTRING(s)-ptr)
#endif
#ifndef RSTRING_LEN
-#define RSTRING_LEN(a) (RSTRING(a)-len)
+#define RSTRING_LEN(s) (RSTRING(s)-len)
#endif
#ifndef RARRAY_PTR
-#define RARRAY_PTR(s) (RARRAY(s)-ptr)
+#define RARRAY_PTR(a) (RARRAY(a)-ptr)
#endif
#ifndef RARRAY_LEN
-#define RARRAY_LEN(s) (RARRAY(s)-len)
+#define RARRAY_LEN(a) (RARRAY(a)-len)
+#endif
+#ifndef StringValueCStr
+#define StringValueCStr(s) STR2CSTR(s)
+#endif
+#ifndef SafeStringValue
+#define SafeStringValue(s) Check_SafeStr(s)
#endif
/* Data to NArray */
@@ -345,7 +351,7 @@ NetCDF_free(struct Netcdf *Netcdffile)
}
static VALUE
-err_status2class(status)
+err_status2class(int status)
{
if(NC_ISSYSERR(status)){
return(rb_eNetcdfSyserr);
@@ -421,7 +427,7 @@ err_status2class(status)
}
}
-static char*
+static const char*
nctype2natype(int nctype){
switch(nctype){
case NC_CHAR:
@@ -677,7 +683,7 @@ NetCDF_put_att_numeric(int ncid, char *name,VALUE
value,VALUE atttype, int varid
ptr = na_val-ptr;
switch(na_typecode){
case NA_BYTE:
- status = nc_put_att_uchar(ncid,varid,name,NC_BYTE,len,ptr);
+ status = nc_put_att_uchar(ncid,varid,name,NC_BYTE,len,(unsigned char
*)ptr);
break;
case NA_SINT:
status = nc_put_att_short(ncid,varid,name,NC_SHORT,len,(short *)ptr);
@@ -794,7 +800,7 @@ NetCDF_def_var(VALUE file,VALUE var_name,VALUE
vartype,VALUE dimensions)
switch(TYPE(RARRAY_PTR(dimensions)[c_ndims-1-i])){
case T_STRING:
Check_Type(RARRAY_PTR(dimensions)[c_ndims-1-i],T_STRING);
- c_dim_name=STR2CSTR(RARRAY_PTR(dimensions)[c_ndims-1-i]);
+ c_dim_name=StringValueCStr(RARRAY_PTR(dimensions)[c_ndims-1-i]);
status=nc_inq_dimid(ncid,c_dim_name,dimidp);
if(status != NC_NOERR) NC_RAISE(status);
c_dimids[i]=dimidp;
@@ -1021,7 +1027,7 @@ NetCDF_open(VALUE mod,VALUE filename,VALUE omode)
VALUE retval;
Check_Type(filename,T_STRING);
- Check_SafeStr(filename);
+ SafeStringValue(filename);
c_filename=RSTRING_PTR(filename);
Check_Type(omode,T_FIXNUM);
c_omode=NUM2INT(omode);
@@ -1044,7 +1050,7 @@ NetCDF_create(VALUE mod,VALUE filename,VALUE cmode)
struct Netcdf *ncfile;
Check_Type(filename,T_STRING);
- Check_SafeStr(filename);
+ SafeStringValue(filename);
c_filename=RSTRING_PTR(filename);
Check_Type(cmode,T_FIXNUM);
c_cmode=NUM2INT(cmode);
@@ -1194,7 +1200,7 @@ NetCDF_dim_name(VALUE Dim,VALUE dimension_newname)
ncid=Netcdf_dim-ncid;
dimid=Netcdf_dim-dimid;
Check_Type(dimension_newname,T_STRING);
- c_dim_name =
[SCM] ruby-netcdf branch, master, updated. 17a746c4cce347676a620472b63a90e21f82ec08
The following commit has been merged in the master branch: commit 8de12d9b211cacf2d1f1409c564029d89cb6bf40 Merge: 2fecb9d7880ea9d5f2f70ee317296d5893b0e1e3 2dcc65ebf064ca21de8db6dcb5250d0b64f30aa5 Author: Youhei SASAKI uwab...@gfd-dennou.org Date: Thu Feb 17 18:29:56 2011 +0900 Merge commit 'upstream/0.6.5' -- Ruby interface of NetCDF library ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[SCM] ruby-netcdf branch, master, updated. 17a746c4cce347676a620472b63a90e21f82ec08
The following commit has been merged in the master branch:
commit 17a746c4cce347676a620472b63a90e21f82ec08
Author: Youhei SASAKI uwab...@gfd-dennou.org
Date: Thu Feb 17 18:32:29 2011 +0900
remove unneeded patch: committed upstream
Signed-off-by: Youhei SASAKI uwab...@gfd-dennou.org
diff --git a/debian/changelog b/debian/changelog
index a0ccfc0..e03ec8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ruby-netcdf (0.6.4-1) unstable; urgency=low
+ruby-netcdf (0.6.5-1) unstable; urgency=low
* Initial Release (Closes: #542144)
diff --git a/debian/patches/ChangeExtconf b/debian/patches/ChangeExtconf
deleted file mode 100644
index 16168f9..000
--- a/debian/patches/ChangeExtconf
+++ /dev/null
@@ -1,12 +0,0 @@
ruby-netcdf.orig/extconf.rb
-+++ ruby-netcdf/extconf.rb
-@@ -1,7 +1,7 @@
- require mkmf
-
--dir_config('narray',$sitearchdir,$sitearchdir)
--dir_config('netcdf','/usr/local')
-+dir_config('narray',$archdir,$archdir)
-+dir_config('netcdf','/usr')
-
- if ( ! ( have_header(narray.h) have_header(narray_config.h) ) ) then
- print EOS
diff --git a/debian/patches/SupportRuby1.9.2 b/debian/patches/SupportRuby1.9.2
deleted file mode 100644
index 59a884f..000
--- a/debian/patches/SupportRuby1.9.2
+++ /dev/null
@@ -1,213 +0,0 @@
ruby-netcdf.orig/ChangeLog
-+++ ruby-netcdf/ChangeLog
-@@ -1,3 +1,8 @@
-+Mon Dec 13 2010 T Koshiro
-+ * netcdfraw.c : patch for Ruby 1.9.2
-+- by S Kouketsu (dennou-ruby:003191)
-+- by T Koshiro (dennou-ruby:003226)
-+
- Mon Mar 15 2010 T Horinouchi
- * ruby-netcdf-0.6.4 released (relase tag: ruby-netcdf-0_6_4)
-
ruby-netcdf.orig/netcdfraw.c
-+++ ruby-netcdf/netcdfraw.c
-@@ -6,16 +6,22 @@
-
- /* for compatibility with ruby 1.6 */
- #ifndef RSTRING_PTR
--#define RSTRING_PTR(a) (RSTRING(a)-ptr)
-+#define RSTRING_PTR(s) (RSTRING(s)-ptr)
- #endif
- #ifndef RSTRING_LEN
--#define RSTRING_LEN(a) (RSTRING(a)-len)
-+#define RSTRING_LEN(s) (RSTRING(s)-len)
- #endif
- #ifndef RARRAY_PTR
--#define RARRAY_PTR(s) (RARRAY(s)-ptr)
-+#define RARRAY_PTR(a) (RARRAY(a)-ptr)
- #endif
- #ifndef RARRAY_LEN
--#define RARRAY_LEN(s) (RARRAY(s)-len)
-+#define RARRAY_LEN(a) (RARRAY(a)-len)
-+#endif
-+#ifndef StringValueCStr
-+#define StringValueCStr(s) STR2CSTR(s)
-+#endif
-+#ifndef SafeStringValue
-+#define SafeStringValue(s) Check_SafeStr(s)
- #endif
-
- /* Data to NArray */
-@@ -345,7 +351,7 @@
- }
-
- static VALUE
--err_status2class(status)
-+err_status2class(int status)
- {
- if(NC_ISSYSERR(status)){
- return(rb_eNetcdfSyserr);
-@@ -425,17 +431,17 @@
- nctype2natype(int nctype){
- switch(nctype){
- case NC_CHAR:
--return(char);
-+return((char *)char);
- case NC_BYTE:
--return(byte);
-+return((char *)byte);
- case NC_SHORT:
--return(sint);
-+return((char *)sint);
- case NC_INT:
--return(int);
-+return((char *)int);
- case NC_FLOAT:
--return(sfloat);
-+return((char *)sfloat);
- case NC_DOUBLE:
--return(float);
-+return((char *)float);
- default:
- rb_raise(rb_eNetcdfError, No such netcdf type number %d\n,nctype);
- }
-@@ -677,7 +683,7 @@
- ptr = na_val-ptr;
- switch(na_typecode){
- case NA_BYTE:
-- status = nc_put_att_uchar(ncid,varid,name,NC_BYTE,len,ptr);
-+ status = nc_put_att_uchar(ncid,varid,name,NC_BYTE,len,(unsigned char
*)ptr);
- break;
- case NA_SINT:
- status = nc_put_att_short(ncid,varid,name,NC_SHORT,len,(short *)ptr);
-@@ -794,7 +800,7 @@
- switch(TYPE(RARRAY_PTR(dimensions)[c_ndims-1-i])){
- case T_STRING:
- Check_Type(RARRAY_PTR(dimensions)[c_ndims-1-i],T_STRING);
-- c_dim_name=STR2CSTR(RARRAY_PTR(dimensions)[c_ndims-1-i]);
-+ c_dim_name=StringValueCStr(RARRAY_PTR(dimensions)[c_ndims-1-i]);
- status=nc_inq_dimid(ncid,c_dim_name,dimidp);
- if(status != NC_NOERR) NC_RAISE(status);
- c_dimids[i]=dimidp;
-@@ -1021,7 +1027,7 @@
- VALUE retval;
-
- Check_Type(filename,T_STRING);
-- Check_SafeStr(filename);
-+ SafeStringValue(filename);
- c_filename=RSTRING_PTR(filename);
- Check_Type(omode,T_FIXNUM);
- c_omode=NUM2INT(omode);
-@@ -1044,7 +1050,7 @@
- struct Netcdf *ncfile;
-
- Check_Type(filename,T_STRING);
-- Check_SafeStr(filename);
-+ SafeStringValue(filename);
- c_filename=RSTRING_PTR(filename);
- Check_Type(cmode,T_FIXNUM);
- c_cmode=NUM2INT(cmode);
-@@ -1194,7 +1200,7 @@
- ncid=Netcdf_dim-ncid;
- dimid=Netcdf_dim-dimid;
- Check_Type(dimension_newname,T_STRING);
-- c_dim_name = STR2CSTR(dimension_newname);
-+ c_dim_name = StringValueCStr(dimension_newname);
-
- status = nc_rename_dim(ncid,dimid,c_dim_name);
- if(status !=NC_NOERR) NC_RAISE(status);
-@@ -1268,19 +1274,17 @@
- Data_Get_Struct(Att,struct NetCDFAtt,Netcdf_att);
- ncid=Netcdf_att-ncid;
- varid=Netcdf_att-varid;
-- c_att_name=ALLOCA_N(char,NC_MAX_NAME);
-- c_new_att_name=ALLOC_N(char,NC_MAX_NAME);
-
- c_att_name=Netcdf_att-name;
