gecoder-with-gecode 0.7.1-mswin32 → 0.8.0-mswin32

data/vendor/rust/rust/class.rb

@@ -41,7 +41,7 @@ module Rust
     # and a few other needed information.
     #
     # Don't call this function directly, use Namespace.add_cxx_class
-    def initialize(name, namespace, bindname = name.split("::").last ) # :notnew:
+    def initialize(name, namespace, bindname = name.gsub(/::([^<>]+)$/,'\1') ) # :notnew:
       super()
       
       @name = name
@@ -220,7 +220,7 @@ module Rust
         super
 
         @varname =
-        "f#{@parent.namespace.name.gsub("::","_")}_#{@parent.name}_#{@name}"
+        "f#{@parent.namespace.name.gsub("::","_")}_#{@parent.varname}_#{@name}"
 
         @definition_template = Templates["CxxMethodStub"]
         @initialization_template = Templates["MethodInitBinding"]

data/vendor/rust/rust/cxxclass.rb

@@ -44,8 +44,6 @@ module Rust
 
       @definition_template = Templates["CxxClassDefinitions"]
 
-      @varname = "#{complete_name.gsub("::", "_")}"
-      
       if @parent
         @ptrmap = @parent.ptrmap
         @function_free = @parent.function_free

data/vendor/rust/rust/function.rb

@@ -117,7 +117,7 @@ module Rust
       @parent = params[:parent]
       @optional_count = 0
 
-      @varname = "f#{@parent.varname}#{@name}"
+      @varname = "f#{@parent.varname}#{@name.gsub('::', '_').gsub(/[<>]/, '')}"
 
       @aliases = Set.new
       @variable = false # Variable arguments function
@@ -139,7 +139,7 @@ module Rust
       add_expansion 'function_parameters', 'ruby_parameters'
       add_expansion 'function_call', 'stub'
       add_expansion 'function_varname', 'varname'
-      add_expansion 'function_cname', '@name'
+      add_expansion 'function_cname', 'varname'
       add_expansion 'function_paramcount', 'paramcount'
       add_expansion 'function_bindname', '@bindname'
       add_expansion 'parent_varname', '@parent.varname'

data/vendor/rust/rust/templates/AttributeDefinition.rusttpl

@@ -5,7 +5,7 @@ VALUE set!parent_varname!!attribute_bindname!(VALUE self, VALUE val) {
   !c_class_name!* tmp = ruby2!class_varcname!Ptr(self);
   if ( ! tmp ) return Qnil;
   
-  tmp->!attribute_name! = ruby2!attribute_type!(val);
+  tmp->!attribute_name! = ruby2!attribute_convert_name!(val);
   return Qnil;
 }
 

data/vendor/rust/rust/templates/StandaloneClassDeclarations.rusttpl

@@ -4,4 +4,4 @@ typedef std::map<VALUE, !c_class_name!*> T!class_ptrmap!;
 extern T!class_ptrmap! !class_ptrmap!;
 static void !class_varname!_free(void *p);
 static void !class_varname!_mark(void *p);
-static void !class_varname!_free_map_entry(void *p);
+static void !class_varname!_free_map_entry(void *p);

data/vendor/rust/rust/templates/VariableFunctionCall.rusttpl

@@ -9,6 +9,6 @@
   
   if ( !ok )
   {
-	rb_raise(rb_eArgError, "Mantatory parameters missing");
+	rb_raise(rb_eArgError, "Mandatory parameters missing");
 	return Qnil;
   }

data/vendor/rust/rust/type.rb

@@ -41,7 +41,7 @@ module Rust
       
       end
       
-      @valid_name = @valid_name.gsub("::", "_").gsub(/&|\s/, "")
+      @valid_name = @valid_name.gsub("::", "_").gsub(/[&\s<>]/, "")
     end
     
     def pointer?

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: gecoder-with-gecode
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
-date: 2008-01-24 00:00:00 +01:00
+  version: 0.8.0
+date: 2008-04-10 00:00:00 +02:00
 summary: Ruby interface to Gecode, an environment for constraint programming.
 require_paths: 
 - lib
@@ -153,7 +153,7 @@ files:
 - tasks/svn.rake
 - tasks/rcov.rake
 - tasks/specs.rake
