ritsu 0.3.1 → 0.4.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (43) hide show
  1. data/VERSION +1 -1
  2. data/lib/ritsu/ext/fake_install/project.rb +1 -1
  3. data/lib/ritsu/ext/glsl/src_files/{glvp_file.rb → frag_file.rb} +19 -20
  4. data/lib/ritsu/ext/glsl/src_files/{glfp_file.rb → vert_file.rb} +19 -23
  5. data/lib/ritsu/ext/glsl.rb +2 -2
  6. data/lib/ritsu/external_library.rb +2 -2
  7. data/lib/ritsu/project.rb +6 -6
  8. data/lib/ritsu/project_generator.rb +3 -3
  9. data/lib/ritsu/project_generators/default_generator.rb +3 -3
  10. data/lib/ritsu/project_generators/default_generator_files/Thorfile.erb +1 -1
  11. data/lib/ritsu/project_generators/default_generator_files/meta/project.rb.erb +1 -0
  12. data/lib/ritsu/project_generators.rb +1 -1
  13. data/lib/ritsu/src_file.rb +2 -2
  14. data/lib/ritsu/src_files/cpp_file.rb +4 -4
  15. data/lib/ritsu/src_files/executable_cmake_lists.rb +1 -1
  16. data/lib/ritsu/src_files/header_file.rb +5 -5
  17. data/lib/ritsu/src_files/project_cmake_lists.rb +3 -3
  18. data/lib/ritsu/src_files/project_config_header_file.rb +1 -1
  19. data/lib/ritsu/src_files/project_config_header_template_file.rb +5 -5
  20. data/lib/ritsu/src_files/shared_library_cmake_lists.rb +1 -1
  21. data/lib/ritsu/src_files/static_library_cmake_lists.rb +1 -1
  22. data/lib/ritsu/src_files/target_cmake_lists.rb +5 -5
  23. data/lib/ritsu/src_files/templated_src_file.rb +4 -4
  24. data/lib/ritsu/src_files/unit.rb +3 -3
  25. data/lib/ritsu/src_files.rb +13 -13
  26. data/lib/ritsu/target.rb +6 -6
  27. data/lib/ritsu/targets/executable.rb +3 -3
  28. data/lib/ritsu/targets/library.rb +2 -2
  29. data/lib/ritsu/targets/shared_library.rb +3 -3
  30. data/lib/ritsu/targets/static_library.rb +3 -3
  31. data/lib/ritsu/targets.rb +4 -4
  32. data/lib/ritsu/template.rb +1 -1
  33. data/lib/ritsu/template_policies.rb +1 -1
  34. data/lib/ritsu/test_helpers.rb +4 -4
  35. data/lib/ritsu/thors/default_thor.rb +3 -2
  36. data/lib/ritsu/thors.rb +1 -1
  37. data/lib/ritsu/utility/file_robot.rb +1 -1
  38. data/lib/ritsu/utility/instance_dependencies.rb +1 -1
  39. data/lib/ritsu/utility/instance_set.rb +1 -1
  40. data/lib/ritsu/utility.rb +8 -8
  41. data/lib/ritsu.rb +13 -13
  42. data/test/ritsu/project_generators/default_generator_test.rb +1 -0
  43. metadata +6 -6
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.3.1
1
+ 0.4.1
@@ -1,4 +1,4 @@
1
- require File.dirname(__FILE__) + "/../../project"
1
+ require File.expand_path(File.dirname(__FILE__) + "/../../project")
2
2
 
3
3
  module Ritsu
4
4
  class Project
@@ -1,20 +1,19 @@
1
- require File.dirname(__FILE__) + '/../../../src_file'
2
- require File.dirname(__FILE__) + '/../../../project'
3
- require File.dirname(__FILE__) + '/../../../utility/instance_set'
1
+ require File.expand_path(File.dirname(__FILE__) + "/../../../project")
2
+ require File.expand_path(File.dirname(__FILE__) + "/../../../src_file")
4
3
 
5
4
  module Ritsu
6
5
  module SrcFiles
7
- module GlvpFileMixin
6
+ module FragFileMixin
8
7
  def glsl_file?
9
8
  true
10
9
  end
11
10
 
12
- def glvp_file?
13
- true
11
+ def vert_file?
12
+ false
14
13
  end
15
14
 
16
- def glfp_file?
17
- false
15
+ def frag_file?
16
+ true
18
17
  end
19
18
 
20
19
  def header_file?
@@ -34,31 +33,31 @@ module Ritsu
34
33
  end
35
34
  end
36
35
 
37
- class GlvpFile < Ritsu::SrcFile
38
- include GlvpFileMixin
36
+ class FragFile < Ritsu::SrcFile
37
+ include FragFileMixin
39
38
 
