ritsu 0.5.2 → 0.5.3

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

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

@@ -0,0 +1,16 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../external_library.rb')
+
+module Ritsu
+  class ExternalLibrary    
+    attr_accessor :cuda_depend_script
+    attr_method :cuda_depend_script
+    
+    alias_method :initialize_before_cuda, :initialize
+    
+    def initialize(name, options={})
+      options = {:cuda_depend_script => ''}.merge(options)
+      initialize_before_cuda(name, options)
+      @cuda_depend_script = options[:cuda_depend_script]
+    end
+  end
+end

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

@@ -6,24 +6,25 @@ module Ritsu
       add_external_library("cuda") do |e|
         e.cmake_find_script "FIND_PACKAGE(CUDA REQUIRED)"
         e.cmake_depend_script "INCLUDE_DIRECTORIES(${CUDA_INCLUDE_DIRS})"
+        e.cuda_depend_script "CUDA_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 = Ritsu::Targets::Executable.new(name, :project=>self, :cuda_target=>true)
       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 = Ritsu::Targets::SharedLibrary.new(name, :project=>self, :cuda_target=>true)
       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 = Ritsu::Targets::StaticLibrary.new(name, :project=>self, :cuda_target=>true)
       static_library.add_external_library "cuda"
       yield static_library if block_given?
     end

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

@@ -4,7 +4,42 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../src_files/target_cm
 
 module Ritsu
   module SrcFiles
-    class TargetCmakeLists      
+    class TargetCmakeLists
+      class CudaIncludeDirectoriesTemplate < Ritsu::Template
+        attr_reader :target
+        
+        def initialize(target)
+          super("TargetCmakeLists -- #{target.name} -- CudaIncludeDirectories")
+          @target = target
+        end
+        
+        def update_block(block, options = {})
+          external_libraries = target.dependency_libraries.to_a
+          external_libraries.sort! {|x,y| x.name <=> y.name}
+
+          dependency_targets = target.dependency_targets.to_a
+          dependency_targets.sort! {|x,y| x.name <=> y.name}
+
+          block.contents.clear
+          external_libraries.each do |external_library|
+            if external_library.cuda_depend_script.strip.length > 0
+              block.contents << external_library.cuda_depend_script
+            end
+          end
+          dependency_targets.each do |dependency_target|
+            if dependency_target.cuda_depend_script.strip.length > 0
+              block.contents << dependency_target.cuda_depend_script
+            end
+          end
+
+          if target.library?
+            if target.cuda_depend_script.strip.length > 0
+              block.contents << target.cuda_depend_script
+            end
+          end
+        end
+      end
+      
       class CudaCompileTemplate < Ritsu::Template
         attr_reader :target
       
@@ -40,16 +75,25 @@ module Ritsu
             
       class Template
         attr_reader :cuda_compile_template
+        attr_reader :cuda_include_directories_template
         
         alias_method :initialize_before_cuda, :initialize
         
         def initialize(target, id = nil)
           initialize_before_cuda(target, id)
           
+          @cuda_include_directories_template = CudaIncludeDirectoriesTemplate.new(target)
           @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, "")
+          
+          if target.cuda_target?
+            position = child_template_with_id_position(libraries_template.id) + 1
+            contents.insert(position, @cuda_include_directories_template)
+            contents.insert(position, "")
+          
+            position = child_template_with_id_position(source_files_template.id) + 1
+            contents.insert(position, @cuda_compile_template)
+            contents.insert(position, "")
+          end
         end
         
         alias_method :position_to_insert_before_cuda, :position_to_insert

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

@@ -0,0 +1,17 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../target')
+
+module Ritsu
+  class Target
+    alias_method :initialize_target_before_cuda, :initialize
+    
+    def initialize(name, options={})
+      options = {:cuda_target => false}.merge(options)
+      initialize_target_before_cuda(name, options)
+      @cuda_target = options[:cuda_target]
+    end
+    
+    def cuda_target?
+      @cuda_target
+    end
+  end
+end

