[ooo-build-commit] patches/dev300

[Radek Doulík]

 patches/dev300/apply                           |    2 ++
 patches/dev300/xmlhelp-build-without-java.diff |   22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+)

New commits:
commit 6461cebbac1a01a7a62df5a3f990354151c1a4e9
Author: Radek Doulik <rodo at novell.com>
Date:   Mon Oct 12 14:36:44 2009 +0200

    let the xmlhelp build when java is disabled
    
    * patches/dev300/apply:
    * patches/dev300/xmlhelp-build-without-java.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index c401a1b..7aed014 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3376,3 +3376,5 @@ sd-no-macro-recorder-in-ui.diff, fridrich
 starmath-no-macro-recorder-in-ui.diff, fridrich
 sw-no-macro-recorder-in-ui.diff, fridrich
 
+[ Fixes ]
+xmlhelp-build-without-java.diff, rodo
diff --git a/patches/dev300/xmlhelp-build-without-java.diff b/patches/dev300/xmlhelp-build-without-java.diff
new file mode 100644
index 0000000..cdcce47
--- /dev/null
+++ b/patches/dev300/xmlhelp-build-without-java.diff
@@ -0,0 +1,22 @@
+diff -rup xmlhelp-orig/source/com/sun/star/help/makefile.mk xmlhelp/source/com/sun/star/help/makefile.mk
+--- xmlhelp-orig/source/com/sun/star/help/makefile.mk	2009-10-12 14:21:40.000000000 +0200
++++ xmlhelp/source/com/sun/star/help/makefile.mk	2009-10-12 14:25:53.000000000 +0200
+@@ -40,6 +40,8 @@ TARGETTYPE=CUI
+ 
+ .INCLUDE : settings.mk
+ .INCLUDE : helplinker.pmk
++
++.IF "$(SOLAR_JAVA)"=="TRUE"
+  
+ .IF "$(SYSTEM_LIBXSLT)" == "YES"
+ CFLAGS+= $(LIBXSLT_CFLAGS)
+@@ -109,3 +111,9 @@ fix_system_lucene:
+     @echo "Fix Java Class-Path entry for Lucene libraries from system."
+     @$(SED) -r -e "s#^(Class-Path:).*#\1 file://$(LUCENE_CORE_JAR) file://$(LUCENE_ANALYZERS_JAR)#" \
+     -i ../../../../../$(INPATH)/class/HelpLinker/META-INF/MANIFEST.MF
++
++.ELSE
++
++.INCLUDE :  target.mk
++
++.ENDIF