40
39
  def initialize(src_path, owner)
41
40
  super(src_path, owner)
42
41
  end
43
42
  end
44
43
 
45
- module AddGlvpFile
46
- def add_glvp_file(path, options={})
44
+ module AddFragFile
45
+ def add_frag_file(path, options={})
47
46
  src_path = compute_src_path(path, options)
48
- glvp_file = GlvpFile.new(src_path, self)
47
+ frag_file = FragFile.new(src_path, self)
49
48
 
50
- cpp_src_path = compute_src_path(glvp_file.cpp_file_base_name, options)
49
+ cpp_src_path = compute_src_path(frag_file.cpp_file_base_name, options)
51
50
  cpp_file = CppFile.new(cpp_src_path, self)
52
51
 
53
52
  self.custom_commands << "ADD_CUSTOM_COMMAND(\n" +
54
53
  " OUTPUT ${CMAKE_SOURCE_DIR}/#{cpp_src_path}\n" +
55
- " COMMAND define_cpp_string #{glvp_file.code_var_name} < ${CMAKE_SOURCE_DIR}/#{glvp_file.src_path} > ${CMAKE_SOURCE_DIR}/#{cpp_file.src_path}\n" +
56
- " DEPENDS ${CMAKE_SOURCE_DIR}/#{glvp_file.src_path})"
54
+ " COMMAND define_cpp_string #{frag_file.code_var_name} < ${CMAKE_SOURCE_DIR}/#{frag_file.src_path} > ${CMAKE_SOURCE_DIR}/#{cpp_file.src_path}\n" +
55
+ " DEPENDS ${CMAKE_SOURCE_DIR}/#{frag_file.src_path})"
57
56
  end
58
57
 
59
- def add_glvp_files(*paths)
58
+ def add_frag_files(*paths)
60
59
  paths.each do |path|
61
- add_glvp_file(path)
60
+ add_frag_file(path)
62
61
  end
63
62
  end
64
63
  end
@@ -67,10 +66,10 @@ end
67
66
 
68
67
  module Ritsu
69
68
  class Target
70
- include Ritsu::SrcFiles::AddGlvpFile
69
+ include Ritsu::SrcFiles::AddFragFile
71
70
  end
72
71
 
73
72
  class Project
74
- include Ritsu::SrcFiles::AddGlvpFile
73
+ include Ritsu::SrcFiles::AddFragFile
75
74
  end
76
75
  end
@@ -1,23 +1,19 @@
1
- require 'rubygems'
2
- require 'active_support/core_ext/string/inflections'
3
- require File.dirname(__FILE__) + '/../../../src_file'
4
- require File.dirname(__FILE__) + '/../../../project'
5
- require File.dirname(__FILE__) + '/../../../utility/instance_set'
6
- require File.dirname(__FILE__) + '/../../../src_files/cpp_file'
1
+ require File.expand_path(File.dirname(__FILE__) + "/../../../project")
2
+ require File.expand_path(File.dirname(__FILE__) + "/../../../src_file")
7
3
 
8
4
  module Ritsu
9
5
  module SrcFiles
10
- module GlfpFileMixin
6
+ module VertFileMixin
11
7
  def glsl_file?
12
8
  true
13
9
  end
14
10
 
15
- def glvp_file?
16
- false
11
+ def vert_file?
12
+ true
17
13
  end
18
14
 
19
- def glfp_file?
20
- true
15
+ def frag_file?
16
+ false
21
17
  end
22
18
 
23
19
  def header_file?
@@ -37,31 +33,31 @@ module Ritsu
37
33
  end
38
34
  end
39
35
 
40
- class GlfpFile < Ritsu::SrcFile
41
- include GlfpFileMixin
36
+ class VertFile < Ritsu::SrcFile
37
+ include VertFileMixin
42
38
 
43
39
  def initialize(src_path, owner)
44
40
  super(src_path, owner)
45
41
  end
46
42
  end
47
43
 
48
- module AddGlfpFile
49
- def add_glfp_file(path, options={})
44
+ module AddVertFile
45
+ def add_vert_file(path, options={})
50
46
  src_path = compute_src_path(path, options)
51
- glfp_file = GlfpFile.new(src_path, self)
47
+ vert_file = VertFile.new(src_path, self)
52
48
 
53
- cpp_src_path = compute_src_path(glfp_file.cpp_file_base_name, options)
49
+ cpp_src_path = compute_src_path(vert_file.cpp_file_base_name, options)
54
50
  cpp_file = CppFile.new(cpp_src_path, self)
55
51
 
56
52
  self.custom_commands << "ADD_CUSTOM_COMMAND(\n" +
57
53
  " OUTPUT ${CMAKE_SOURCE_DIR}/#{cpp_src_path}\n" +
