ritsu 0.7.0 → 0.7.1

data/lib/ritsu/ext/qt.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/qt/project")
-require File.expand_path(File.dirname(__FILE__) + "/qt/src_files/target_cmake_lists")
-require File.expand_path(File.dirname(__FILE__) + "/qt/src_files/ui_file")
-require File.expand_path(File.dirname(__FILE__) + "/qt/src_files/header_file")
+require File.expand_path(File.dirname(__FILE__) + "/qt/project")
+require File.expand_path(File.dirname(__FILE__) + "/qt/src_files/target_cmake_lists")
+require File.expand_path(File.dirname(__FILE__) + "/qt/src_files/ui_file")
+require File.expand_path(File.dirname(__FILE__) + "/qt/src_files/header_file")

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

@@ -1,48 +1,48 @@
-require File.expand_path(File.dirname(__FILE__) + "/../../project")
-
-module Ritsu
-  class Project
-    def setup_qt
-      ### Qt ###
-      add_external_library("qt") do |e|
-        e.cmake_find_script <<-QT_FIND_SCRIPT
-
-FIND_PACKAGE(Qt4 REQUIRED)
-
-MACRO (RITSU_QT4_WRAP_UI outfiles )
-  QT4_EXTRACT_OPTIONS(ui_files ui_options ${ARGN})
-
-  FOREACH (it ${ui_files})
-    GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
-    GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
-    SET(outfile ${CMAKE_CURRENT_SOURCE_DIR}/ui_${outfile}.h)
-    ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
-      COMMAND ${QT_UIC_EXECUTABLE}
-      ARGS ${ui_options} -o ${outfile} ${infile}
-      MAIN_DEPENDENCY ${infile})
-    SET(${outfiles} ${${outfiles}} ${outfile})
-  ENDFOREACH (it)
-
-ENDMACRO (RITSU_QT4_WRAP_UI)
-
-QT_FIND_SCRIPT
-        e.cmake_depend_script "INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR})"
-        e.cmake_name "${QT_QTCORE_LIBRARY}"
-      end
-
-      ### Qt GUI ###
-      add_external_library("qtgui") do |e|
-        e.cmake_find_script ""
-        e.cmake_depend_script "INCLUDE_DIRECTORIES(${QT_QTGUI_INCLUDE_DIR})"
-        e.cmake_name "${QT_QTGUI_LIBRARY}"
-      end
-
-      ### Qt OpenGL ###
-      add_external_library("qtopengl") do |e|
-        e.cmake_find_script ""
-        e.cmake_depend_script "INCLUDE_DIRECTORIES(${QT_QTOPENGL_INCLUDE_DIR})"
-        e.cmake_name "${QT_QTOPENGL_LIBRARY}"
-      end
-    end
-  end
+require File.expand_path(File.dirname(__FILE__) + "/../../project")
+
+module Ritsu
+  class Project
+    def setup_qt
+      ### Qt ###
+      add_external_library("qt") do |e|
+        e.cmake_find_script <<-QT_FIND_SCRIPT
+
+FIND_PACKAGE(Qt4 REQUIRED)
+
+MACRO (RITSU_QT4_WRAP_UI outfiles )
+  QT4_EXTRACT_OPTIONS(ui_files ui_options ${ARGN})
+
+  FOREACH (it ${ui_files})
+    GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
+    GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
+    SET(outfile ${CMAKE_CURRENT_SOURCE_DIR}/ui_${outfile}.h)
+    ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
+      COMMAND ${QT_UIC_EXECUTABLE}
+      ARGS ${ui_options} -o ${outfile} ${infile}
+      MAIN_DEPENDENCY ${infile})
+    SET(${outfiles} ${${outfiles}} ${outfile})
+  ENDFOREACH (it)
+
+ENDMACRO (RITSU_QT4_WRAP_UI)
+
+QT_FIND_SCRIPT
+        e.cmake_depend_script "INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR})"
+        e.cmake_name "${QT_QTCORE_LIBRARY}"
+      end
+
+      ### Qt GUI ###
+      add_external_library("qtgui") do |e|
+        e.cmake_find_script ""
+        e.cmake_depend_script "INCLUDE_DIRECTORIES(${QT_QTGUI_INCLUDE_DIR})"
+        e.cmake_name "${QT_QTGUI_LIBRARY}"
+      end
+
+      ### Qt OpenGL ###
+      add_external_library("qtopengl") do |e|
+        e.cmake_find_script ""
+        e.cmake_depend_script "INCLUDE_DIRECTORIES(${QT_QTOPENGL_INCLUDE_DIR})"
+        e.cmake_name "${QT_QTOPENGL_LIBRARY}"
+      end
+    end
+  end
 end

data/lib/ritsu/ext/qt/src_files/header_file.rb

