author | April Chin <april.chin@oracle.com> |
Tue, 24 Sep 2013 09:10:24 -0700 | |
changeset 1482 | 7a1f84fbc2d7 |
parent 688 | components/ruby/patches/02-code_objects-html_generator.patch@9333dc6e30ba |
permissions | -rw-r--r-- |
688
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
1 |
--- ruby-1.8.7-p357.orig/lib/rdoc/code_objects.rb 2007-02-12 15:01:19.000000000 -0800 |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
2 |
+++ ruby-1.8.7-p357/lib/rdoc/code_objects.rb 2012-02-09 12:51:13.913971000 -0800 |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
3 |
@@ -345,6 +345,14 @@ module RDoc |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
4 |
@classes.each_value {|c| yield c} |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
5 |
end |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
6 |
|
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
7 |
+ # New method for Solaris, to provide a sorted array. |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
8 |
+ # Return array of all modules and classes, each sorted by name. |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
9 |
+ |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
10 |
+ def sorted_modules_classes |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
11 |
+ @modules.values.sort_by { |m| m.name } + |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
12 |
+ @classes.values.sort_by { |c| c.name } |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
13 |
+ end |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
14 |
+ |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
15 |
def each_method |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
16 |
@method_list.each {|m| yield m} |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
17 |
end |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
18 |
--- ruby-1.8.7-p357.orig/lib/rdoc/generators/html_generator.rb 2007-02-12 15:01:19.000000000 -0800 |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
19 |
+++ ruby-1.8.7-p357/lib/rdoc/generators/html_generator.rb 2012-02-09 16:24:17.290851000 -0800 |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
20 |
@@ -1256,14 +1256,26 @@ module Generators |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
21 |
@files << HtmlFile.new(toplevel, @options, FILE_DIR) |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
22 |
end |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
23 |
|
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
24 |
- RDoc::TopLevel.all_classes_and_modules.each do |cls| |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
25 |
+ # Solaris fix: sort the top level classes and modules, |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
26 |
+ # to provide fixed ordering for creation of html files, |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
27 |
+ # since the file names are numbered sequentially. This is |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
28 |
+ # needed for creating a deterministic set of file names for |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
29 |
+ # html document files generated by ruby. |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
30 |
+ sorted_classes_and_modules = |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
31 |
+ RDoc::TopLevel.all_classes_and_modules.sort_by { |x| x.full_name } |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
32 |
+ |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
33 |
+ sorted_classes_and_modules.each do |cls| |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
34 |
build_class_list(cls, @files[0], CLASS_DIR) |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
35 |
end |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
36 |
end |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
37 |
|
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
38 |
def build_class_list(from, html_file, class_dir) |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
39 |
@classes << HtmlClass.new(from, html_file, class_dir, @options) |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
40 |
- from.each_classmodule do |mod| |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
41 |
+ |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
42 |
+ # Solaris fix: sorts modules and classes by name, to provide |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
43 |
+ # a fixed set of html file pathnames, which are numbered |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
44 |
+ # sequentially. |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
45 |
+ from.sorted_modules_classes.each do |mod| |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
46 |
build_class_list(mod, html_file, class_dir) |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
47 |
end |
9333dc6e30ba
7127211 Problem with utility/ruby
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
48 |
end |