58
- " COMMAND define_cpp_string #{glfp_file.code_var_name} < ${CMAKE_SOURCE_DIR}/#{glfp_file.src_path} > ${CMAKE_SOURCE_DIR}/#{cpp_file.src_path}\n" +
59
- " DEPENDS ${CMAKE_SOURCE_DIR}/#{glfp_file.src_path})"
54
+ " COMMAND define_cpp_string #{vert_file.code_var_name} < ${CMAKE_SOURCE_DIR}/#{vert_file.src_path} > ${CMAKE_SOURCE_DIR}/#{cpp_file.src_path}\n" +
55
+ " DEPENDS ${CMAKE_SOURCE_DIR}/#{vert_file.src_path})"
60
56
  end
61
57
 
62
- def add_glfp_files(*paths)
58
+ def add_vert_files(*paths)
63
59
  paths.each do |path|
64
- add_glfp_file(path)
60
+ add_vert_file(path)
65
61
  end
66
62
  end
67
63
  end
@@ -70,10 +66,10 @@ end
70
66
 
71
67
  module Ritsu
72
68
  class Target
73
- include Ritsu::SrcFiles::AddGlfpFile
69
+ include Ritsu::SrcFiles::AddVertFile
74
70
  end
75
71
 
76
72
  class Project
77
- include Ritsu::SrcFiles::AddGlfpFile
73
+ include Ritsu::SrcFiles::AddVertFile
78
74
  end
79
75
  end
@@ -1,2 +1,2 @@
1
- require File.dirname(__FILE__) + "/glsl/src_files/glvp_file"
2
- require File.dirname(__FILE__) + "/glsl/src_files/glfp_file"
1
+ require File.expand_path(File.dirname(__FILE__) + "/glsl/src_files/frag_file")
2
+ require File.expand_path(File.dirname(__FILE__) + "/glsl/src_files/vert_file")
@@ -1,7 +1,7 @@
1
1
  require 'rubygems'
2
2
  require 'active_support'
3
- require File.dirname(__FILE__) + '/utility/accessors'
4
- require File.dirname(__FILE__) + '/utility/instance_set'
3
+ require File.expand_path(File.dirname(__FILE__) + '/utility/accessors')
4
+ require File.expand_path(File.dirname(__FILE__) + '/utility/instance_set')
5
5
 
6
6
  module Ritsu
7
7
  class ExternalLibrary
data/lib/ritsu/project.rb CHANGED
@@ -1,11 +1,11 @@
1
1
  require 'rubygems'
2
2
  require 'active_support'
3
- require File.dirname(__FILE__) + '/external_library'
4
- require File.dirname(__FILE__) + '/utility/single_instance'
5
- require File.dirname(__FILE__) + '/utility/strings'
6
- require File.dirname(__FILE__) + '/src_files/project_cmake_lists'
7
- require File.dirname(__FILE__) + '/src_files/project_config_header_file'
8
- require File.dirname(__FILE__) + '/src_files/project_config_header_template_file'
3
+ require File.expand_path(File.dirname(__FILE__) + '/external_library')
4
+ require File.expand_path(File.dirname(__FILE__) + '/utility/single_instance')
5
+ require File.expand_path(File.dirname(__FILE__) + '/utility/strings')
6
+ require File.expand_path(File.dirname(__FILE__) + '/src_files/project_cmake_lists')
7
+ require File.expand_path(File.dirname(__FILE__) + '/src_files/project_config_header_file')
8
+ require File.expand_path(File.dirname(__FILE__) + '/src_files/project_config_header_template_file')
9
9
 
10
10
  module Ritsu
11
11
  class Project
@@ -1,6 +1,6 @@
1
- require File.dirname(__FILE__) + '/utility/file_robot'
2
- require File.dirname(__FILE__) + '/utility/instance_set'
3
- require File.dirname(__FILE__) + '/utility/strings'
1
+ require File.expand_path(File.dirname(__FILE__) + '/utility/file_robot')
2
+ require File.expand_path(File.dirname(__FILE__) + '/utility/instance_set')
3
+ require File.expand_path(File.dirname(__FILE__) + '/utility/strings')
4
4
 
5
5
  module Ritsu
6
6
  class ProjectGenerator
@@ -2,9 +2,9 @@ require 'rubygems'
2
2
  require 'singleton'
3
3
  require 'erb'
4
4
  require 'active_support/core_ext/string/inflections'
5
- require File.dirname(__FILE__) + '/../project_generator'
6
- require File.dirname(__FILE__) + '/../utility/file_robot'
7
- require File.dirname(__FILE__) + '/../utility/files'
5
+ require File.expand_path(File.dirname(__FILE__) + '/../project_generator')
6
+ require File.expand_path(File.dirname(__FILE__) + '/../utility/file_robot')
7
+ require File.expand_path(File.dirname(__FILE__) + '/../utility/files')
8
8
 