@@ -1,60 +1,60 @@
-require File.expand_path(File.dirname(__FILE__) + "/../../../src_files/header_file")
-
-module Ritsu
-  module SrcFiles
-    class HeaderFile
-      alias_method :initialize_target_before_qt, :initialize
-      
-      def initialize(src_path, owner, options={})
-        options = {:qt_header_file => false}.merge(options)
-        initialize_target_before_qt(src_path, owner)
-        @qt_header_file = options[:qt_header_file] 
-      end
-      
-      def qt_header_file?
-        @qt_header_file
-      end
-    end
-    
-    module AddQtHeaderFile
-      def add_qt_header_file(path, options={})
-        src_path = compute_src_path(path, options)
-        HeaderFile.new(src_path, self, :qt_header_file=>true)
-      end
-      
-      def add_qt_header_files(*paths)
-        paths.each do |path|
-          add_qt_header_file(path)
-        end
-      end
-    end
-    
-    module AddQtUnit
-      include AddCppFile
-      include AddQtHeaderFile
-      
-      def add_qt_unit(name, options={})
-        add_cpp_file(name + ".cpp")
-        add_qt_header_file(name + ".h")
-      end
-      
-      def add_qt_units(*names)
-        names.each do |name|
-          add_qt_unit(name)
-        end
-      end
-    end
-  end
-end
-
-module Ritsu
-  class Target
-    include Ritsu::SrcFiles::AddQtHeaderFile
-    include Ritsu::SrcFiles::AddQtUnit
-  end
-  
-  class Project
-    include Ritsu::SrcFiles::AddQtHeaderFile
-    include Ritsu::SrcFiles::AddQtUnit
-  end
-end
+require File.expand_path(File.dirname(__FILE__) + "/../../../src_files/header_file")
+
+module Ritsu
+  module SrcFiles
+    class HeaderFile
+      alias_method :initialize_target_before_qt, :initialize
+      
+      def initialize(src_path, owner, options={})
+        options = {:qt_header_file => false}.merge(options)
+        initialize_target_before_qt(src_path, owner)
+        @qt_header_file = options[:qt_header_file] 
+      end
+      
+      def qt_header_file?
+        @qt_header_file
+      end
+    end
+    
+    module AddQtHeaderFile
+      def add_qt_header_file(path, options={})
+        src_path = compute_src_path(path, options)
+        HeaderFile.new(src_path, self, :qt_header_file=>true)
+      end
+      
+      def add_qt_header_files(*paths)
+        paths.each do |path|
+          add_qt_header_file(path)
+        end
+      end
+    end
+    
+    module AddQtUnit
+      include AddCppFile
+      include AddQtHeaderFile
+      
+      def add_qt_unit(name, options={})
+        add_cpp_file(name + ".cpp")
+        add_qt_header_file(name + ".h")
+      end
+      
+      def add_qt_units(*names)
+        names.each do |name|
+          add_qt_unit(name)
+        end
+      end
+    end
+  end
+end
+
+module Ritsu
+  class Target
+    include Ritsu::SrcFiles::AddQtHeaderFile
+    include Ritsu::SrcFiles::AddQtUnit
+  end
+  
+  class Project
+    include Ritsu::SrcFiles::AddQtHeaderFile
+    include Ritsu::SrcFiles::AddQtUnit
+  end
+end

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

