ritsu 0.2.0 → 0.3.0

data/Thorfile

@@ -58,10 +58,10 @@ class Default < Thor
       s.version = File.read(File.dirname(__FILE__) + '/VERSION').strip
       s.rubyforge_project = "ritsu"
       s.platform = Gem::Platform::RUBY
-      s.summary = "A code generation system that facilitates building C/C++ software with the help of CMake and Doxygen"
+      s.summary = "A code generation system that facilitates building C/C++ software with the help of CMake"
       s.email = "dragonmeteor@gmail.com"
       s.homepage = "http://github.com/dragonmeteor/ritsu"
-      s.description = "A code generation system that facilitates building C/C++ software with the help of CMake and Doxygen"
+      s.description = "Ritsu is a tool to help generate CMakeLists.txt and other source code files in a C++ software project."
       s.authors = ['dragonmeteor']
       
       s.has_rdoc = true
@@ -75,7 +75,7 @@ class Default < Thor
       
       s.require_path = 'lib'
       s.bindir = "bin"
-      s.executables = %w( ritsu )
+      s.executables = %w( ritsu define_cpp_string )
       s.files = s.extra_rdoc_files + Dir.glob("{bin,lib}/**/*")
       s.test_files.include 'test/**/*'
       s.test_files.exclude 'test/**/output/**'

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/bin/define_cpp_string

@@ -0,0 +1,54 @@
+#!/usr/bin/env ruby
+# Convert a text file's content into a C++ const string.
+
+# Turn the given string to 
+# a C string literal that
+# parses to the original string.
+def string_literal(s)
+  result = "\"\\\n"
+  s.each_byte do |b|
+    c = b.chr
+    if c == "\n"
+      result += "\\n\\\n"
+    elsif c == "\r"
+      next
+    elsif c == "\\"
+      result += "\\\\"
+    elsif c == "\""
+      result += "\\\""
+    else
+      result += c
+    end
+  end
+  result += "\""
+  result
+end
+
+# Declare a constant string
+# variable whose value
+# is the given string.
+def const_string(name, s)
+  result = "const char * #{name} = " + string_literal(s)	 + ";"
+end
+
+require 'optparse'
+
+parser = OptionParser.new do |parser|
+  parser.banner = "Usage: define_cpp_string variable_name"
+  
+  parser.on_tail("-h", "--help", "Show this message") do
+    puts parser
+    exit
+  end
+end
+
+parser.parse(ARGV)
+var_name = ARGV.shift
+if not var_name
+	puts parser
+	exit
+end
+
+s = STDIN.read
+
+puts const_string(var_name, s)

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

@@ -0,0 +1,79 @@
+require 'rubygems'
+require 'active_support/core_ext/string/inflections'
+require File.dirname(__FILE__) + '/../../../src_file'
+require File.dirname(__FILE__) + '/../../../project'
+require File.dirname(__FILE__) + '/../../../utility/instance_set'
+require File.dirname(__FILE__) + '/../../../src_files/cpp_file'
+
+module Ritsu
+  module SrcFiles
+    module GlfpFileMixin
+      def glsl_file?
+        true
+      end
+      
+      def glvp_file?
+        false
+      end
+      
+      def glfp_file?
+        true
+      end
+      
+      def header_file?
+        false
+      end
+      
+      def cpp_file?
+        false
+      end
+      
+      def cpp_file_base_name
+        base_name.gsub(/[.\/]+/,'_') + ".cpp"
+      end
+      
+      def code_var_name
+        src_path.gsub(/[.\/]+/,'_') + "_code"
+      end
+    end
+    
+    class GlfpFile < Ritsu::SrcFile
+      include GlfpFileMixin
+      
+      def initialize(src_path, owner)
+        super(src_path, owner)
+      end
+    end
+  
+    module AddGlfpFile
+      def add_glfp_file(path, options={})
+        src_path = compute_src_path(path, options)
+        glfp_file = GlfpFile.new(src_path, self)
+        
+        cpp_src_path = compute_src_path(glfp_file.cpp_file_base_name, options)
+        cpp_file = CppFile.new(cpp_src_path, self)
+        
+        self.custom_commands << "ADD_CUSTOM_COMMAND(\n" +
+          "    OUTPUT ${CMAKE_SOURCE_DIR}/#{cpp_src_path}\n" +
+          "    COMMAND define_cpp_string #{glfp_file.code_var_name} < ${CMAKE_SOURCE_DIR}/#{glfp_file.src_path} > ${CMAKE_SOURCE_DIR}/#{cpp_file.src_path}\n" +
+          "    DEPENDS ${CMAKE_SOURCE_DIR}/#{glfp_file.src_path})"
+      end
+      
+      def add_glfp_files(*paths)
+        paths.each do |path|
+          add_glfp_file(path)
+        end
+      end
+    end
+  end
+end
+
+module Ritsu
+  class Target
+    include Ritsu::SrcFiles::AddGlfpFile
+  end
+  
+  class Project
+    include Ritsu::SrcFiles::AddGlfpFile
+  end
+end

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