9
9
  module Ritsu
10
10
  module ProjectGenerators
@@ -3,7 +3,7 @@
3
3
  require 'rubygems'
4
4
  require 'thor'
5
5
  require 'ritsu'
6
- require File.dirname(__FILE__) + "/meta/project.rb"
6
+ require File.expand_path(File.dirname(__FILE__) + "/meta/project.rb")
7
7
 
8
8
  class <%= @project_name.camelize %> < Ritsu::Thors::DefaultThor
9
9
  end
@@ -1,3 +1,4 @@
1
+ require 'rubygems'
1
2
  require 'ritsu'
2
3
 
3
4
  Ritsu::Project.create('<%= @project_name %>') do |p|
@@ -1 +1 @@
1
- require File.dirname(__FILE__) + '/project_generators/default_generator'
1
+ require File.expand_path(File.dirname(__FILE__) + '/project_generators/default_generator')
@@ -1,7 +1,7 @@
1
1
  require 'rubygems'
2
2
  require 'active_support'
3
- require File.dirname(__FILE__) + '/utility/instance_set'
4
- require File.dirname(__FILE__) + '/utility/file_robot'
3
+ require File.expand_path(File.dirname(__FILE__) + '/utility/instance_set')
4
+ require File.expand_path(File.dirname(__FILE__) + '/utility/file_robot')
5
5
 
6
6
  module Ritsu
7
7
  class SrcFile
@@ -1,7 +1,7 @@
1
- require File.dirname(__FILE__) + '/../src_file'
2
- require File.dirname(__FILE__) + '/../project'
3
- require File.dirname(__FILE__) + '/../utility/instance_set'
4
- require File.dirname(__FILE__) + '/cpp_file_mixin'
1
+ require File.expand_path(File.dirname(__FILE__) + '/../src_file')
2
+ require File.expand_path(File.dirname(__FILE__) + '/../project')
3
+ require File.expand_path(File.dirname(__FILE__) + '/../utility/instance_set')
4
+ require File.expand_path(File.dirname(__FILE__) + '/cpp_file_mixin')
5
5
 
6
6
  module Ritsu
7
7
  module SrcFiles
@@ -1,4 +1,4 @@
1
- require File.dirname(__FILE__) + '/../src_files/target_cmake_lists'
1
+ require File.expand_path(File.dirname(__FILE__) + '/../src_files/target_cmake_lists')
2
2
 
3
3
  module Ritsu
4
4
  module SrcFiles
@@ -1,8 +1,8 @@
1
- require File.dirname(__FILE__) + '/../src_file'
2
- require File.dirname(__FILE__) + '/../project'
3
- require File.dirname(__FILE__) + '/../utility/instance_set'
4
- require File.dirname(__FILE__) + '/../utility/file_robot'
5
- require File.dirname(__FILE__) + '/header_file_mixin'
1
+ require File.expand_path(File.dirname(__FILE__) + '/../src_file')
2
+ require File.expand_path(File.dirname(__FILE__) + '/../project')
3
+ require File.expand_path(File.dirname(__FILE__) + '/../utility/instance_set')
4
+ require File.expand_path(File.dirname(__FILE__) + '/../utility/file_robot')
5
+ require File.expand_path(File.dirname(__FILE__) + '/header_file_mixin')
6
6
 
7
7
  module Ritsu
8
8
  module SrcFiles
@@ -1,6 +1,6 @@
1
- require File.dirname(__FILE__) + '/../template'
2
- require File.dirname(__FILE__) + '/../template_policies'
3
- require File.dirname(__FILE__) + '/../src_files/templated_src_file'
1
+ require File.expand_path(File.dirname(__FILE__) + '/../template')
2
+ require File.expand_path(File.dirname(__FILE__) + '/../template_policies')
3
+ require File.expand_path(File.dirname(__FILE__) + '/../src_files/templated_src_file')
4
4
 
5
5
  module Ritsu
6
6
  module SrcFiles
@@ -1,4 +1,4 @@
1
- require File.dirname(__FILE__) + "/../src_file"
1
+ require File.expand_path(File.dirname(__FILE__) + "/../src_file")
2
2
 
3
3
  module Ritsu
4
4
  module SrcFiles
@@ -1,10 +1,10 @@
1
1
  require 'rubygems'
2
2
  require 'active_support/core_ext/string/inflections'
