Author: jsc
Date: Tue Jun 25 11:29:37 2013
New Revision: 1496422
URL: http://svn.apache.org/r1496422
Log:
#122356# patch for generated javadoc index
Added:
openoffice/trunk/main/odk/pack/gendocu/idl_ref_javadoc.patch
Modified:
openoffice/trunk/main/odk/pack/gendocu/makefile.mk
Added: openoffice/trunk/main/odk/pack/gendocu/idl_ref_javadoc.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/odk/pack/gendocu/idl_ref_javadoc.patch?rev=1496422&view=auto
==============================================================================
--- openoffice/trunk/main/odk/pack/gendocu/idl_ref_javadoc.patch (added)
+++ openoffice/trunk/main/odk/pack/gendocu/idl_ref_javadoc.patch Tue Jun 25
11:29:37 2013
@@ -0,0 +1,37 @@
+14a15,50
+> if (targetPage != "" && !validURL(targetPage))
+> targetPage = "undefined";
+> function validURL(url) {
+> var pos = url.indexOf(".html");
+> if (pos == -1 || pos != url.length - 5)
+> return false;
+> var allowNumber = false;
+> var allowSep = false;
+> var seenDot = false;
+> for (var i = 0; i < url.length - 5; i++) {
+> var ch = url.charAt(i);
+> if ('a' <= ch && ch <= 'z' ||
+> 'A' <= ch && ch <= 'Z' ||
+> ch == '$' ||
+> ch == '_') {
+> allowNumber = true;
+> allowSep = true;
+> } else if ('0' <= ch && ch <= '9'
+> || ch == '-') {
+> if (!allowNumber)
+> return false;
+> } else if (ch == '/' || ch == '.') {
+> if (!allowSep)
+> return false;
+> allowNumber = false;
+> allowSep = false;
+> if (ch == '.')
+> seenDot = true;
+> if (ch == '/' && seenDot)
+> return false;
+> } else {
+> return false;
+> }
+> }
+> return true;
+> }
Modified: openoffice/trunk/main/odk/pack/gendocu/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/odk/pack/gendocu/makefile.mk?rev=1496422&r1=1496421&r2=1496422&view=diff
==============================================================================
--- openoffice/trunk/main/odk/pack/gendocu/makefile.mk (original)
+++ openoffice/trunk/main/odk/pack/gendocu/makefile.mk Tue Jun 25 11:29:37 2013
@@ -111,6 +111,9 @@ $(JAVA_SRC_FILES) : $(SOLARCOMMONBINDIR)
$(JAVA_DOCU_INDEX_FILE) .SEQUENTIAL : $(JAVA_SRC_FILES)
-$(MKDIRHIER) $(@:d)
$(JAVADOC) -J-Xmx120m $(JAVADOCPARAMS) > $(JAVADOCLOG)
+.IF "$(OS)" != "MACOSX"
+ patch $(JAVA_DOCU_INDEX_FILE) idl_ref_javadoc.patch
+.ENDIF
.ENDIF
.ELSE