data/lib/ritsu/ext/cuda/targets/library.rb

@@ -0,0 +1,16 @@
+require File.expand_path(File.dirname(__FILE__) + "/../../../targets/library.rb")
+
+module Ritsu::Targets
+  class Library
+    attr_accessor :cuda_depend_script
+    attr_method :cuda_depend_script
+    
+    alias_method :initialize_library_before_cuda, :initialize
+    
+    def initialize(name, options={})
+      options = {:cuda_depend_script => ""}.merge(options)
+      initialize_library_before_cuda(name, options)
+      @cuda_depend_script = options[:cuda_depend_script]
+    end
+  end
+end

data/lib/ritsu/ext/cuda.rb

@@ -1,3 +1,6 @@
 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")
+require File.expand_path(File.dirname(__FILE__) + "/cuda/project")
+require File.expand_path(File.dirname(__FILE__) + "/cuda/external_library.rb")
+require File.expand_path(File.dirname(__FILE__) + "/cuda/targets/library.rb")
+require File.expand_path(File.dirname(__FILE__) + "/cuda/target.rb")

data/lib/ritsu/utility/accessors.rb

@@ -15,7 +15,7 @@ module Ritsu
               elsif args.length == 1
                 @#{name} = args[0]
               end
-            end
+            end 
           _RUBY
         end
         
@@ -24,7 +24,7 @@ module Ritsu
             attr_method_single(name)
           end
         end
-      end      
+      end
     end
   end
 end

data/test/ritsu/ext/cuda/src_files/cuda_static_library_cmake_lists_test.rb

@@ -0,0 +1,64 @@
+require File.dirname(__FILE__) + "/../../../../test_helpers"
+require File.dirname(__FILE__) + "/../../../../../lib/ritsu/ext/cuda"
+
+class CudaStaticLibraryCMakeListsTest < Test::Unit::TestCase
+  include Ritsu::SetupProjectAndClearEverythingElse
+  include Ritsu::TestCaseWithFileTestData
+  include Ritsu::Utility
+  
+  def data_dir; File.dirname(__FILE__) + "/" + File.basename(__FILE__, ".rb") end
+  
+  def setup
+    setup_project('mio')
+    @project.project_dir = output_dir
+    @project.setup_cuda
+  end
+    
+  file_test "must be present" do
+    abc = Ritsu::Targets::StaticLibrary.new("abc", :project=>@project, :cuda_target=>true)
+    abc.add_external_library "cuda"
+    assert abc.respond_to?(:cmake_lists)
+    assert abc.cmake_lists.kind_of?(Ritsu::SrcFiles::StaticLibraryCmakeLists)
+    assert_equal 1,
+     abc.src_files.select {|x| x.kind_of?(Ritsu::SrcFiles::StaticLibraryCmakeLists)}.length
+  end
+  
+  file_test "create" do
+    abc = Ritsu::Targets::StaticLibrary.new("abc", :project=>@project, :cuda_target=>true)
+    FileRobot.quietly do
+      abc.cmake_lists.create
+    end
+    assert_file_exists(abc.cmake_lists.abs_path)
+    
+    expected_content = <<-CMAKE
+##<< TargetCmakeLists -- abc -- Libraries
+##>> TargetCmakeLists -- abc -- Libraries
+
+##<< TargetCmakeLists -- abc -- CudaIncludeDirectories
+##>> TargetCmakeLists -- abc -- CudaIncludeDirectories
+
+##<< TargetCmakeLists -- abc -- Custom Commands
+##>> TargetCmakeLists -- abc -- Custom Commands
+
+##<< TargetCmakeLists -- abc -- Source Files
+SET(ABC_SRC_FILES
+)
+##>> TargetCmakeLists -- abc -- Source Files
+
+##<< TargetCmakeLists -- abc -- CudaCompile
+##>> TargetCmakeLists -- abc -- CudaCompile
+
+##<< StaticLibraryCmakeLists -- abc -- Static Library
+ADD_LIBRARY(abc STATIC ${ABC_SRC_FILES})
+##>> StaticLibraryCmakeLists -- abc -- Static Library
+
+##<< TargetCmakeLists -- abc -- Dependencies
+##>> TargetCmakeLists -- abc -- Dependencies
+
+##<< TargetCmakeLists -- abc -- Install
+##>> TargetCmakeLists -- abc -- Install
+CMAKE
+
+    assert_file_content(expected_content, abc.cmake_lists.abs_path)
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ritsu
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - dragonmeteor
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-11 00:00:00 +07:00
+date: 2010-09-14 00:00:00 +07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -118,9 +118,12 @@ files:
 - lib/ritsu.rb
 - lib/ritsu/block.rb
 - lib/ritsu/ext/cuda.rb
