| author | April Chin <april.chin@oracle.com> |
| Mon, 04 May 2015 10:54:49 -0700 | |
| branch | s11-update |
| changeset 4241 | 9c60eb0ab04b |
| permissions | -rw-r--r-- |
|
4241
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
1 |
# In-house patch created to keep inappropriate full pathnames |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
2 |
# on build systems from being included in the ri Ruby doc files. |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
3 |
# Patch is Solaris specific and not appropriate for upstream use. |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
4 |
|
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
5 |
diff -ru ruby-2.1.5-orig/common.mk ruby-2.1.5/common.mk |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
6 |
--- ruby-2.1.5-orig/common.mk Wed Sep 10 07:07:46 2014 |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
7 |
+++ ruby-2.1.5/common.mk Thu Jan 15 15:33:07 2015 |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
8 |
@@ -416,9 +416,17 @@ |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
9 |
post-install-gem:: |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
10 |
@$(NULLCMD) |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
11 |
|
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
12 |
+# Eliminate full pathname from source directory references |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
13 |
+# in RDoc ri files. |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
14 |
+# Create a symlink here to the source directory so |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
15 |
+# rdoc can reference it from here without the full pathname |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
16 |
+srcdir_base=$(notdir $(srcdir)) |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
17 |
rdoc: PHONY main |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
18 |
@echo Generating RDoc documentation |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
19 |
- $(Q) $(XRUBY) "$(srcdir)/bin/rdoc" --root "$(srcdir)" --page-dir "$(srcdir)/doc" --encoding=UTF-8 --no-force-update --all --ri --op "$(RDOCOUT)" --debug $(RDOCFLAGS) "$(srcdir)" |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
20 |
+ if [ ! -e $(srcdir_base) ]; then \ |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
21 |
+ /usr/bin/ln -s $(srcdir); \ |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
22 |
+ fi |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
23 |
+ $(Q) $(XRUBY) "$(srcdir)/bin/rdoc" --root "$(srcdir)" --page-dir "$(srcdir)/doc" --encoding=UTF-8 --no-force-update --all --ri --op "$(RDOCOUT)" --debug $(RDOCFLAGS) "$(srcdir_base)" |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
24 |
|
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
25 |
rdoc-coverage: PHONY main |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
26 |
@echo Generating RDoc coverage report |