3
- require File.dirname(__FILE__) + "/templated_src_file"
4
- require File.dirname(__FILE__) + "/../template_policies"
5
- require File.dirname(__FILE__) + "/../template"
6
- require File.dirname(__FILE__) + "/../utility/platform"
7
- require File.dirname(__FILE__) + "/header_file_mixin"
3
+ require File.expand_path(File.dirname(__FILE__) + "/templated_src_file")
4
+ require File.expand_path(File.dirname(__FILE__) + "/../template_policies")
5
+ require File.expand_path(File.dirname(__FILE__) + "/../template")
6
+ require File.expand_path(File.dirname(__FILE__) + "/../utility/platform")
7
+ require File.expand_path(File.dirname(__FILE__) + "/header_file_mixin")
8
8
 
9
9
  module Ritsu
10
10
  module SrcFiles
@@ -1,4 +1,4 @@
1
- require File.dirname(__FILE__) + '/../src_files/target_cmake_lists'
1
+ require File.expand_path(File.dirname(__FILE__) + '/../src_files/target_cmake_lists')
2
2
 
3
3
  module Ritsu
4
4
  module SrcFiles
@@ -1,4 +1,4 @@
1
- require File.dirname(__FILE__) + '/../src_files/target_cmake_lists'
1
+ require File.expand_path(File.dirname(__FILE__) + '/../src_files/target_cmake_lists')
2
2
 
3
3
  module Ritsu
4
4
  module SrcFiles
@@ -1,8 +1,8 @@
1
- require File.dirname(__FILE__) + '/../src_file'
2
- require File.dirname(__FILE__) + '/../utility/instance_set'
3
- require File.dirname(__FILE__) + '/../template'
4
- require File.dirname(__FILE__) + '/../template_policies'
5
- require File.dirname(__FILE__) + '/../src_files/templated_src_file'
1
+ require File.expand_path(File.dirname(__FILE__) + '/../src_file')
2
+ require File.expand_path(File.dirname(__FILE__) + '/../utility/instance_set')
3
+ require File.expand_path(File.dirname(__FILE__) + '/../template')
4
+ require File.expand_path(File.dirname(__FILE__) + '/../template_policies')
5
+ require File.expand_path(File.dirname(__FILE__) + '/../src_files/templated_src_file')
6
6
 
7
7
  module Ritsu
8
8
  module SrcFiles
@@ -1,7 +1,7 @@
1
- require File.dirname(__FILE__) + '/../src_file'
2
- require File.dirname(__FILE__) + '/../utility/file_robot'
3
- require File.dirname(__FILE__) + '/../block'
4
- require File.dirname(__FILE__) + '/../utility/files'
1
+ require File.expand_path(File.dirname(__FILE__) + '/../src_file')
2
+ require File.expand_path(File.dirname(__FILE__) + '/../utility/file_robot')
3
+ require File.expand_path(File.dirname(__FILE__) + '/../block')
4
+ require File.expand_path(File.dirname(__FILE__) + '/../utility/files')
5
5
 
6
6
  module Ritsu::SrcFiles
7
7
  class TemplatedSrcFile < Ritsu::SrcFile
@@ -1,6 +1,6 @@
1
- require File.dirname(__FILE__) + '/../src_file'
2
- require File.dirname(__FILE__) + '/cpp_file'
3
- require File.dirname(__FILE__) + '/header_file'
1
+ require File.expand_path(File.dirname(__FILE__) + '/../src_file')
2
+ require File.expand_path(File.dirname(__FILE__) + '/cpp_file')
3
+ require File.expand_path(File.dirname(__FILE__) + '/header_file')
4
4
 
5
5
  module Ritsu
6
6
  module SrcFiles
@@ -1,15 +1,15 @@
1
- require File.dirname(__FILE__) + '/src_files/project_cmake_lists'
1
+ require File.expand_path(File.dirname(__FILE__) + '/src_files/project_cmake_lists')
2
2
 
3
- require File.dirname(__FILE__) + '/src_files/templated_src_file'
3
+ require File.expand_path(File.dirname(__FILE__) + '/src_files/templated_src_file')
4
4
 