@@ -1,107 +1,107 @@
-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 QtUiTemplate < Ritsu::Template
-        attr_reader :target
-        
-        def initialize(target)
-          super("TargetCmakeLists -- #{target.name} -- QtUi")
-          @target = target
-        end
-        
-        def ui_header_files_var_name
-          "#{target.name.upcase}_UI_HEADER_FILES"
-        end
-      
-        def update_block(block, options = {})
-          block.clear_contents
-          
-          ui_files = target.src_files.select { |x| x.respond_to?(:ui_file?) && x.ui_file? }
-          if ui_files.length == 0
-            return
-          end
-          ui_files.sort! {|x,y| x.src_path <=> y.src_path}
-          
-          block.add_line "RITSU_QT4_WRAP_UI(#{ui_header_files_var_name}"
-          block.indent
-          ui_files.each do |ui_file|
-            block.add_line("${CMAKE_SOURCE_DIR}/#{ui_file.src_path}")
-          end
-          block.outdent
-          block.add_line ")"
-          block.add_new_line
-          block.add_line "SET(#{target.name.upcase}_SRC_FILES ${#{target.name.upcase}_SRC_FILES} ${#{ui_header_files_var_name}})"
-        end
-      end
-      
-      class QtMocTemplate < Ritsu::Template
-        attr_reader :target
-        
-        def initialize(target)
-          super("TargetCmakeLists -- #{target.name} -- QtMoc")
-          @target = target
-        end
-        
-        def moc_src_files_var_name
-          "#{target.name.upcase}_MOC_SRC_FILES"
-        end
-        
-        def update_block(block, options = {})
-          block.clear_contents
-          
-          header_files = target.src_files.select { |x| x.respond_to?(:qt_header_file?) && x.qt_header_file? }
-          if header_files.length == 0
-            return
-          end
-          header_files.sort! {|x,y| x.src_path <=> y.src_path}
-          
-          block.add_line "QT4_WRAP_CPP(#{moc_src_files_var_name}"
-          block.indent
-          header_files.each do |header_file|
-            block.add_line("${CMAKE_SOURCE_DIR}/#{header_file.src_path}")
-          end
-          block.outdent
-          block.add_line ")"
-          block.add_new_line
-          block.add_line "SET(#{target.name.upcase}_SRC_FILES ${#{target.name.upcase}_SRC_FILES} ${#{moc_src_files_var_name}})"
-        end
-      end
-      
-      class Template
-        attr_reader :qt_ui_template
-        attr_reader :qt_moc_template
-        
-        alias_method :initialize_before_qt, :initialize
-        
-        def initialize(target, id = nil)
-          initialize_before_qt(target, id)
-          
-          @qt_ui_template = QtUiTemplate.new(target)
-          @qt_moc_template = QtMocTemplate.new(target)
-          
-          position = child_template_with_id_position(source_files_template.id) + 1
-          contents.insert(position, @qt_moc_template)
-          contents.insert(position, "")
-          contents.insert(position, @qt_ui_template)
-          contents.insert(position, "")
-        end
-        
-        alias_method :position_to_insert_before_qt, :position_to_insert
-        
-        def position_to_insert(block, new_block)
-          if new_block.id == qt_moc_template.id
-            block.child_block_with_id_position(qt_ui_template.id) + 2
-          elsif new_block.id == qt_ui_template.id
-            block.child_block_with_id_position(source_files_template.id) + 2
-          else
-            position_to_insert_before_cuda(block, new_block)
-          end
-        end
-      end
-    end
-  end
+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 QtUiTemplate < Ritsu::Template
+        attr_reader :target
+        
+        def initialize(target)
+          super("TargetCmakeLists -- #{target.name} -- QtUi")
+          @target = target
+        end
+        
+        def ui_header_files_var_name
+          "#{target.name.upcase}_UI_HEADER_FILES"
+        end
+      
+        def update_block(block, options = {})
+          block.clear_contents
+          
+          ui_files = target.src_files.select { |x| x.respond_to?(:ui_file?) && x.ui_file? }
+          if ui_files.length == 0
+            return
+          end
+          ui_files.sort! {|x,y| x.src_path <=> y.src_path}
+          
+          block.add_line "RITSU_QT4_WRAP_UI(#{ui_header_files_var_name}"
+          block.indent
+          ui_files.each do |ui_file|
+            block.add_line("${CMAKE_SOURCE_DIR}/#{ui_file.src_path}")
+          end
+          block.outdent
+          block.add_line ")"
+          block.add_new_line
+          block.add_line "SET(#{target.name.upcase}_SRC_FILES ${#{target.name.upcase}_SRC_FILES} ${#{ui_header_files_var_name}})"
+        end
+      end
+      
+      class QtMocTemplate < Ritsu::Template
+        attr_reader :target
+        
+        def initialize(target)
+          super("TargetCmakeLists -- #{target.name} -- QtMoc")
+          @target = target
+        end
+        
+        def moc_src_files_var_name
+          "#{target.name.upcase}_MOC_SRC_FILES"
+        end
+        
+        def update_block(block, options = {})
+          block.clear_contents
+          
+          header_files = target.src_files.select { |x| x.respond_to?(:qt_header_file?) && x.qt_header_file? }
+          if header_files.length == 0
+            return
+          end
+          header_files.sort! {|x,y| x.src_path <=> y.src_path}
+          
+          block.add_line "QT4_WRAP_CPP(#{moc_src_files_var_name}"
+          block.indent
+          header_files.each do |header_file|
+            block.add_line("${CMAKE_SOURCE_DIR}/#{header_file.src_path}")
+          end
+          block.outdent
+          block.add_line ")"
+          block.add_new_line
+          block.add_line "SET(#{target.name.upcase}_SRC_FILES ${#{target.name.upcase}_SRC_FILES} ${#{moc_src_files_var_name}})"
+        end
+      end
+      
+      class Template
+        attr_reader :qt_ui_template
+        attr_reader :qt_moc_template
+        
+        alias_method :initialize_before_qt, :initialize
+        
+        def initialize(target, id = nil)
+          initialize_before_qt(target, id)
+          
+          @qt_ui_template = QtUiTemplate.new(target)
+          @qt_moc_template = QtMocTemplate.new(target)
+          
+          position = child_template_with_id_position(source_files_template.id) + 1
+          contents.insert(position, @qt_moc_template)
+          contents.insert(position, "")
+          contents.insert(position, @qt_ui_template)
+          contents.insert(position, "")
+        end
+        
+        alias_method :position_to_insert_before_qt, :position_to_insert
+        
+        def position_to_insert(block, new_block)
+          if new_block.id == qt_moc_template.id
+            block.child_block_with_id_position(qt_ui_template.id) + 2
+          elsif new_block.id == qt_ui_template.id
+            block.child_block_with_id_position(source_files_template.id) + 2
+          else
+            position_to_insert_before_cuda(block, new_block)
+          end
+        end
+      end
+    end
+  end
 end

data/lib/ritsu/ext/qt/src_files/ui_file.rb

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