@@ -0,0 +1,76 @@
+require File.dirname(__FILE__) + '/../../../src_file'
+require File.dirname(__FILE__) + '/../../../project'
+require File.dirname(__FILE__) + '/../../../utility/instance_set'
+
+module Ritsu
+  module SrcFiles
+    module GlvpFileMixin
+      def glsl_file?
+        true
+      end
+      
+      def glvp_file?
+        true
+      end
+      
+      def glfp_file?
+        false
+      end
+      
+      def header_file?
+        false
+      end
+      
+      def cpp_file?
+        false
+      end
+      
+      def cpp_file_base_name
+        base_name.gsub(/[.\/]+/,'_') + ".cpp"
+      end
+      
+      def code_var_name
+        src_path.gsub(/[.\/]+/,'_') + "_code"
+      end
+    end
+    
+    class GlvpFile < Ritsu::SrcFile
+      include GlvpFileMixin
+      
+      def initialize(src_path, owner)
+        super(src_path, owner)
+      end
+    end
+  
+    module AddGlvpFile
+      def add_glvp_file(path, options={})
+        src_path = compute_src_path(path, options)
+        glvp_file = GlvpFile.new(src_path, self)
+        
+        cpp_src_path = compute_src_path(glvp_file.cpp_file_base_name, options)
+        cpp_file = CppFile.new(cpp_src_path, self)
+        
+        self.custom_commands << "ADD_CUSTOM_COMMAND(\n" +
+          "    OUTPUT ${CMAKE_SOURCE_DIR}/#{cpp_src_path}\n" +
+          "    COMMAND define_cpp_string #{glvp_file.code_var_name} < ${CMAKE_SOURCE_DIR}/#{glvp_file.src_path} > ${CMAKE_SOURCE_DIR}/#{cpp_file.src_path}\n" +
+          "    DEPENDS ${CMAKE_SOURCE_DIR}/#{glvp_file.src_path})"
+      end
+      
+      def add_glvp_files(*paths)
+        paths.each do |path|
+          add_glvp_file(path)
+        end
+      end
+    end
+  end
+end
+
+module Ritsu
+  class Target
+    include Ritsu::SrcFiles::AddGlvpFile
+  end
+  
+  class Project
+    include Ritsu::SrcFiles::AddGlvpFile
+  end
+end

data/lib/ritsu/ext/glsl.rb

@@ -0,0 +1,2 @@
+require File.dirname(__FILE__) + "/glsl/src_files/glvp_file"
+require File.dirname(__FILE__) + "/glsl/src_files/glfp_file"

data/lib/ritsu/src_file.rb

@@ -27,6 +27,10 @@ module Ritsu
       @owner.src_files << self
     end
     
+    def base_name
+      File.basename(src_path)
+    end
+    
     def self.validate_instance(instance)
       if instances.select { |x| x.src_path == instance.src_path }.length > 0
         raise ArgumentError.new "source file with path '#{instance.src_path}' already exists"

data/lib/ritsu/src_files/project_cmake_lists.rb

@@ -13,7 +13,7 @@ module Ritsu
           @project = project
           
           add_line "PROJECT(#{@project.name})"
-          add_line "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)"
+          add_line "CMAKE_MINIMUM_REQUIRED(VERSION 2.8)"
           add_line "SET(CMAKE_MODULE_PATH \"${CMAKE_SOURCE_DIR}/cmake_modules\" ${CMAKE_MODULE_PATH})"
           add_new_line
           add_line "IF(WIN32)"

data/lib/ritsu/src_files/unit.rb

@@ -14,7 +14,7 @@ module Ritsu
       end
       
       def add_units(*names)
-        paths.each do |path|
+        names.each do |name|
           add_unit(name)
         end
       end

data/test/ritsu/src_files/project_cmake_lists_test.rb

@@ -37,7 +37,7 @@ class ProjectCMakeListsTest < Test::Unit::TestCase
     expected_content = <<-TEXT
 ##<< ProjectCmakeLists -- Header
 PROJECT(mio)
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules" ${CMAKE_MODULE_PATH})
 
 IF(WIN32)
@@ -107,7 +107,7 @@ CMAKE
     expected_content = <<-TEXT
 ##<< ProjectCmakeLists -- Header
 PROJECT(mio)
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules" ${CMAKE_MODULE_PATH})
 
 IF(WIN32)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ritsu
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - dragonmeteor
@@ -15,8 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-19 00:00:00 +07:00
-default_executable: ritsu
+date: 2010-07-21 00:00:00 +07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor
@@ -98,10 +98,11 @@ dependencies:
         version: 0.5.9
   type: :development
   version_requirements: *id005
-description: A code generation system that facilitates building C/C++ software with the help of CMake and Doxygen
+description: Ritsu is a tool to help generate CMakeLists.txt and other source code files in a C++ software project.
 email: dragonmeteor@gmail.com
 executables: 
 - ritsu
+- define_cpp_string
 extensions: []
 
 extra_rdoc_files: 
@@ -112,12 +113,16 @@ files:
 - README.md
 - Thorfile
 - VERSION
+- bin/define_cpp_string
 - bin/ritsu
 - lib/ritsu.rb
 - lib/ritsu/block.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
+- lib/ritsu/ext/glsl.rb
+- lib/ritsu/ext/glsl/src_files/glfp_file.rb
+- lib/ritsu/ext/glsl/src_files/glvp_file.rb
 - lib/ritsu/ext/test_case.rb
 - lib/ritsu/external_library.rb
 - lib/ritsu/project.rb
@@ -224,7 +229,7 @@ rubyforge_project: ritsu
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: A code generation system that facilitates building C/C++ software with the help of CMake and Doxygen
+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/external_library_test.rb