5
- require File.dirname(__FILE__) + '/src_files/cpp_file_mixin'
6
- require File.dirname(__FILE__) + '/src_files/cpp_file'
7
- require File.dirname(__FILE__) + '/src_files/header_file_mixin'
8
- require File.dirname(__FILE__) + '/src_files/header_file'
9
- require File.dirname(__FILE__) + '/src_files/target_cmake_lists'
10
- require File.dirname(__FILE__) + '/src_files/executable_cmake_lists'
11
- require File.dirname(__FILE__) + '/src_files/shared_library_cmake_lists'
12
- require File.dirname(__FILE__) + '/src_files/static_library_cmake_lists'
13
- require File.dirname(__FILE__) + '/src_files/project_config_header_file'
14
- require File.dirname(__FILE__) + '/src_files/project_config_header_template_file'
15
- require File.dirname(__FILE__) + "/src_files/unit"
5
+ require File.expand_path(File.dirname(__FILE__) + '/src_files/cpp_file_mixin')
6
+ require File.expand_path(File.dirname(__FILE__) + '/src_files/cpp_file')
7
+ require File.expand_path(File.dirname(__FILE__) + '/src_files/header_file_mixin')
8
+ require File.expand_path(File.dirname(__FILE__) + '/src_files/header_file')
9
+ require File.expand_path(File.dirname(__FILE__) + '/src_files/target_cmake_lists')
10
+ require File.expand_path(File.dirname(__FILE__) + '/src_files/executable_cmake_lists')
11
+ require File.expand_path(File.dirname(__FILE__) + '/src_files/shared_library_cmake_lists')
12
+ require File.expand_path(File.dirname(__FILE__) + '/src_files/static_library_cmake_lists')
13
+ require File.expand_path(File.dirname(__FILE__) + '/src_files/project_config_header_file')
14
+ require File.expand_path(File.dirname(__FILE__) + '/src_files/project_config_header_template_file')
15
+ require File.expand_path(File.dirname(__FILE__) + "/src_files/unit")
data/lib/ritsu/target.rb CHANGED
@@ -2,12 +2,12 @@ require 'rubygems'
2
2
  require 'active_support'
3
3
  require 'set'
4
4
  require 'pathname'
5
- require File.dirname(__FILE__) + '/utility/instance_set'
6
- require File.dirname(__FILE__) + '/utility/strings'
7
- require File.dirname(__FILE__) + '/project'
8
- require File.dirname(__FILE__) + '/utility/check_upon_add_set'
9
- require File.dirname(__FILE__) + '/external_library'
10
- require File.dirname(__FILE__) + '/utility/instance_dependencies'
5
+ require File.expand_path(File.dirname(__FILE__) + '/utility/instance_set')
6
+ require File.expand_path(File.dirname(__FILE__) + '/utility/strings')
7
+ require File.expand_path(File.dirname(__FILE__) + '/project')
8
+ require File.expand_path(File.dirname(__FILE__) + '/utility/check_upon_add_set')
9
+ require File.expand_path(File.dirname(__FILE__) + '/external_library')
10
+ require File.expand_path(File.dirname(__FILE__) + '/utility/instance_dependencies')
11
11
 
12
12
  module Ritsu
13
13
  class Target
@@ -1,8 +1,8 @@
1
1
  require 'rubygems'
2
2
  require 'active_support'
3
- require File.dirname(__FILE__) + '/../target'
4
- require File.dirname(__FILE__) + '/../utility/instance_set'
5
- require File.dirname(__FILE__) + '/../src_files/executable_cmake_lists'
3
+ require File.expand_path(File.dirname(__FILE__) + '/../target')
4
+ require File.expand_path(File.dirname(__FILE__) + '/../utility/instance_set')
5
+ require File.expand_path(File.dirname(__FILE__) + '/../src_files/executable_cmake_lists')
6
6
 
7
7
  module Ritsu::Targets
8
8
  class Executable < Ritsu::Target
@@ -1,5 +1,5 @@
1
- require File.dirname(__FILE__) + "/../target"
2
- require File.dirname(__FILE__) + "/../utility/accessors"
1
+ require File.expand_path(File.dirname(__FILE__) + "/../target")
2
+ require File.expand_path(File.dirname(__FILE__) + "/../utility/accessors")
3
3
 
4
4
  module Ritsu::Targets
5
5
  class Library < Ritsu::Target
@@ -1,8 +1,8 @@
1
1
  require 'rubygems'
2
2
  require 'active_support'
3
- require File.dirname(__FILE__) + '/library'
4
- require File.dirname(__FILE__) + '/../utility/instance_set'
5
- require File.dirname(__FILE__) + '/../src_files/shared_library_cmake_lists'
3
+ require File.expand_path(File.dirname(__FILE__) + '/library')
4
+ require File.expand_path(File.dirname(__FILE__) + '/../utility/instance_set')
5
+ require File.expand_path(File.dirname(__FILE__) + '/../src_files/shared_library_cmake_lists')
6
6
 
7
7
  module Ritsu::Targets
8
8
  class SharedLibrary < Ritsu::Targets::Library
@@ -1,8 +1,8 @@
1
1
  require 'rubygems'
2
2
  require 'active_support'
3
- require File.dirname(__FILE__) + '/library'
4
- require File.dirname(__FILE__) + '/../utility/instance_set'
5
- require File.dirname(__FILE__) + '/../src_files/static_library_cmake_lists'
3
+ require File.expand_path(File.dirname(__FILE__) + '/library')
4
+ require File.expand_path(File.dirname(__FILE__) + '/../utility/instance_set')
5
+ require File.expand_path(File.dirname(__FILE__) + '/../src_files/static_library_cmake_lists')
6
6
 
