ritsu 0.4.1 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.5.0

data/lib/ritsu/ext/cuda/project.rb

@@ -0,0 +1,31 @@
+require File.expand_path(File.dirname(__FILE__) + "/../../project")
+
+module Ritsu
+  class Project
+    def setup_cuda
+      add_external_library("cuda") do |e|
+        e.cmake_find_script "FIND_PACKAGE(CUDA REQUIRED)"
+        e.cmake_depend_script "INCLUDE_DIRECTORIES(${CUDA_INCLUDE_DIRS})"
+        e.cmake_name "${CUDA_LIBRARIES}"
+      end
+    end
+    
+    def add_cuda_executable(name)
+      executable = Ritsu::Targets::Executable.new(name, :project=>self)
+      executable.add_external_library "cuda"
+      yield executable if block_given?
+    end
+    
+    def add_cuda_shared_library(name)
+      shared_library = Ritsu::Targets::SharedLibrary.new(name, :project=>self)
+      shared_library.add_external_library "cuda"
+      yield shared_library if block_given?
+    end
+    
+    def add_cuda_static_library(name)
+      static_library = Ritsu::Targets::StaticLibrary.new(name, :project=>self)
+      static_library.add_external_library "cuda"
+      yield static_library if block_given?
+    end
+  end
+end

data/lib/ritsu/ext/cuda/src_files/cu_file.rb

@@ -0,0 +1,47 @@
+require File.expand_path(File.dirname(__FILE__) + "/../../../project")
+require File.expand_path(File.dirname(__FILE__) + "/../../../src_file")
+
+module Ritsu
+  module SrcFiles
+    class CuFile < Ritsu::SrcFile
+      def initialize(src_path, owner)
+        super(src_path, owner)
+      end
+            
+      def header_file?
+        false
+      end
+      
+      def cpp_file?
+        false
+      end
+      
+      def cu_file?
+        true
+      end
+    end
+  
+    module AddCuFile
+      def add_cu_file(path, options={})
+        src_path = compute_src_path(path, options)
+        CuFile.new(src_path, self)
+      end
+      
+      def add_cu_files(*paths)
+        paths.each do |path|
+          add_cu_file(path)
+        end
+      end
+    end
+  end
+end
+
+module Ritsu
+  class Target
+    include Ritsu::SrcFiles::AddCuFile
+  end
+  
+  class Project
+    include Ritsu::SrcFiles::AddCuFile
+  end
+end

data/lib/ritsu/ext/cuda/src_files/target_cmake_lists.rb

@@ -0,0 +1,71 @@
+require 'rubygems'
+require 'active_support/core_ext/string/starts_ends_with'
+require File.expand_path(File.dirname(__FILE__) + '/../../../src_files/target_cmake_lists')
+
+module Ritsu
+  module SrcFiles
+    class TargetCmakeLists
+      class CudaCompileTemplate < Ritsu::Template
+        attr_reader :target
+      
+        def initialize(target)
+          super("TargetCmakeLists -- #{target.name} -- CudaCompile")
+          @target = target
+        end
+        
+        def cuda_generate_files_var_name
+          "#{target.name.upcase}_CUDA_GENERATED_FILES"
+        end
+      
+        def update_block(block, options = {})
+          block.clear_contents
+          
+          cu_files = target.src_files.select { |x| x.respond_to?(:cu_file?) && x.cu_file? }
+          if cu_files.length == 0
+            return
+          end
+          
+          block.add_line "CUDA_COMPILE(#{cuda_generate_files_var_name}"
+          block.indent
+          cu_files.each do |cu_file|
+            block.add_line("${CMAKE_SOURCE_DIR}/#{cu_file.src_path}")
+          end
+          block.outdent
+          #if target.static_library?
+          #  block.add_line("STATIC")
+          #elsif target.shared_library?
+          #  block.add_line("SHARED")
+          #end
+          block.add_line ")"
+          block.add_new_line
+          block.add_line "SET(#{target.name.upcase}_SRC_FILES ${#{target.name.upcase}_SRC_FILES} ${#{cuda_generate_files_var_name}})"
+        end
+      end
+            
+      class Template
+        attr_reader :cuda_compile_template
+        
+        alias_method :initialize_before_cuda, :initialize
+        
+        def initialize(target, id = nil)
+          initialize_before_cuda(target, id)
+          
+          @cuda_compile_template = CudaCompileTemplate.new(target)
+          position = child_template_with_id_position(source_files_template.id) + 1
+          contents.insert(position, @cuda_compile_template)
+          contents.insert(position, "")
+        end
+        
+        alias_method :position_to_insert_before_cuda, :position_to_insert
+        
+        def position_to_insert(block, new_block)
+          if new_block.id == cuda_compile_template.id
+              block.child_block_with_id_position(source_files_template.id) + 1
+          else
+            position_to_insert_before_cuda(block, new_block)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ritsu/ext/cuda.rb