-- tasks/building.howto
+- tasks/dependencies.txt
 - specs/constraints
 - specs/constraints/boolean.rb
 - specs/constraints/bool_enum.rb
@@ -193,6 +193,7 @@ files:
 - vendor/gecode/win32/lib/libgecodeminimodel.dll
 - vendor/gecode/win32/lib/libgecodesearch.dll
 - vendor/gecode/win32/lib/libgecodeset.dll
+- vendor/gecode/win32/lib/libgecodesupport.dll
 - lib/gecode.dll
 test_files: 
 - specs/constraints/boolean.rb

data/tasks/building.howto

@@ -1,65 +0,0 @@
-Doing the full "release" task requires a number of gems:
-
-# To run the Rake scripts.
-rake
-
-# To generate the website.
-webgen
-coderay
-
-# To run the specs and produce a report for the website.
-rspec
-
-# To release files to RubyForge.
-meta_project
-rubyforge
-
-Crosscompiling the win32 binaries under Linux requires the following.
-
-http://www.libsdl.org/extras/win32/cross/README.txt
-http://www.mingw.org/
-http://www.profv.de/mingw_cross_env/
-http://www.mingw.org/MinGWiki/index.php/build%20a%20Win32%20x-compiler%20for%20Linux
-http://www.mingw.org/MinGWiki/index.php/BuildMingwCross
-
-Used the patch in the end of
-http://www.mingw.org/MinGWiki/index.php/build%20a%20Win32%20x-compiler%20for%20Linux
-but with
-BINUTILS_ARCHIVE="binutils-2.18.50-20071123-src.tar.gz"
-
-Generate rbconfig.rb by following:
-http://eigenclass.org/hiki.rb?cross+compiling+rcovrt
-
-In ext do:
-ruby -I win32 extconf.rb 
-make
-
-# ruby -Iwin32 -Iwin32/gecode-1.3.1/include/ -Iwin32/gecode-1.3.1/lib/ -I~/cross-compile/ruby-mingw32/lib/ruby/1.8/i386-mingw32/ extconf-win32.rb
-
-
-get mingw32 via modified install script (need at least gcc4.2 due to http://gcc.gnu.org/bugzilla/show_bug.cgi?id=27650)
-add bin to bath, make i386-* symbolic links: ruby -e "Dir['*'].each{ |x| %x{ln -s -T #{x} i386-#{x}} }"
-compile Ruby with cross-compile script
-comment out the read, write and select macros in ruby-mingw32/lib/ruby/1.8/i386-mingw32/win32/win32.h
-edit rbconfig.rb to use mingw32-g++ instead of mingw32-gcc in "LDSHARED".
-copy the produced rbconfig.rb file to ext/win32
-compile Gecode with the cross-compile script 
-move dlls to ext/, move includes to ext/win32 
-install pexports (included in mingw-utils)
-create definitions from MSVC dlls: ruby -e "Dir['*.dll'].each{ |x| %x{pexports #{x} > #{x.sub('dll', 'def')}} }"
-ruby -e "Dir['*.def'].each{ |x| %x{mingw32-dlltool -U -d #{x} > lib#{x.downcase.chomp('def')}a} }"
-ruby -Iwin32 extconf-win32.rb
-make
-
-# Building Gecode and Gecode/R dlls using mingw:
-get mingw32 via modified install script (need at least gcc4.2 due to http://gcc.gnu.org/bugzilla/show_bug.cgi?id=27650)
-add bin to bath, make i386-* symbolic links: ruby -e "Dir['*'].each{ |x| %x{ln -s -T #{x} i386-#{x}} }"
-compile Ruby with cross-compile script
-comment out the read, write and select macros in ruby-mingw32/lib/ruby/1.8/i386-mingw32/win32/win32.h
-edit rbconfig.rb to use mingw32-g++ instead of mingw32-gcc in "LDSHARED".
-copy the produced rbconfig.rb file to ext/win32
-compile Gecode with the cross-compile script 
-move dlls to ext/, move includes to ext/win32 
-ruby -Iwin32 extconf-win32.rb
-make
-move gecode.dll to lib/, put the Gecode dlls somewhere in the path