+- lib/ritsu/ext/cuda/external_library.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/cuda/target.rb
+- lib/ritsu/ext/cuda/targets/library.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
@@ -171,9 +174,11 @@ files:
 - lib/ritsu/utility/single_instance.rb
 - lib/ritsu/utility/strings.rb
 - test/ritsu/block_test.rb
+- test/ritsu/ext/cuda/src_files/cuda_static_library_cmake_lists_test.rb
 - test/ritsu/external_library_test.rb
 - test/ritsu/project_generators/default_generator_test.rb
 - test/ritsu/project_test.rb
+- test/ritsu/src_file_test.rb
 - test/ritsu/src_files/cpp_file_test.rb
 - test/ritsu/src_files/executable_cmake_lists_test.rb
 - test/ritsu/src_files/header_file_test.rb
@@ -181,11 +186,10 @@ files:
 - test/ritsu/src_files/shared_library_cmake_lists_test.rb
 - test/ritsu/src_files/static_library_cmake_lists_test.rb
 - test/ritsu/src_files/target_cmake_lists_test.rb
-- test/ritsu/src_file_test.rb
+- test/ritsu/target_test.rb
 - test/ritsu/targets/executable_test.rb
 - test/ritsu/targets/shared_library_test.rb
 - test/ritsu/targets/static_library_test.rb
-- test/ritsu/target_test.rb
 - test/ritsu/template_policies_test.rb
 - test/ritsu/utility/accessors_test.rb
 - test/ritsu/utility/check_upon_add_set_test.rb
@@ -234,9 +238,11 @@ specification_version: 3
 summary: A code generation system that facilitates building C/C++ software with the help of CMake
 test_files: 
 - test/ritsu/block_test.rb
+- test/ritsu/ext/cuda/src_files/cuda_static_library_cmake_lists_test.rb
 - test/ritsu/external_library_test.rb
 - test/ritsu/project_generators/default_generator_test.rb
 - test/ritsu/project_test.rb
+- test/ritsu/src_file_test.rb
 - test/ritsu/src_files/cpp_file_test.rb
 - test/ritsu/src_files/executable_cmake_lists_test.rb
 - test/ritsu/src_files/header_file_test.rb
@@ -244,11 +250,10 @@ test_files:
 - test/ritsu/src_files/shared_library_cmake_lists_test.rb
 - test/ritsu/src_files/static_library_cmake_lists_test.rb
 - test/ritsu/src_files/target_cmake_lists_test.rb
-- test/ritsu/src_file_test.rb
+- test/ritsu/target_test.rb
 - test/ritsu/targets/executable_test.rb
 - test/ritsu/targets/shared_library_test.rb
 - test/ritsu/targets/static_library_test.rb
-- test/ritsu/target_test.rb
 - test/ritsu/template_policies_test.rb
 - test/ritsu/utility/accessors_test.rb
 - test/ritsu/utility/check_upon_add_set_test.rb