7
7
  module Ritsu::Targets
8
8
  class StaticLibrary < Ritsu::Targets::Library
data/lib/ritsu/targets.rb CHANGED
@@ -1,4 +1,4 @@
1
- require File.dirname(__FILE__) + '/targets/executable'
2
- require File.dirname(__FILE__) + '/targets/library'
3
- require File.dirname(__FILE__) + '/targets/static_library'
4
- require File.dirname(__FILE__) + '/targets/shared_library'
1
+ require File.expand_path(File.dirname(__FILE__) + '/targets/executable')
2
+ require File.expand_path(File.dirname(__FILE__) + '/targets/library')
3
+ require File.expand_path(File.dirname(__FILE__) + '/targets/static_library')
4
+ require File.expand_path(File.dirname(__FILE__) + '/targets/shared_library')
@@ -1,4 +1,4 @@
1
- require File.dirname(__FILE__) + '/block'
1
+ require File.expand_path(File.dirname(__FILE__) + '/block')
2
2
 
3
3
  module Ritsu
4
4
  class Template
@@ -1,4 +1,4 @@
1
- require File.dirname(__FILE__) + '/template'
1
+ require File.expand_path(File.dirname(__FILE__) + '/template')
2
2
 
3
3
  module Ritsu::TemplatePolicies
4
4
  module StrictBlockMatchingButLeaveUserTextBe
@@ -1,8 +1,8 @@
1
1
  require 'test/unit'
2
- require File.dirname(__FILE__) + "/target"
3
- require File.dirname(__FILE__) + "/src_file"
4
- require File.dirname(__FILE__) + "/external_library"
5
- require File.dirname(__FILE__) + "/project"
2
+ require File.expand_path(File.dirname(__FILE__) + "/target")
3
+ require File.expand_path(File.dirname(__FILE__) + "/src_file")
4
+ require File.expand_path(File.dirname(__FILE__) + "/external_library")
5
+ require File.expand_path(File.dirname(__FILE__) + "/project")
6
6
 
7
7
  module Ritsu
8
8
  module SetupProjectAndClearEverythingElse
@@ -1,6 +1,7 @@
1
+ require 'rubygems'
1
2
  require 'thor'
2
- require File.dirname(__FILE__) + '/../project'
3
- require File.dirname(__FILE__) + '/../utility/platform'
3
+ require File.expand_path(File.dirname(__FILE__) + '/../project')
4
+ require File.expand_path(File.dirname(__FILE__) + '/../utility/platform')
4
5
 
5
6
  module Ritsu::Thors
6
7
  class DefaultThor < Thor
data/lib/ritsu/thors.rb CHANGED
@@ -1 +1 @@
1
- require File.dirname(__FILE__) + '/thors/default_thor'
1
+ require File.expand_path(File.dirname(__FILE__) + '/thors/default_thor')
@@ -1,6 +1,6 @@
1
1
  require 'fileutils'
2
2
  require 'singleton'
3
- require File.dirname(__FILE__) + '/../utility/simple_io'
3
+ require File.expand_path(File.dirname(__FILE__) + '/../utility/simple_io')
4
4
 
5
5
  module Ritsu
6
6
  module Utility
@@ -1,7 +1,7 @@
1
1
  require 'rubygems'
2
2
  require 'active_support/core_ext/string/inflections'
3
3
  require 'active_support/inflector'
4
- require File.dirname(__FILE__) + "/instance_set"
4
+ require File.expand_path(File.dirname(__FILE__) + "/instance_set")
5
5
 
6
6
  module Ritsu
7
7
  module Utility
@@ -1,4 +1,4 @@
1
- require File.dirname(__FILE__) + '/../utility/check_upon_add_set'
1
+ require File.expand_path(File.dirname(__FILE__) + '/../utility/check_upon_add_set')
2
2
 
3
3
  module Ritsu
4
4
  module Utility
