DrQueueRubyBindings 0.2 → 0.3

data/ext/extconf.rb

@@ -1,9 +1,9 @@
 require 'mkmf'
 require 'ftools'
 
-# check if Subversion, SWIG and SCons are installed
-if xsystem('which svn') == false
-  puts 'Subversion is not installed'
+# check if Git, SWIG and SCons are installed
+if xsystem('which git') == false
+  puts 'Git is not installed'
   exit 1
 end
 if xsystem('which swig') == false
@@ -17,45 +17,54 @@ end
 
 # determine os name
 if RUBY_PLATFORM =~ /darwin/i
-	rb_os = '__OSX'
+  rb_os = '__OSX'
 elsif RUBY_PLATFORM =~ /cygwin/i
-	rb_os = '__CYGWIN'
+  rb_os = '__CYGWIN'
 elsif RUBY_PLATFORM =~ /win32/i
-	rb_os = '__CYGWIN'
+  rb_os = '__CYGWIN'
 elsif RUBY_PLATFORM =~ /linux/i
-	rb_os = '__LINUX'
+  rb_os = '__LINUX'
 elsif RUBY_PLATFORM =~ /irix6/i
-	rb_os = '__IRIX'
+  rb_os = '__IRIX'
 end
 
-# try to do a SVN checkout
-if xsystem('svn co --non-interactive https://ssl.drqueue.org/svn/branches/0.64.x') == false
-  puts 'SVN checkout failed'
-  exit 1
+if File.directory? "drqueue"
+  Dir::chdir 'drqueue'
+  # try to do a Git pull
+  if xsystem('git pull') == false
+    puts 'Git pull failed'
+    exit 1
+  end
+else
+  # try to do a Git clone
+  if xsystem('git clone https://ssl.drqueue.org/git/drqueue.git') == false
+    puts 'Git clone failed'
+    exit 1
+  end
+  Dir::chdir 'drqueue'
 end
 
-# try to build drqueue
-Dir::chdir '0.64.x' 
-if xsystem('scons build_drqman=false') == false
-  puts 'DrQueue build failed'
+# try to build libdrqueue
+if xsystem('scons universal_binary=true libdrqueue') == false
+  puts 'libdrqueue build failed'
   exit 1
 end
 Dir::chdir '..'
 
 # create swig wrapper
 puts 'generating swig interface file'
-puts 'swig -ruby -I0.64.x/ -I0.64.x/libdrqueue -D'+rb_os+' -Wall -autorename libdrqueue_ruby.i'
-xsystem('swig -ruby -I0.64.x/ -I0.64.x/libdrqueue -D'+rb_os+' -Wall -autorename libdrqueue_ruby.i')
+puts 'swig -ruby -Idrqueue/ -Idrqueue/libdrqueue -D'+rb_os+' -Wall -autorename libdrqueue_ruby.i'
+xsystem('swig -ruby -Idrqueue/ -Idrqueue/libdrqueue -D'+rb_os+' -Wall -autorename libdrqueue_ruby.i')
 puts 'look for output in mkmf.log'
 
 # build for os
 $CFLAGS += ' -D'+rb_os
 
 # include the headers
-$CFLAGS += ' -I0.64.x/ -I0.64.x/libdrqueue'
+$CFLAGS += ' -Idrqueue/ -Idrqueue/libdrqueue'
 
 # path to the drqueue lib
-$LOCAL_LIBS += '0.64.x/libdrqueue/libdrqueue.a'
+$LOCAL_LIBS += 'drqueue/libdrqueue/libdrqueue.a'
 
 # create the makefile
 create_makefile('drqueue')

data/ext/libdrqueue_ruby.i

@@ -24,7 +24,7 @@
 
 %define DOCSTRING
 "The drqueue module allows the access to the libdrqueue library responsible
-of all major operations that can be applied remotely to drqueue master and
+of all major operations that can be applied remotely to DrQueue master and
 slaves. Also provides access to all data structures of DrQueue."
 %enddef
 %module (docstring=DOCSTRING) drqueue