@@ -0,0 +1,3 @@
+require File.expand_path(File.dirname(__FILE__) + "/cuda/src_files/cu_file")
+require File.expand_path(File.dirname(__FILE__) + "/cuda/src_files/target_cmake_lists")
+require File.expand_path(File.dirname(__FILE__) + "/cuda/project")

data/lib/ritsu/ext/glsl/src_files/frag_file.rb

@@ -3,7 +3,11 @@ require File.expand_path(File.dirname(__FILE__) + "/../../../src_file")
 
 module Ritsu
   module SrcFiles
-    module FragFileMixin
+    class FragFile < Ritsu::SrcFile
+      def initialize(src_path, owner)
+        super(src_path, owner)
+      end
+      
       def glsl_file?
         true
       end
@@ -32,14 +36,6 @@ module Ritsu
         src_path.gsub(/[.\/]+/,'_') + "_code"
       end
     end
-    
-    class FragFile < Ritsu::SrcFile
-      include FragFileMixin
-      
-      def initialize(src_path, owner)
-        super(src_path, owner)
-      end
-    end
   
     module AddFragFile
       def add_frag_file(path, options={})

data/lib/ritsu/ext/glsl/src_files/vert_file.rb

@@ -2,8 +2,12 @@ require File.expand_path(File.dirname(__FILE__) + "/../../../project")
 require File.expand_path(File.dirname(__FILE__) + "/../../../src_file")
 
 module Ritsu
-  module SrcFiles
-    module VertFileMixin
+  module SrcFiles    
+    class VertFile < Ritsu::SrcFile      
+      def initialize(src_path, owner)
+        super(src_path, owner)
+      end
+      
       def glsl_file?
         true
       end
@@ -32,14 +36,6 @@ module Ritsu
         src_path.gsub(/[.\/]+/,'_') + "_code"
       end
     end
-    
-    class VertFile < Ritsu::SrcFile
-      include VertFileMixin
-      
-      def initialize(src_path, owner)
-        super(src_path, owner)
-      end
-    end
   
     module AddVertFile
       def add_vert_file(path, options={})

data/lib/ritsu/src_file.rb

@@ -64,7 +64,7 @@ module Ritsu
       FileRobot.remove_file(abs_path)
     end
     
-    def include_in_cmake?
+    def include_in_source_files?
       return true
     end
     

data/lib/ritsu/src_files/cpp_file.rb

@@ -1,16 +1,21 @@
 require File.expand_path(File.dirname(__FILE__) + '/../src_file')
 require File.expand_path(File.dirname(__FILE__) + '/../project')
 require File.expand_path(File.dirname(__FILE__) + '/../utility/instance_set')
-require File.expand_path(File.dirname(__FILE__) + '/cpp_file_mixin')
 
 module Ritsu
   module SrcFiles
     class CppFile < Ritsu::SrcFile
-      include CppFileMixin
-      
       def initialize(src_path, owner)
         super(src_path, owner)
       end
+      
+      def header_file?
+        false
+      end
+      
+      def cpp_file?
+        true
+      end
     end
   
     module AddCppFile

data/lib/ritsu/src_files/header_file.rb

@@ -2,13 +2,10 @@ require File.expand_path(File.dirname(__FILE__) + '/../src_file')
 require File.expand_path(File.dirname(__FILE__) + '/../project')
 require File.expand_path(File.dirname(__FILE__) + '/../utility/instance_set')
 require File.expand_path(File.dirname(__FILE__) + '/../utility/file_robot')
-require File.expand_path(File.dirname(__FILE__) + '/header_file_mixin')
 
 module Ritsu
   module SrcFiles
-    class HeaderFile < Ritsu::SrcFile
-      include HeaderFileMixin
-    
+    class HeaderFile < Ritsu::SrcFile    
       def initialize(src_path, owner)
         super(src_path, owner)
       end
@@ -23,7 +20,19 @@ module Ritsu
           "////////////////////\n" +
           "\n" +
           "#endif\n")
-      end          
+      end
+      
+      def include_guard
+        '__' + project.name.underscore.upcase + '_' + src_path.gsub(/[.\/]+/,'_').upcase + '__'
+      end
+      
+      def header_file?
+        true
+      end
+      
+      def cpp_file?
+        false
+      end
     end
     
     module AddHeaderFile

data/lib/ritsu/src_files/project_cmake_lists.rb

@@ -102,7 +102,7 @@ module Ritsu
         self.template = Template.new(project)
       end
     
-      def include_in_cmake?
+      def include_in_source_files?
         false
       end
     end