data/lib/ritsu/utility.rb CHANGED
@@ -1,8 +1,8 @@
1
- require File.dirname(__FILE__) + '/utility/strings'
2
- require File.dirname(__FILE__) + '/utility/accessors'
3
- require File.dirname(__FILE__) + '/utility/instance_set'
4
- require File.dirname(__FILE__) + '/utility/simple_io'
5
- require File.dirname(__FILE__) + '/utility/file_robot'
6
- require File.dirname(__FILE__) + '/utility/check_upon_add_set'
7
- require File.dirname(__FILE__) + '/utility/files'
8
- require File.dirname(__FILE__) + '/utility/platform'
1
+ require File.expand_path(File.dirname(__FILE__) + '/utility/strings')
2
+ require File.expand_path(File.dirname(__FILE__) + '/utility/accessors')
3
+ require File.expand_path(File.dirname(__FILE__) + '/utility/instance_set')
4
+ require File.expand_path(File.dirname(__FILE__) + '/utility/simple_io')
5
+ require File.expand_path(File.dirname(__FILE__) + '/utility/file_robot')
6
+ require File.expand_path(File.dirname(__FILE__) + '/utility/check_upon_add_set')
7
+ require File.expand_path(File.dirname(__FILE__) + '/utility/files')
8
+ require File.expand_path(File.dirname(__FILE__) + '/utility/platform')
data/lib/ritsu.rb CHANGED
@@ -1,17 +1,17 @@
1
1
  require 'rubygems'
2
2
  require 'active_support'
3
3
 
4
- require File.dirname(__FILE__) + '/ritsu/external_library'
5
- require File.dirname(__FILE__) + '/ritsu/project'
6
- require File.dirname(__FILE__) + '/ritsu/target'
7
- require File.dirname(__FILE__) + '/ritsu/src_file'
8
- require File.dirname(__FILE__) + '/ritsu/block'
9
- require File.dirname(__FILE__) + '/ritsu/template'
10
- require File.dirname(__FILE__) + '/ritsu/project_generator'
4
+ require File.expand_path(File.dirname(__FILE__) + '/ritsu/external_library')
5
+ require File.expand_path(File.dirname(__FILE__) + '/ritsu/project')
6
+ require File.expand_path(File.dirname(__FILE__) + '/ritsu/target')
7
+ require File.expand_path(File.dirname(__FILE__) + '/ritsu/src_file')
8
+ require File.expand_path(File.dirname(__FILE__) + '/ritsu/block')
9
+ require File.expand_path(File.dirname(__FILE__) + '/ritsu/template')
10
+ require File.expand_path(File.dirname(__FILE__) + '/ritsu/project_generator')
11
11
 
12
- require File.dirname(__FILE__) + '/ritsu/template_policies'
13
- require File.dirname(__FILE__) + '/ritsu/targets'
14
- require File.dirname(__FILE__) + '/ritsu/src_files'
15
- require File.dirname(__FILE__) + '/ritsu/utility'
16
- require File.dirname(__FILE__) + '/ritsu/project_generators'
17
- require File.dirname(__FILE__) + '/ritsu/thors'
12
+ require File.expand_path(File.dirname(__FILE__) + '/ritsu/template_policies')
13
+ require File.expand_path(File.dirname(__FILE__) + '/ritsu/targets')
14
+ require File.expand_path(File.dirname(__FILE__) + '/ritsu/src_files')
15
+ require File.expand_path(File.dirname(__FILE__) + '/ritsu/utility')
16
+ require File.expand_path(File.dirname(__FILE__) + '/ritsu/project_generators')
17
+ require File.expand_path(File.dirname(__FILE__) + '/ritsu/thors')
@@ -19,6 +19,7 @@ class DefaultGeneratorTest < Test::Unit::TestCase
19
19
  assert_output_file_exists("mio/meta/project.rb")
20
20
 
21
21
  expected_project_rb_content = <<-RUBY
22
+ require 'rubygems'
22
23
  require 'ritsu'
23
24
 
24
25
  Ritsu::Project.create('mio') do |p|
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ritsu
3
3
  version: !ruby/object:Gem::Version
4
- hash: 17
4
+ hash: 13
5
5
  prerelease: false
6
6
  segments:
7
7
  - 0
8
- - 3
8
+ - 4
9
9
  - 1
10
- version: 0.3.1
10
+ version: 0.4.1
11
11
  platform: ruby
12
12
  authors:
13
13
  - dragonmeteor
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2010-07-21 00:00:00 +07:00
18
+ date: 2010-07-22 00:00:00 +07:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
@@ -121,8 +121,8 @@ files:
121
121
  - lib/ritsu/ext/fake_install/project.rb
122
122
  - lib/ritsu/ext/fake_install/src_files/project_cmake_lists.rb
123
123
  - lib/ritsu/ext/glsl.rb
124
- - lib/ritsu/ext/glsl/src_files/glfp_file.rb
125
- - lib/ritsu/ext/glsl/src_files/glvp_file.rb
124
+ - lib/ritsu/ext/glsl/src_files/frag_file.rb
125
+ - lib/ritsu/ext/glsl/src_files/vert_file.rb
126
126
  - lib/ritsu/ext/test_case.rb
127
127
  - lib/ritsu/external_library.rb
128
128
  - lib/ritsu/project.rb