@@ -302,39 +302,9 @@ typedef unsigned char uint8_t;
 		
 		return outfile;
 	}
-	
-	/* blenderlux script file generation */
-	char *blenderluxsg (char *scene, char *scriptdir)
-	{	
-		struct blenderluxsgi *luxren = (struct blenderluxsgi *)malloc (sizeof(struct blenderluxsgi));
-    	if (!luxren) {
- 	     	rb_raise(rb_eNoMemError,"out of memory");
-    	 	return NULL;
-   		}	
-		
-		char *outfile = (char *)malloc(sizeof(char *));
-		if (!outfile) {
- 	     	rb_raise(rb_eNoMemError,"out of memory");
-    	 	return NULL;
-   		}
-		
-		memset (luxren,0,sizeof(struct blenderluxsgi));
 		
-		strncpy(luxren->scene, scene, BUFFERLEN-1);
-		strncpy(luxren->scriptdir, scriptdir, BUFFERLEN-1);
-		
-  		outfile = blenderluxsg_create(luxren);
-  		
-		if (!outfile) {
-			rb_raise(rb_eException,"Problem creating script file");
-      		return NULL;
-		}
-		
-		return outfile;
-	}
-	
 	/* MentalRay script file generation */
-	char *mentalraysg (char *scene, char *scriptdir, char *renderdir, char *image, char *file_owner, char *camera, int res_x, int res_y, char *format, uint8_t kind)
+	char *mentalraysg (char *scene, char *scriptdir, char *renderdir, char *image, char *file_owner, char *camera, int res_x, int res_y, char *format, uint8_t render_type)
 	{	
 		struct mentalraysgi *ment = (struct mentalraysgi *)malloc (sizeof(struct mentalraysgi));
     	if (!ment) {
@@ -359,7 +329,7 @@ typedef unsigned char uint8_t;
 		ment->res_x = res_x;
 		ment->res_y = res_y;
 		strncpy(ment->format, format, BUFFERLEN-1);
-		ment->kind = kind;
+		ment->render_type = render_type;
 		
   		outfile = mentalraysg_create(ment);
   		
@@ -372,7 +342,7 @@ typedef unsigned char uint8_t;
 	}
 
 	/* Cinema4D script file generation */
-	char *cinema4dsg (char *scene, char *scriptdir, char *file_owner, uint8_t kind)
+	char *cinema4dsg (char *scene, char *scriptdir, char *file_owner)
 	{	
 		struct cinema4dsgi *cine = (struct cinema4dsgi *)malloc (sizeof(struct cinema4dsgi));
     	if (!cine) {
@@ -391,7 +361,6 @@ typedef unsigned char uint8_t;
 		strncpy(cine->scene, scene, BUFFERLEN-1);
 		strncpy(cine->scriptdir, scriptdir, BUFFERLEN-1);
 		strncpy(cine->file_owner, file_owner, BUFFERLEN-1);
-		cine->kind = kind;
 		
   		outfile = cinema4dsg_create(cine);
   		

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification 
 name: DrQueueRubyBindings
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: "0.3"
 platform: ruby
 authors: 
 - Andreas Schroeder
 autorequire: 
 bindir: bin
 cert_chain: 
-date: 2009-12-31 00:00:00 +01:00
+date: 2010-05-12 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
-description: 
+description: This gem is a Ruby extension library providing an API to DrQueue, the open source render queue. Git, SWIG and SCons are required for building. See https://ssl.drqueue.org/redmine/projects/drqueue/wiki/RubyBindingsHowto for more information.
 email: andreas@drqueue.org
 executables: []
 
@@ -23,8 +23,10 @@ extra_rdoc_files: []
 files: 
 - COPYING
 - ext/libdrqueue_ruby.i
-has_rdoc: false
+has_rdoc: true
 homepage: http://www.drqueue.org
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -45,7 +47,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - Ruby bindings for DrQueue
 rubyforge_project: drqueue
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 1
 summary: Ruby extension library providing an API to DrQueue