data/lib/ritsu/src_files/project_config_header_file.rb

@@ -7,7 +7,7 @@ module Ritsu
         super("config.h", project)
       end
       
-      def include_in_cmake?
+      def include_in_source_files?
         false
       end
     end

data/lib/ritsu/src_files/project_config_header_template_file.rb

@@ -4,7 +4,6 @@ require File.expand_path(File.dirname(__FILE__) + "/templated_src_file")
 require File.expand_path(File.dirname(__FILE__) + "/../template_policies")
 require File.expand_path(File.dirname(__FILE__) + "/../template")
 require File.expand_path(File.dirname(__FILE__) + "/../utility/platform")
-require File.expand_path(File.dirname(__FILE__) + "/header_file_mixin")
 
 module Ritsu
   module SrcFiles
@@ -38,7 +37,7 @@ module Ritsu
         self.template = Template.new(self)
       end
       
-      def include_in_cmake?
+      def include_in_source_files?
         false
       end
     end

data/lib/ritsu/src_files/target_cmake_lists.rb

@@ -75,7 +75,7 @@ module Ritsu
           src_files = target.src_files.to_a
           src_files.sort! {|x,y| x.src_path <=> y.src_path}
           src_files.each do |src_file|
-            block.contents << "    ${CMAKE_SOURCE_DIR}/#{src_file.src_path}" if src_file.include_in_cmake?
+            block.contents << "    ${CMAKE_SOURCE_DIR}/#{src_file.src_path}" if src_file.include_in_source_files?
           end
         
           block.contents << ")"
@@ -182,7 +182,7 @@ module Ritsu
           :block_end_prefix=>'##>>')
       end
     
-      def include_in_cmake?
+      def include_in_source_files?
         false
       end
     end

data/lib/ritsu/src_files.rb

@@ -2,9 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/src_files/project_cmake_list
 
 require File.expand_path(File.dirname(__FILE__) + '/src_files/templated_src_file')
 
-require File.expand_path(File.dirname(__FILE__) + '/src_files/cpp_file_mixin')
 require File.expand_path(File.dirname(__FILE__) + '/src_files/cpp_file')
-require File.expand_path(File.dirname(__FILE__) + '/src_files/header_file_mixin')
 require File.expand_path(File.dirname(__FILE__) + '/src_files/header_file')
 require File.expand_path(File.dirname(__FILE__) + '/src_files/target_cmake_lists')
 require File.expand_path(File.dirname(__FILE__) + '/src_files/executable_cmake_lists')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ritsu
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 1
-  version: 0.4.1
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - dragonmeteor
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-22 00:00:00 +07:00
+date: 2010-07-23 00:00:00 +07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -117,6 +117,10 @@ files:
 - bin/ritsu
 - lib/ritsu.rb
 - lib/ritsu/block.rb
+- lib/ritsu/ext/cuda.rb
+- lib/ritsu/ext/cuda/project.rb
+- lib/ritsu/ext/cuda/src_files/cu_file.rb
+- lib/ritsu/ext/cuda/src_files/target_cmake_lists.rb
 - lib/ritsu/ext/fake_install.rb
 - lib/ritsu/ext/fake_install/project.rb
 - lib/ritsu/ext/fake_install/src_files/project_cmake_lists.rb
@@ -134,10 +138,8 @@ files:
 - lib/ritsu/src_file.rb
 - lib/ritsu/src_files.rb
 - lib/ritsu/src_files/cpp_file.rb
-- lib/ritsu/src_files/cpp_file_mixin.rb
 - lib/ritsu/src_files/executable_cmake_lists.rb
 - lib/ritsu/src_files/header_file.rb
-- lib/ritsu/src_files/header_file_mixin.rb
 - lib/ritsu/src_files/project_cmake_lists.rb
 - lib/ritsu/src_files/project_config_header_file.rb
 - lib/ritsu/src_files/project_config_header_template_file.rb

data/lib/ritsu/src_files/cpp_file_mixin.rb

@@ -1,13 +0,0 @@
-module Ritsu
-  module SrcFiles
-    module CppFileMixin
-      def header_file?
-        false
-      end
-      
-      def cpp_file?
-        true
-      end
-    end
-  end
-end

data/lib/ritsu/src_files/header_file_mixin.rb

@@ -1,20 +0,0 @@
-require 'rubygems'
-require 'active_support/core_ext/string/inflections'
-
-module Ritsu
-  module SrcFiles
-    module HeaderFileMixin
-      def include_guard
-        '__' + project.name.underscore.upcase + '_' + src_path.gsub(/[.\/]+/,'_').upcase + '__'
-      end
-      
-      def header_file?
-        true
-      end
-      
-      def cpp_file?
-        false
-      end
-    end
-  end
-end