Bug#211288: [PATCH] Build without JDK (updated)
Sorry for the delay in replying, but my test builds took longer than
expected due to the recent compiler upgrade that invalidated my ccache.
Chris Halls wrote:
> On Tue, Sep 16, 2003 at 01:29:35PM -0700, Josh Triplett wrote:
>
>>With the attached patches, OpenOffice.org will build without a JDK
>>installed.
>
>
> The patchset that we share with Ximian is licensed the same as OOo itself,
> to avoid problems for anyone who wants to make use of the patches, and to
> help get patches integrated into the official OOo CVS without extra hurdles.
> I don't see your name on the contributors list [1]. Please can you fill in
> a JCA form [2] so that we can add your patches?
No problem. The form is on its way.
>> + readlicense-oo-xsltproc.diff - Use xsltproc to replace java
>> for xml transforms in readlicense_oo.
>> + officecfg-xsltproc.diff - Use xsltproc to replace java for xml
>> transforms in officecfg.
>
>
> I see your comments '# FIXME: replace org.openoffice...'. Does this mean
> that something is missing from the output generated using your patches? If
> so, we could perhaps consider using Kaffe instead, if the FIXME is a lot of
> work.
Nothing is missing from the output. org.openoffice.helper.PrettyPrinter
just pretty-prints the xml, which I replaced with a simple 'cp'. The
files that xsltproc outputs appear to be pretty-printed already anyway.
org.openoffice.configuration.Inspector is just an extra validation step
that does not appear to output any files. In the attached patch, I
clarified the comments in that makefile to include explanations, and I
removed the "FIXME:".
>> + allow-no-jdk.diff - If java is disabled with --disable-java,
>> don't abort the configure script if a JDK is not found.
>
>
> It would be helpful to check for the tool used to do the xml processing
> (xsltproc or Kaffe depending on the answer to the last question) and only
> proceed if at least one tool is present.
The attached patch corrects this issue. If java is disabled with
--disable-java, the configure script looks for xsltproc, and aborts if
it is not found. Also, this patch uses $(SED) and $(XSLTPROC) instead of
sed and xsltproc in the makefiles.
>> + jurt-handle-no-solar-java.diff - Don't build jpipe with
>> SOLAR_JAVA not set.
>
>
> I asked upstream about the style of makefile.mk we should use to not build
> anything at all [3], and I was asked to try not to add an extra 'dummy'
> target, but to enclose just the targets in a conditional, i.e.:
>
> .IF "$(SOLAR_JAVA)"!=""
>
> SLOFILES = \
> $(SLO)$/com_sun_star_lib_connections_pipe_PipeConnection.obj
> [..]
> DEF1NAME=$(SHL1TARGET)
> DEF1EXPORTFILE=$(TARGET).dxp
> DEF1DES=jurtpipe
>
> .ENDIF
>
> .INCLUDE : target.mk
>
> instead of enclosing the complete makefile in a conditional.
>
> This is more of a style question - I don't mind adding these patches in
> their current state to the patchset.
The attached patch corrects this issue by only conditionalizing the
targets in the makefiles, not the entire makefiles.
>> * debian/rules
>> + Removed --with-jdkhome and added --disable-java in configure
>> invocation.
>> + Don't look for jdkhome in DEB_BUILD_OPTIONS.
>> + Removed classpath from BUILDCMD.
>> + Don't set JDK_HOME or test for javac in JDK_HOME.
>> * debian/scripts/detect_java.sh - Deleted.
>> * debian/setperms - Removed chmod of detect_java.sh.
>
>
> I would have preferred this to be controllable by DEB_BUILD_OPTIONS, with
> Java support disabled by default instead of removing support completely. I
> think there will still be demand for OOo built with Java for those wanting
> to use the XML filters or accessibility. But again, that can come later
> when someone wants to look at it. It might be useful to comment out the
> relevant lines instead of deleting them completely, but I don't really mind
> either way.
debian/rules could check for 'jdkhome=/some/path' in DEB_BUILD_OPTIONS,
and if that is set, use that as the JDK with the appropriate classpath
and configure options, otherwise disable java. However, this still
leaves the issue of the additional files to ship when enabling java.
Given the similar issue with mozilla support, which manually copies the
mozilla files when enabled, the best solution would probably be a
generic feature support mechanism that can accomodate both with similar
code in debian/rules, including changes to the MANIFEST.* and *.install
files, as well as setting a variable that debian/rules can easily check.
This way, java could be added as an optional feature that defaults to
off, and the only manual work in debian/rules would be to set the
configure options and classpath if the variable was set.
- Josh Triplett
diff -Naur -x CVS ooo-build.orig/patches/OOO_1_1_RC3/apply ooo-build/patches/OOO_1_1_RC3/apply
--- ooo-build.orig/patches/OOO_1_1_RC3/apply 2003-09-23 10:29:27.000000000 -0700
+++ ooo-build/patches/OOO_1_1_RC3/apply 2003-09-22 13:44:48.000000000 -0700
@@ -292,6 +292,72 @@
# compile msgbox-gnome every time (we have to support ppc, s390, ... too)
compile-msgbox-gnome.diff
+# If java is disabled with --disable-java, don't look for a JDK, but do look
+# for xsltproc, and set XSLTPROC in set_soenv.
+allow-no-jdk.diff
+
+# Set the SOLAR_JAVA variable conditionally with "*=".
+solenv-set-solar-java-only-if-unset.diff
+
+# Use xsltproc to replace java for xml transforms in readlicense_oo.
+readlicense-oo-xsltproc.diff
+
+# Use xsltproc to replace java for xml transforms in officecfg.
+officecfg-xsltproc.diff
+
+# If SOLAR_JAVA is not set, don't pass --enable-java to the configure script,
+# and don't expect the jar when finished.
+berkeleydb-handle-no-solar-java.diff
+
+# If SOLAR_JAVA is not set, don't attempt to zip up the compiled java files,
+# since they will not be built.
+ridljar-handle-no-solar-java.diff
+
+# Don't build jpipe with SOLAR_JAVA not set.
+jurt-handle-no-solar-java.diff
+
+# Don't build jvmaccess with SOLAR_JAVA not set.
+jvmaccess-handle-no-solar-java.diff
+
+# Don't build jni_uno with SOLAR_JAVA not set.
+jni-uno-handle-no-solar-java.diff
+
+# Don't build javaunohelper with SOLAR_JAVA not set
+javaunohelper-handle-no-solar-java.diff
+
+# Don't use jvmaccess to get JDK font path with SOLAR_JAVA not set.
+psprint-handle-no-solar-java.diff
+
+# When SOLAR_JAVA is not set, replace java applet support with stubs that
+# throw an exception.
+sj2-handle-no-solar-java.diff
+
+# Don't build jvmsetup or use jvmaccess for java-related setup with SOLAR_JAVA
+# not set.
+setup2-handle-no-solar-java.diff
+
+# Don't ship various java-related files that will no longer be built, but ship
+# the stubbed out libj from sj2 because setup fails without it.
+scp-handle-no-solar-java.diff
+
+# Disable SVG import support with SOLAR_JAVA not set, since it depends on
+# compile-time and run-time java support.
+svg-handle-no-solar-java.diff
+
+# Disable java components with SOLAR_JAVA not set.
+xsltvalidate-handle-no-solar-java.diff
+
+# Disable java components with SOLAR_JAVA not set.
+xsltfilter-handle-no-solar-java.diff
+
+# Don't build javaldx with SOLAR_JAVA not set, and check for javaldx in
+# soffice.sh before using it.
+desktop-handle-no-solar-java.diff
+
+# Disable java components and documentation of java jars with SOLAR_JAVA not
+# set.
+odk-handle-no-solar-java.diff
+
# so far Ximian only, controversial patches etc.
[ Ximian ]
diff -Naur -x CVS ooo-build.orig/patches/RC3/allow-no-jdk.diff ooo-build/patches/RC3/allow-no-jdk.diff
--- ooo-build.orig/patches/RC3/allow-no-jdk.diff 1969-12-31 16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/allow-no-jdk.diff 2003-09-22 11:33:53.000000000 -0700
@@ -0,0 +1,145 @@
+--- config_office/configure.in.orig 2003-09-22 11:14:29.000000000 -0700
++++ config_office/configure.in 2003-09-22 11:33:19.000000000 -0700
+@@ -1124,66 +1124,79 @@
+ dnl ===================================================================
+ dnl Checks for JDK.
+ dnl ===================================================================
+-JAVA_HOME=; export JAVA_HOME
+-if test -z "$with_jdk_home"; then
+- AC_PATH_PROG(JAVAC, javac)
+- AC_PATH_PROG(JAVA, java)
+-else
+- _javac_path="$with_jdk_home/bin/javac"
+- dnl Check if there is a java compiler at all.
+- if test -x "$_javac_path"; then
+- JAVAC=$_javac_path
+- else
+- AC_MSG_ERROR([$_javac_path not found set with_jdk_home])
++if test "$enable_java" != "no"; then
++ JAVA_HOME=; export JAVA_HOME
++ if test -z "$with_jdk_home"; then
++ AC_PATH_PROG(JAVAC, javac)
++ AC_PATH_PROG(JAVA, java)
++ else
++ _javac_path="$with_jdk_home/bin/javac"
++ dnl Check if there is a java compiler at all.
++ if test -x "$_javac_path"; then
++ JAVAC=$_javac_path
++ else
++ AC_MSG_ERROR([$_javac_path not found set with_jdk_home])
++ fi
++
++ _java_path="$with_jdk_home/bin/java"
++ dnl Check if there is a java interpreter at all.
++ if test -x "$_java_path"; then
++ JAVA=$_java_path
++ else
++ AC_MSG_ERROR([$_java_path not found set with_jdk_home])
++ fi
+ fi
++ AC_MSG_CHECKING([the installed JDK])
++ if test "$JAVA"; then
+
+- _java_path="$with_jdk_home/bin/java"
+- dnl Check if there is a java interpreter at all.
+- if test -x "$_java_path"; then
+- JAVA=$_java_path
+- else
+- AC_MSG_ERROR([$_java_path not found set with_jdk_home])
+- fi
+-fi
+-AC_MSG_CHECKING([the installed JDK])
+-if test "$JAVA"; then
+-
+- dnl java -version sends output to stderr!
+- if test `$JAVA -version 2>&1 | grep -c "Kaffe"` -gt 0; then
+-
+- dnl Kaffe specific tests
+- KAFFE_VER=`$JAVA -version 2>&1 | $EGREP " Version:" | $SED -r "s/.* Version: ([[0-9\.]]*).*/\1/"`
+- if test -z "$KAFFE_VER"; then
+- AC_MSG_ERROR([looks like Kaffe but version detection failed])
+- fi
+- _kaffe_ver=`echo "$KAFFE_VER" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
+- if test "$_kaffe_ver" -lt 10100; then
+- AC_MSG_ERROR([Kaffe is too old ($KAFFE_VER - $_kaffe_ver), you need at least 1.1.0])
+- fi
+- JDK=kaffe
+-
+- dnl TODO: define some project exclusion variables
+-
+- AC_MSG_RESULT([checked (Kaffe $KAFFE_VER)])
+- AC_MSG_WARN([EXPERIMENTAL: Kaffe is not a full JDK replacement - some projects will fail to compile])
+- echo "EXPERIMENTAL: Kaffe is not a full JDK replacement - some projects will fail to compile" >>warn
+- else
+-
+- dnl SUN JDK specific tests
+- _jdk=`$JAVAC -J-version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
+- _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
+-
+- if test "$_jdk_ver" -lt 10300; then
+- AC_MSG_ERROR([JDK is too old, you need at least 1.3])
+- fi
+- AC_MSG_RESULT([checked (JDK $_jdk)])
++ dnl java -version sends output to stderr!
++ if test `$JAVA -version 2>&1 | grep -c "Kaffe"` -gt 0; then
++
++ dnl Kaffe specific tests
++ KAFFE_VER=`$JAVA -version 2>&1 | $EGREP " Version:" | $SED -r "s/.* Version: ([[0-9\.]]*).*/\1/"`
++ if test -z "$KAFFE_VER"; then
++ AC_MSG_ERROR([looks like Kaffe but version detection failed])
++ fi
++ _kaffe_ver=`echo "$KAFFE_VER" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
++ if test "$_kaffe_ver" -lt 10100; then
++ AC_MSG_ERROR([Kaffe is too old ($KAFFE_VER - $_kaffe_ver), you need at least 1.1.0])
++ fi
++ JDK=kaffe
++
++ dnl TODO: define some project exclusion variables
++
++ AC_MSG_RESULT([checked (Kaffe $KAFFE_VER)])
++ AC_MSG_WARN([EXPERIMENTAL: Kaffe is not a full JDK replacement - some projects will fail to compile])
++ echo "EXPERIMENTAL: Kaffe is not a full JDK replacement - some projects will fail to compile" >>warn
++ else
++
++ dnl SUN JDK specific tests
++ _jdk=`$JAVAC -J-version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
++ _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
++
++ if test "$_jdk_ver" -lt 10300; then
++ AC_MSG_ERROR([JDK is too old, you need at least 1.3])
++ fi
++ AC_MSG_RESULT([checked (JDK $_jdk)])
++ fi
++ JAVA_HOME=`echo $JAVAC | $SED -n "s,//*bin//*javac,,p"`
++ else
++ AC_MSG_ERROR([JAVA not found. You need at least jdk-1.3])
+ fi
+- JAVA_HOME=`echo $JAVAC | $SED -n "s,//*bin//*javac,,p"`
++ dnl xsltproc not needed with JDK present.
++ XSLTPROC=NO_XSLTPROC
+ else
+- AC_MSG_ERROR([JAVA not found. You need at least jdk-1.3])
++ dnl Java disabled
++ JAVA_HOME=NO_JAVA_HOME ; export JAVA_HOME
++ dnl Check for xsltproc
++ AC_PATH_PROG(XSLTPROC, xsltproc, no)
++ if test "$XSLTPROC" = "no"; then
++ AC_MSG_ERROR([xsltproc is required when building with --disable-java.])
++ fi
+ fi
+ AC_SUBST(JAVA_HOME)
+ AC_SUBST(JDK)
++AC_SUBST(XSLTPROC)
+
+ dnl ===================================================================
+ dnl Checks for specific files.
+--- config_office/set_soenv.in.orig 2003-09-22 11:27:24.000000000 -0700
++++ config_office/set_soenv.in 2003-09-22 11:30:33.000000000 -0700
+@@ -1359,6 +1359,7 @@
+ if ( '@JDK@' ne '' )
+ { ToFile( "JDK", "@JDK@", "e" );
+ }
++ToFile( "XSLTPROC", "@XSLTPROC@", "e" );
+ ToFile( "ANT_HOME", "@ANT_HOME@", "e" );
+ ToFile( "JDKLIB", $JAVA_LIB, "e" );
+ ToFile( "STLPORT4", $STLPORT4, "e" );
diff -Naur -x CVS ooo-build.orig/patches/RC3/berkeleydb-handle-no-solar-java.diff ooo-build/patches/RC3/berkeleydb-handle-no-solar-java.diff
--- ooo-build.orig/patches/RC3/berkeleydb-handle-no-solar-java.diff 1969-12-31 16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/berkeleydb-handle-no-solar-java.diff 2003-09-17 12:18:52.000000000 -0700
@@ -0,0 +1,34 @@
+--- berkeleydb/makefile.mk.orig 2003-08-07 20:01:59.000000000 -0700
++++ berkeleydb/makefile.mk 2003-08-07 20:04:49.000000000 -0700
+@@ -80,7 +80,10 @@
+ CONFIGURE_DIR=out
+ #relative to CONFIGURE_DIR
+ CONFIGURE_ACTION=..$/dist$/configure
+-CONFIGURE_FLAGS=--enable-cxx --enable-java --enable-dynamic --enable-shared
++CONFIGURE_FLAGS=--enable-cxx --enable-dynamic --enable-shared
++.IF "$(SOLAR_JAVA)"!=""
++CONFIGURE_FLAGS+=--enable-java
++.ENDIF
+
+ BUILD_DIR=$(CONFIGURE_DIR)
+ .IF "$(OS)"=="IRIX"
+@@ -92,7 +95,9 @@
+
+ OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST)
+
++.IF "$(SOLAR_JAVA)"!=""
+ OUT2BIN=java$/classes$/db.jar
++.ENDIF
+
+ .ENDIF # "$(GUI)"=="UNX"
+
+@@ -129,7 +134,9 @@
+ include$/db_185.h \
+ include$/db_cxx.h
+
++.IF "$(SOLAR_JAVA)"!=""
+ OUT2CLASS=java$/classes$/db.jar
++.ENDIF
+
+ # --- Targets ------------------------------------------------------
+
diff -Naur -x CVS ooo-build.orig/patches/RC3/desktop-handle-no-solar-java.diff ooo-build/patches/RC3/desktop-handle-no-solar-java.diff
--- ooo-build.orig/patches/RC3/desktop-handle-no-solar-java.diff 1969-12-31 16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/desktop-handle-no-solar-java.diff 2003-09-22 12:13:25.000000000 -0700
@@ -0,0 +1,69 @@
+--- desktop/scripts/soffice.sh.orig 2003-09-22 12:07:01.000000000 -0700
++++ desktop/scripts/soffice.sh 2003-09-22 12:07:47.000000000 -0700
+@@ -144,25 +144,27 @@
+ esac
+
+ # extend the ld_library_path for java: javaldx checks the sofficerc for us
+-java_ld_library_path=`"$sd_prog/javaldx"`
+-if [ "$java_ld_library_path" != "" ] ; then
+- case $sd_platform in
+- AIX)
+- LIBPATH=${java_ld_library_path}:${LIBPATH}
+- ;;
+- Darwin)
+- DYLD_LIBRARY_PATH=${java_ld_library_path}:${DYLD_LIBRARY_PATH}
+- ;;
+- HP-UX)
+- SHLIB_PATH=${java_ld_library_path}:${SHLIB_PATH}
+- ;;
+- IRIX*)
+- LD_LIBRARYN32_PATH=${java_ld_library_path}:${LD_LIBRARYN32_PATH}
+- ;;
+- *)
+- LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
+- ;;
+- esac
++if [ -x "$sd_prog/javaldx" ] ; then
++ java_ld_library_path=`"$sd_prog/javaldx"`
++ if [ "$java_ld_library_path" != "" ] ; then
++ case $sd_platform in
++ AIX)
++ LIBPATH=${java_ld_library_path}:${LIBPATH}
++ ;;
++ Darwin)
++ DYLD_LIBRARY_PATH=${java_ld_library_path}:${DYLD_LIBRARY_PATH}
++ ;;
++ HP-UX)
++ SHLIB_PATH=${java_ld_library_path}:${SHLIB_PATH}
++ ;;
++ IRIX*)
++ LD_LIBRARYN32_PATH=${java_ld_library_path}:${LD_LIBRARYN32_PATH}
++ ;;
++ *)
++ LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
++ ;;
++ esac
++ fi
+ fi
+
+ # set java environment variables
+--- desktop/source/javaldx/makefile.mk.orig 2003-09-22 12:07:12.000000000 -0700
++++ desktop/source/javaldx/makefile.mk 2003-09-22 12:11:42.000000000 -0700
+@@ -77,6 +77,8 @@
+
+ # --- Files --------------------------------------------------------
+
++.IF "$(SOLAR_JAVA)"!=""
++
+ OBJFILES=$(OBJ)$/javaldx.obj
+
+ APP1TARGET=javaldx
+@@ -86,6 +88,8 @@
+ APP1STDLIBS+= -lstdc++
+ .ENDIF
+
++.ENDIF # "$(SOLAR_JAVA)"!=""
++
+ # --- Targets ------------------------------------------------------
+
+ .INCLUDE : target.mk
diff -Naur -x CVS ooo-build.orig/patches/RC3/javaunohelper-handle-no-solar-java.diff ooo-build/patches/RC3/javaunohelper-handle-no-solar-java.diff
--- ooo-build.orig/patches/RC3/javaunohelper-handle-no-solar-java.diff 1969-12-31 16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/javaunohelper-handle-no-solar-java.diff 2003-09-22 12:19:06.000000000 -0700
@@ -0,0 +1,20 @@
+--- javaunohelper/source/makefile.mk.orig 2003-09-22 12:14:58.000000000 -0700
++++ javaunohelper/source/makefile.mk 2003-09-22 12:18:51.000000000 -0700
+@@ -76,6 +76,8 @@
+
+ # ------------------------------------------------------------------
+
++.IF "$(SOLAR_JAVA)"!=""
++
+ UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
+ UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
+
+@@ -153,6 +155,8 @@
+
+ DEF2NAME=$(SHL2TARGET)
+
++.ENDIF # "$(SOLAR_JAVA)"!=""
++
+ # --- Targets ------------------------------------------------------
+
+ .INCLUDE : target.mk
diff -Naur -x CVS ooo-build.orig/patches/RC3/jni-uno-handle-no-solar-java.diff ooo-build/patches/RC3/jni-uno-handle-no-solar-java.diff
--- ooo-build.orig/patches/RC3/jni-uno-handle-no-solar-java.diff 1969-12-31 16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/jni-uno-handle-no-solar-java.diff 2003-09-22 12:36:52.000000000 -0700
@@ -0,0 +1,20 @@
+--- bridges/source/jni_uno/makefile.mk.orig 2003-09-22 12:34:56.000000000 -0700
++++ bridges/source/jni_uno/makefile.mk 2003-09-22 12:36:30.000000000 -0700
+@@ -72,6 +72,8 @@
+
+ # --- Files --------------------------------------------------------
+
++.IF "$(SOLAR_JAVA)"!=""
++
+ SLOFILES= \
+ $(SLO)$/jni_info.obj \
+ $(SLO)$/jni_data.obj \
+@@ -99,6 +101,8 @@
+ .ENDIF
+ .ENDIF
+
++.ENDIF # "$(SOLAR_JAVA)"!=""
++
+ # --- Targets ------------------------------------------------------
+
+ .INCLUDE : target.mk
diff -Naur -x CVS ooo-build.orig/patches/RC3/jurt-handle-no-solar-java.diff ooo-build/patches/RC3/jurt-handle-no-solar-java.diff
--- ooo-build.orig/patches/RC3/jurt-handle-no-solar-java.diff 1969-12-31 16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/jurt-handle-no-solar-java.diff 2003-09-22 12:43:46.000000000 -0700
@@ -0,0 +1,20 @@
+--- jurt/source/pipe/makefile.mk.orig 2003-09-22 12:38:16.000000000 -0700
++++ jurt/source/pipe/makefile.mk 2003-09-22 12:39:08.000000000 -0700
+@@ -15,6 +15,8 @@
+
+ # --- Files --------------------------------------------------------
+
++.IF "$(SOLAR_JAVA)"!=""
++
+ SLOFILES = \
+ $(SLO)$/com_sun_star_lib_connections_pipe_PipeConnection.obj
+
+@@ -29,6 +31,8 @@
+
+ NO_SHL1DESCRIPTION=TRUE
+
++.ENDIF # "$(SOLAR_JAVA)"!=""
++
+ # --- Targets ------------------------------------------------------
+
+ .INCLUDE : target.mk
diff -Naur -x CVS ooo-build.orig/patches/RC3/jvmaccess-handle-no-solar-java.diff ooo-build/patches/RC3/jvmaccess-handle-no-solar-java.diff
--- ooo-build.orig/patches/RC3/jvmaccess-handle-no-solar-java.diff 1969-12-31 16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/jvmaccess-handle-no-solar-java.diff 2003-09-22 12:42:24.000000000 -0700
@@ -0,0 +1,36 @@
+--- jvmaccess/source/makefile.mk.orig 2003-09-22 12:40:14.000000000 -0700
++++ jvmaccess/source/makefile.mk 2003-09-22 12:41:58.000000000 -0700
+@@ -67,6 +67,8 @@
+
+ .INCLUDE: settings.mk
+
++.IF "$(SOLAR_JAVA)"!=""
++
+ UNOTYPES= com.sun.star.uno.TypeClass com.sun.star.uno.XInterface
+
+ UNOUCRDEP = $(SOLARBINDIR)$/udkapi.rdb
+@@ -80,4 +82,6 @@
+ $(SLO)$/virtualmachine.obj \
+ $(SLO)$/windows.obj
+
++.ENDIF # "$(SOLAR_JAVA)"!=""
++
+ .INCLUDE: target.mk
+--- jvmaccess/util/makefile.mk.orig 2003-09-22 12:40:19.000000000 -0700
++++ jvmaccess/util/makefile.mk 2003-09-22 12:41:35.000000000 -0700
+@@ -71,6 +71,8 @@
+
+ .INCLUDE: settings.mk
+
++.IF "$(SOLAR_JAVA)"!=""
++
+ .IF "$(UNIXVERSIONNAMES)" == ""
+ SHL1TARGET = $(TARGET)$(UDK_MAJOR)$(COMID)
+ .ELSE # UNIXVERSIONNAMES
+@@ -96,4 +98,6 @@
+
+ DEF1NAME = $(SHL1TARGET)
+
++.ENDIF # "$(SOLAR_JAVA)"!=""
++
+ .INCLUDE: target.mk
diff -Naur -x CVS ooo-build.orig/patches/RC3/odk-handle-no-solar-java.diff ooo-build/patches/RC3/odk-handle-no-solar-java.diff
--- ooo-build.orig/patches/RC3/odk-handle-no-solar-java.diff 1969-12-31 16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/odk-handle-no-solar-java.diff 2003-09-22 12:49:57.000000000 -0700
@@ -0,0 +1,81 @@
+--- odk/pack/gendocu/makefile.mk.orig 2003-09-22 11:08:18.000000000 -0700
++++ odk/pack/gendocu/makefile.mk 2003-09-22 12:45:10.000000000 -0700
+@@ -117,9 +117,13 @@
+
+ MY_AUTODOC=$(WRAPCMD) $(SOLARBINDIR)$/autodoc
+
++.IF "$(SOLAR_JAVA)"!=""
+ all: \
+ $(CPP_DOCU_INDEX_FILE) \
+ $(JAVA_DOCU_INDEX_FILE)
++.ELSE
++all: $(CPP_DOCU_INDEX_FILE)
++.ENDIF
+
+ $(CPP_DOCU_INDEX_FILE) : $(INCLUDELIST)
+ +-$(MKDIRHIER) $(@:d)
+@@ -140,6 +144,8 @@
+ # +$(MY_COPY) $< $@
+
+ #$(JAVA_DOCU_INDEX_FILE) : $(JAVA_SRC_FILES) $(JAVA_BEAN_SRC_FILES)
++.IF "$(SOLAR_JAVA)"!=""
+ $(JAVA_DOCU_INDEX_FILE) : $(JAVA_SRC_FILES)
+ +-$(MKDIRHIER) $(@:d)
+ +javadoc -J-Xmx120m $(JAVADOCPARAMS) > $(JAVADOCLOG)
++.ENDIF
+--- odk/source/OOSupport/makefile.mk.orig 2003-09-22 11:08:18.000000000 -0700
++++ odk/source/OOSupport/makefile.mk 2003-09-22 12:45:10.000000000 -0700
+@@ -60,6 +60,7 @@
+ #
+ #*************************************************************************
+
++.IF "$(SOLAR_JAVA)"!=""
+ PRJ = ..$/..
+ PRJNAME = oosupport
+ PACKAGE = org$/netbeans$/modules$/openoffice
+@@ -348,3 +349,7 @@
+ +cd $(CLASSDIR) && jar -uvf $(TARGETNETBEANSMODULEFILE) netbeans
+
+ .ENDIF
++.ELSE
++dummy:
++ @echo "Not building odk/source/OOSupport with SOLAR_JAVA not set"
++.ENDIF
+--- odk/source/bean/native/unix/makefile.mk.orig 2003-09-22 11:08:18.000000000 -0700
++++ odk/source/bean/native/unix/makefile.mk 2003-09-22 12:46:41.000000000 -0700
+@@ -12,6 +12,8 @@
+
+ # --- Files --------------------------------------------------------
+
++.IF "$(SOLAR_JAVA)"!=""
++
+ .IF "$(OS)"=="MACOSX"
+
+ dummy:
+@@ -38,6 +40,8 @@
+
+ .ENDIF
+
++.ENDIF # "$(SOLAR_JAVA)"!=""
++
+ # --- Targets ------------------------------------------------------
+
+ .INCLUDE : target.mk
+--- odk/util/check.pl.orig 2003-09-22 11:08:18.000000000 -0700
++++ odk/util/check.pl 2003-09-22 12:45:10.000000000 -0700
+@@ -214,6 +214,7 @@
+
+ #check java docu, it is only a first and simple check
+ # improvement required
++if ($ENV["SOLAR_JAVA"] ne "") {
+ print "check java docu: ";
+ if (-d "$StartDir/docs/java/ref") {
+ if (! -e "$StartDir/docs/java/ref/index.html") {
+@@ -246,6 +247,7 @@
+ $return++;
+ }
+ print "\n";
++}
+
+ #check examples, it is only a first and simple check
+ # improvement required
diff -Naur -x CVS ooo-build.orig/patches/RC3/officecfg-xsltproc.diff ooo-build/patches/RC3/officecfg-xsltproc.diff
--- ooo-build.orig/patches/RC3/officecfg-xsltproc.diff 1969-12-31 16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/officecfg-xsltproc.diff 2003-09-23 10:26:24.000000000 -0700
@@ -0,0 +1,96 @@
+--- officecfg/util/makefile.pmk.orig 2003-09-23 10:17:12.000000000 -0700
++++ officecfg/util/makefile.pmk 2003-09-23 10:23:40.000000000 -0700
+@@ -67,34 +67,93 @@
+ $(MISC)$/registry$/schema$/%.xcs : %.xcs
+ @+echo -------------+ validating and stripping schema files
+ -$(MKDIR) -p $(@:d)
++.IF "$(SOLAR_JAVA)"!=""
+ $(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
+ $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/schema_val.xsl $(@:d)$(<:b).val file=$(<:d)$(<:b) pathSeparator=$/
+ $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/sanity.xsl $(@:d)$(<:b).san file=$(<:d)$(<:b) pathSeparator=$/
+ $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/schema_trim.xsl $(@:d)$(<:b).tmp
+ $(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$(<:b).tmp $(@:d)$(<:b).xcs
++.ELSE
++# xsltproc already validates against the dtd. For additional validation,
++# org.openoffice.configuration.Inspector should be replaced and the
++# replacement should be invoked here.
++ $(XSLTPROC) -o $(@:d)$(<:b).val \
++ --stringparam file $(<:d)$(<:b) \
++ --stringparam pathSeparator $/ \
++ $(PRJ)$/util$/schema_val.xsl $<
++ $(XSLTPROC) -o $(@:d)$(<:b).san \
++ --stringparam file $(<:d)$(<:b) \
++ --stringparam pathSeparator $/ \
++ $(PRJ)$/util$/sanity.xsl $<
++ $(XSLTPROC) -o $(@:d)$(<:b).tmp \
++ $(PRJ)$/util$/schema_trim.xsl $<
++# xsltproc already seems to pretty-print the xml, so
++# org.openoffice.helper.PrettyPrinter seems to be unnecessary.
++ cp $(@:d)$(<:b).tmp $(@:d)$(<:b).xcs
++.ENDIF
+ +$(RM) $(@:d)$(<:b).tmp > $(NULLDEV)
+ +$(RM) $(@:d)$(<:b).val > $(NULLDEV)
+
+ $(MISC)$/registry$/res$/{$(alliso)}$/%.properties :| %.xcs
+ @+echo -------------+ creating locale dependent resource bundles
+ -$(MKDIR) -p $(@:d)
++.IF "$(SOLAR_JAVA)"!=""
+ $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/resource.xsl $(@:d)$(<:b).properties locale={$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $(subst,.properties,.xcs $@)))}
++.ELSE
++ $(XSLTPROC) -o $(@:d)$(<:b).properties \
++ --stringparam locale {$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $(subst,.properties,.xcs $@)))} \
++ $(PRJ)$/util$/resource.xsl $<
++.ENDIF
+
+ # --- XCU ---
+
+ $(MISC)$/registry$/data$/%.xcu : %.xcu
+ @+echo -------------+ validating and creating a locale independent file
+ -$(MKDIR) -p $(@:d)
++.IF "$(SOLAR_JAVA)"!=""
+ $(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
+ $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/data_val.xsl $(@:d)$(<:b).val xcs=$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs schemaRoot=$(PRJ)$/registry$/schema
+ $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/alllang.xsl $(@:d)$(<:b).tmp xcs=$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs schemaRoot=$(PRJ)$/registry$/schema
+ $(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$(<:b).tmp $(@:d)$(<:b).xcu
++.ELSE
++# xsltproc already validates against the dtd. For additional validation,
++# org.openoffice.configuration.Inspector should be replaced and the
++# replacement should be invoked here.
++ $(SED) 's|xmlns:filehelper="http://www.jclark.com/xt/java/org.openoffice.configuration.FileHelper";||;s|extension-element-prefixes="filehelper"||;s|filehelper:makeAbs(\(.*\))|\1|' < $(PRJ)$/util$/data_val.xsl > $(PRJ)$/util$/dataval2.xsl
++ $(SED) 's|xmlns:filehelper="http://www.jclark.com/xt/java/org.openoffice.configuration.FileHelper";||;s|extension-element-prefixes="filehelper"||;s|filehelper:makeAbs(\(.*\))|\1|' < $(PRJ)$/util$/alllang.xsl > $(PRJ)$/util$/alllang2.xsl
++ $(XSLTPROC) -o $(@:d)$(<:b).val \
++ --stringparam xcs $(PWD)$/$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs \
++ --stringparam schemaRoot $(PWD)$/$(PRJ)$/registry$/schema \
++ $(PRJ)$/util$/dataval2.xsl $<
++ $(XSLTPROC) -o $(@:d)$(<:b).tmp \
++ --stringparam xcs $(PWD)$/$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs \
++ --stringparam schemaRoot $(PWD)$/$(PRJ)$/registry$/schema \
++ $(PRJ)$/util$/alllang2.xsl $<
++# xsltproc already seems to pretty-print the xml, so
++# org.openoffice.helper.PrettyPrinter seems to be unnecessary.
++ cp $(@:d)$(<:b).tmp $(@:d)$(<:b).xcu
++ +$(RM) $(PRJ)$/util$/dataval2.xsl > $(NULLDEV)
++ +$(RM) $(PRJ)$/util$/alllang2.xsl > $(NULLDEV)
++.ENDIF
+ +$(RM) $(@:d)$(<:b).tmp > $(NULLDEV)
+ +$(RM) $(@:d)$(<:b).val > $(NULLDEV)
+
+ $(MISC)$/registry$/res$/{$(alliso)}$/%.xcu :| %.xcu
+ @+echo -------------+ creating locale dependent entries
+ -$(MKDIR) -p $(@:d)
++.IF "$(SOLAR_JAVA)"!=""
+ $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/alllang.xsl $(@:d)$(<:b).tmp xcs=$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs schemaRoot=$(PRJ)$/registry$/schema locale={$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $@))}
+ $(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$(<:b).tmp $(@:d)$(<:b).xcu
++.ELSE
++ $(SED) 's|xmlns:filehelper="http://www.jclark.com/xt/java/org.openoffice.configuration.FileHelper";||;s|extension-element-prefixes="filehelper"||;s|filehelper:makeAbs(\(.*\))|\1|' < $(PRJ)$/util$/alllang.xsl > $(PRJ)$/util$/alllang2.xsl
++ $(XSLTPROC) -o $(@:d)$(<:b).tmp \
++ --stringparam xcs $(PWD)$/$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs \
++ --stringparam schemaRoot $(PWD)$/$(PRJ)$/registry$/schema \
++ --stringparam locale {$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $@))} \
++ $(PRJ)$/util$/alllang2.xsl $<
++# xsltproc already seems to pretty-print the xml, so
++# org.openoffice.helper.PrettyPrinter seems to be unnecessary.
++ cp $(@:d)$(<:b).tmp $(@:d)$(<:b).xcu
++ +$(RM) $(PRJ)$/util$/alllang2.xsl > $(NULLDEV)
++.ENDIF
+ +$(RM) $(@:d)$(<:b).tmp > $(NULLDEV)
diff -Naur -x CVS ooo-build.orig/patches/RC3/psprint-handle-no-solar-java.diff ooo-build/patches/RC3/psprint-handle-no-solar-java.diff
--- ooo-build.orig/patches/RC3/psprint-handle-no-solar-java.diff 1969-12-31 16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/psprint-handle-no-solar-java.diff 2003-09-17 12:18:52.000000000 -0700
@@ -0,0 +1,43 @@
+--- psprint/source/helper/helper.cxx.orig 2003-08-08 08:41:05.000000000 -0700
++++ psprint/source/helper/helper.cxx 2003-08-08 08:43:33.000000000 -0700
+@@ -72,7 +72,9 @@
+ #include <tools/config.hxx>
+ #include <rtl/bootstrap.hxx>
+ #include <sal/config.h>
++#ifdef SOLAR_JAVA
+ #include "jvmaccess/javainfo.hxx"
++#endif // SOLAR_JAVA
+
+ using namespace rtl;
+
+@@ -263,6 +265,7 @@
+ }
+ }
+
++#ifdef SOLAR_JAVA
+ // if no javarc (e.g. in setup) exists or it failed try the UDK method
+ if( ! aJREpath.getLength() )
+ {
+@@ -299,6 +302,7 @@
+ }
+ }
+ }
++#endif // SOLAR_JAVA
+
+ if( aJREpath.getLength() )
+ {
+--- psprint/util/makefile.mk.orig 2003-08-08 08:43:55.000000000 -0700
++++ psprint/util/makefile.mk 2003-08-08 08:44:52.000000000 -0700
+@@ -95,9 +95,11 @@
+
+ SHL1STDLIBS=$(UNOTOOLSLIB) \
+ $(TOOLSLIB) \
+- $(JVMACCESSLIB) \
+ $(SALLIB) \
+ -lX11
++.IF "$(SOLAR_JAVA)"!=""
++SHL1STDLIBS+=$(JVMACCESSLIB)
++.ENDIF
+
+ SHL1DEF= $(MISC)$/$(SHL1TARGET).def
+
diff -Naur -x CVS ooo-build.orig/patches/RC3/readlicense-oo-xsltproc.diff ooo-build/patches/RC3/readlicense-oo-xsltproc.diff
--- ooo-build.orig/patches/RC3/readlicense-oo-xsltproc.diff 1969-12-31 16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/readlicense-oo-xsltproc.diff 2003-09-22 11:41:44.000000000 -0700
@@ -0,0 +1,39 @@
+--- readlicense_oo/util/makefile.pmk.orig 2003-09-22 11:36:10.000000000 -0700
++++ readlicense_oo/util/makefile.pmk 2003-09-22 11:37:57.000000000 -0700
+@@ -73,7 +73,36 @@
+
+ $(MISC)$/%.html :
+ @+-$(MKDIR) $(@:d)
++.IF "$(SOLAR_JAVA)"!=""
+ $(JAVA) -classpath $(COMMON_BUILD_TOOLS)$/xt.jar$(PATH_SEPERATOR)$(COMMON_BUILD_TOOLS)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $(subst,$(@::d:d:b), $(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(iso_$(@:d:d:b)) type=html file=$@
++.ELSE
++ $(SED) 's|xmlns:xt="http://www.jclark.com/xt";||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />|<xsl:output method="html" doctype-public="-//W3C//DTD HTML 3.2//EN" />|' < ..$/readme.xsl > ..$/readme2.xsl
++ $(XSLTPROC) -o $@ \
++ --stringparam os1 $(OS) \
++ --stringparam gui1 $(GUI) \
++ --stringparam cp1 $(CPUNAME) \
++ --stringparam com1 $(COM) \
++ --stringparam lang1 $(iso_$(@:d:d:b)) \
++ --stringparam type html \
++ ..$/readme2.xsl \
++ $(subst,$(@::d:d:b), $(@:b).xrm)
++ rm ..$/readme2.xsl
++.ENDIF
++
+ $(MISC)$/%.txt :
+ @+-$(MKDIR) $(@:d)
++.IF "$(SOLAR_JAVA)"!=""
+ $(JAVA) -classpath $(COMMON_BUILD_TOOLS)$/xt.jar$(PATH_SEPERATOR)$(COMMON_BUILD_TOOLS)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $(subst,$(@::d:d:b), $(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(iso_$(@:d:d:b)) type=text file=$@
++.ELSE
++ $(SED) 's|xmlns:xt="http://www.jclark.com/xt";||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />|<xsl:output method="text" />|' < ..$/readme.xsl > ..$/readme2.xsl
++ $(XSLTPROC) -o $@ \
++ --stringparam os1 $(OS) \
++ --stringparam gui1 $(GUI) \
++ --stringparam cp1 $(CPUNAME) \
++ --stringparam com1 $(COM) \
++ --stringparam lang1 $(iso_$(@:d:d:b)) \
++ --stringparam type text \
++ ..$/readme2.xsl \
++ $(subst,$(@::d:d:b), $(@:b).xrm)
++ rm ..$/readme2.xsl
++.ENDIF
diff -Naur -x CVS ooo-build.orig/patches/RC3/ridljar-handle-no-solar-java.diff ooo-build/patches/RC3/ridljar-handle-no-solar-java.diff
--- ooo-build.orig/patches/RC3/ridljar-handle-no-solar-java.diff 1969-12-31 16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/ridljar-handle-no-solar-java.diff 2003-09-17 12:18:52.000000000 -0700
@@ -0,0 +1,15 @@
+--- ridljar/util/makefile.mk.orig 2003-08-10 13:12:20.000000000 -0700
++++ ridljar/util/makefile.mk 2003-08-10 13:12:36.000000000 -0700
+@@ -84,10 +84,12 @@
+ ZIP1DIR=$(PRJ)
+ ZIP1LIST=com -x "*makefile.mk"
+
++.IF "$(SOLAR_JAVA)"!=""
+ ZIP2TARGET=$(TARGET)2_src
+ ZIP2FLAGS=-u -r
+ ZIP2DIR=$(MISC)$/java
+ ZIP2LIST=com
++.ENDIF
+
+ # --- Targets ------------------------------------------------------
+
diff -Naur -x CVS ooo-build.orig/patches/RC3/scp-handle-no-solar-java.diff ooo-build/patches/RC3/scp-handle-no-solar-java.diff
--- ooo-build.orig/patches/RC3/scp-handle-no-solar-java.diff 1969-12-31 16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/scp-handle-no-solar-java.diff 2003-09-17 12:18:52.000000000 -0700
@@ -0,0 +1,146 @@
+--- scp/source/global/udk_base.scp.orig 2003-08-11 11:22:39.000000000 -0700
++++ scp/source/global/udk_base.scp 2003-08-11 11:38:05.000000000 -0700
+@@ -342,6 +342,7 @@
+ #endif
+ End
+
++#ifdef SOLAR_JAVA
+ File gid_File_Lib_Jvmaccess
+ TXT_FILE_BODY;
+ Dir = GCFG_BINARY_DIR;
+@@ -368,3 +369,4 @@
+ Styles = (NETWORK,RELATIVE);
+ End
+ #endif
++#endif
+--- scp/source/global/setupzip.scp.orig 2003-08-11 11:23:38.000000000 -0700
++++ scp/source/global/setupzip.scp 2003-08-11 11:28:02.000000000 -0700
+@@ -393,8 +393,6 @@
+
+ #if !defined(IPL_PRODUCT) && !defined(OPL_PRODUCT) || defined(UNX)
+
+-#ifdef SOLAR_JAVA
+-
+ File GID_FILE_LIB_J
+ TXT_FILE_BODY;
+ #ifdef UNX
+@@ -408,8 +406,6 @@
+
+ #endif
+
+-#endif
+-
+ File GID_FILE_LIB_COMPHELPER2
+ TXT_FILE_BODY;
+ #ifdef UNX
+@@ -527,12 +523,14 @@
+
+ #endif
+
++#ifdef SOLAR_JAVA
+ File GID_FILE_JAR_UNOIL
+ TXT_FILE_BODY;
+ Name = "unoil.jar";
+ Dir = GCFG_CLASSES_DIR;
+ Styles = (PACKED,DONT_OVERWRITE,SETUPZIP);
+ End
++#endif
+
+ #ifdef INCLUDE_JAVA_ACCESSBRIDGE
+
+@@ -546,14 +544,14 @@
+ #endif
+
+ #ifdef UNX
+-
++#ifdef SOLAR_JAVA
+ File GID_FILE_BIN_JAVALDX
+ BIN_FILE_BODY;
+ Dir = GCFG_BINARY_DIR;
+ Styles = (PACKED, SETUPZIP);
+ Name = EXENAME(javaldx);
+ End
+-
++#endif
+ #endif
+
+ #ifdef UNX
+--- scp/source/global/udk_complete.scp.orig 2003-08-11 11:28:16.000000000 -0700
++++ scp/source/global/udk_complete.scp 2003-08-11 11:29:30.000000000 -0700
+@@ -75,6 +75,7 @@
+ #endif
+ End
+
++#ifdef SOLAR_JAVA
+ #ifndef MACOSX
+ File gid_File_Lib_OfficeBean
+ TXT_FILE_BODY;
+@@ -94,6 +95,8 @@
+ Styles = (PACKED);
+ End
+ #endif
++#endif
++
+ /*
+ File gid_File_Lib_Stm
+ TXT_FILE_BODY;
+--- scp/source/office/files.scp.orig 2003-08-11 11:29:45.000000000 -0700
++++ scp/source/office/files.scp 2003-08-11 11:30:15.000000000 -0700
+@@ -715,6 +715,7 @@
+
+ #endif
+
++#ifdef SOLAR_JAVA
+ File GID_FILE_LIB_JDBC_2
+ TXT_FILE_BODY;
+ Styles = (PACKED,UNO_COMPONENT);
+@@ -726,6 +727,7 @@
+ Name = "jdbc2.dll";
+ #endif
+ End
++#endif
+
+ File GID_FILE_LIB_ODBC_2
+ TXT_FILE_BODY;
+--- scp/util/makefile.mk.orig 2003-08-11 11:30:57.000000000 -0700
++++ scp/util/makefile.mk 2003-08-11 11:34:00.000000000 -0700
+@@ -88,7 +88,6 @@
+ module_math.par \
+ module_grafik.par \
+ module_lingu.par \
+- module_javafilter.par \
+ profile.par \
+ profile_calc.par \
+ profile_impress.par \
+@@ -96,13 +95,10 @@
+ profile_math.par \
+ profile_chart.par \
+ profile_grafik.par \
+- profile_javafilter.par \
+ setupzip.par \
+ readme.par \
+ udk_base.par \
+ udk_bridges.par \
+- udk_java.par \
+- udk_pure_java.par \
+ udk_remote.par \
+ udk_complete.par \
+ files.par \
+@@ -113,10 +109,15 @@
+ files_chart.par \
+ files_grafik.par \
+ files_lingu.par \
+- files_javafilter.par \
+ dir.par \
+ python.par
+-
++.IF "$(SOLAR_JAVA)"!=""
++SCP1FILES += module_javafilter.par \
++ profile_javafilter.par \
++ files_javafilter.par \
++ udk_java.par \
++ udk_pure_java.par
++.ENDIF
+
+ #python.par
+
diff -Naur -x CVS ooo-build.orig/patches/RC3/setup2-handle-no-solar-java.diff ooo-build/patches/RC3/setup2-handle-no-solar-java.diff
--- ooo-build.orig/patches/RC3/setup2-handle-no-solar-java.diff 1969-12-31 16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/setup2-handle-no-solar-java.diff 2003-09-22 13:40:20.000000000 -0700
@@ -0,0 +1,91 @@
+--- setup2/source/custom/jvmsetup/loader/makefile.mk.orig 2003-09-22 11:08:19.000000000 -0700
++++ setup2/source/custom/jvmsetup/loader/makefile.mk 2003-09-22 13:28:10.000000000 -0700
+@@ -72,6 +72,9 @@
+ .INCLUDE : sv.mk
+
+ # --- Files --------------------------------------------------------
++
++.IF "$(SOLAR_JAVA)"!=""
++
+ CXXFILES= jvmapp.cxx
+
+ OBJFILES= $(OBJ)$/jvmapp.obj
+@@ -128,6 +131,8 @@
+ UNIXTEXT= \
+ $(MISC)$/jvmsetup.sh
+
++.ENDIF "$(SOLAR_JAVA)"!=""
++
+ .INCLUDE : target.mk
+
+ # ------------------------------------------------------------------
+--- setup2/source/custom/jvmsetup/makefile.mk.orig 2003-09-22 11:08:19.000000000 -0700
++++ setup2/source/custom/jvmsetup/makefile.mk 2003-09-22 13:31:00.000000000 -0700
+@@ -73,6 +73,8 @@
+
+ # --- Files --------------------------------------------------------
+
++.IF "$(SOLAR_JAVA)"!=""
++
+ .DIRCACHE=NO
+
+ SRCFILES = jvmdlg.src
+@@ -113,6 +115,8 @@
+
+ RC_SUBDIRSDEPS=$(SLB)$/jvm.lib
+
++.ENDIF # "$(SOLAR_JAVA)"!=""
++
+ # --- Targets --------------------------------------------------------------
+
+ .INCLUDE : target.mk
+--- setup2/source/ui/main.cxx.orig 2003-09-22 11:08:19.000000000 -0700
++++ setup2/source/ui/main.cxx 2003-09-22 13:27:05.000000000 -0700
+@@ -78,7 +78,9 @@
+ #include <sal/main.h>
+ #endif
+
++#ifdef SOLAR_JAVA
+ #include "jvmaccess/javainfo.hxx"
++#endif
+
+ #ifndef _SV_HELP_HXX //autogen
+ #include <vcl/help.hxx>
+@@ -2523,6 +2525,7 @@
+ static sal_Bool hasJavarc();
+ void prepareJava(const char * szStartPath)
+ {
++#ifdef SOLAR_JAVA
+ if(szStartPath)
+ {
+ //check if we are started from an installation. This is done by looking for the classes
+@@ -2656,6 +2659,7 @@
+ #endif
+ }
+ }
++#endif // SOLAR_JAVA
+ }
+
+ static sal_Bool hasJavarc()
+--- setup2/util/makefile.mk.orig 2003-09-22 11:08:19.000000000 -0700
++++ setup2/util/makefile.mk 2003-09-22 13:27:05.000000000 -0700
+@@ -186,7 +186,6 @@
+ $(SVTOOLLIB) \
+ $(VCLLIB) \
+ $(TOOLSLIB) \
+- $(JVMACCESSLIB) \
+ $(COMPHELPERLIB) \
+ $(CPPUHELPERLIB) \
+ $(CPPULIB) \
+@@ -195,7 +194,10 @@
+ $(SALHELPERLIB) \
+ $(UNOTOOLSLIB) \
+ $(SALLIB)
+-
++.IF "$(SOLAR_JAVA)"!=""
++APP2STDLIBS+=\
++ $(JVMACCESSLIB)
++.ENDIF
+
+ .IF "$(GUI)"=="WNT"
+ APP2STDLIBS += uwinapi.lib advapi32.lib gdi32.lib shell32.lib ole32.lib uuid.lib version.lib \
diff -Naur -x CVS ooo-build.orig/patches/RC3/sj2-handle-no-solar-java.diff ooo-build/patches/RC3/sj2-handle-no-solar-java.diff
--- ooo-build.orig/patches/RC3/sj2-handle-no-solar-java.diff 1969-12-31 16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/sj2-handle-no-solar-java.diff 2003-09-17 12:18:52.000000000 -0700
@@ -0,0 +1,274 @@
+--- sj2/source/java/jnihelp.cxx.orig 2003-08-08 20:54:39.000000000 -0700
++++ sj2/source/java/jnihelp.cxx 2003-08-08 20:55:41.000000000 -0700
+@@ -59,6 +59,7 @@
+ *
+ ************************************************************************/
+
++#ifdef SOLAR_JAVA
+ #include <cstdarg>
+ #include <tools/debug.hxx>
+ #include <jni.h> /* where everything is defined */
+@@ -99,3 +100,5 @@
+ _xJavaThreadRegister_11->revokeThread();
+ }
+ }
++
++#endif // SOLAR_JAVA
+--- sj2/source/jscpp/sjapplet.cxx.orig 2003-08-08 20:58:19.000000000 -0700
++++ sj2/source/jscpp/sjapplet.cxx 2003-08-08 21:01:41.000000000 -0700
+@@ -60,7 +60,9 @@
+ ************************************************************************/
+
+ #include <cstdarg>
++#ifdef SOLAR_JAVA
+ #include <jnihelp.hxx>
++#endif // SOLAR_JAVA
+
+ #include <sjapplet.hxx>
+
+@@ -79,11 +81,15 @@
+
+ using namespace ::rtl;
+ using namespace ::utl;
++#ifdef SOLAR_JAVA
+ using namespace ::sj2;
++#endif // SOLAR_JAVA
+
+ using namespace ::com::sun::star::lang;
+ using namespace ::com::sun::star::uno;
++#ifdef SOLAR_JAVA
+ using namespace ::com::sun::star::java;
++#endif // SOLAR_JAVA
+
+ SjApplet2::SjApplet2()
+ : _pImpl(new SjApplet2_Impl())
+@@ -346,7 +352,7 @@
+ /*
+ * Java init function to invoke Java runtime using JNI invocation API.
+ */
+-
++#ifdef SOLAR_JAVA
+ void JRE_PropertyChanged( JNIEnv * env, const SvCommandList & rCmdList )
+ {
+ jclass pClass = env->FindClass("java/util/Properties");
+@@ -389,6 +395,7 @@
+ env->DeleteLocalRef( pProps );
+ env->DeleteLocalRef( pClass );
+ }
++#endif // SOLAR_JAVA
+
+ // Settings are detected by the JavaVM service
+ // This function is not necessary anymore
+--- sj2/source/jscpp/sjapplet_impl.cxx.orig 2003-08-08 21:06:04.000000000 -0700
++++ sj2/source/jscpp/sjapplet_impl.cxx 2003-08-08 21:24:29.000000000 -0700
+@@ -78,18 +78,24 @@
+ #include <vcl/syschild.hxx>
+ #include <vcl/sysdata.hxx>
+
++#ifdef SOLAR_JAVA
+ #include <jnihelp.hxx>
++#endif // SOLAR_JAVA
+
+ using namespace ::rtl;
+ using namespace ::osl;
++#ifdef SOLAR_JAVA
+ using namespace ::sj2;
++#endif // SOLAR_JAVA
+ using namespace ::utl;
+
++#ifdef SOLAR_JAVA
+ using namespace ::com::sun::star::java;
++#endif // SOLAR_JAVA
+ using namespace ::com::sun::star::lang;
+ using namespace ::com::sun::star::uno;
+
+-
++#ifdef SOLAR_JAVA
+ static void testJavaException(JNIEnv * pEnv) throw(com::sun::star::uno::RuntimeException)
+ {
+ jthrowable jtThrowable = pEnv->ExceptionOccurred();
+@@ -114,7 +120,14 @@
+ throw RuntimeException(ouMessage, Reference<XInterface>());
+ }
+ }
++#else // !SOLAR_JAVA
++static void throwException() throw(com::sun::star::uno::RuntimeException)
++{
++ throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM("Java applets not supported.")), Reference<XInterface>());
++}
++#endif
+
++#ifdef SOLAR_JAVA
+ #ifdef UNX
+ struct EmbeddedWindow {
+ jobject _joWindow;
+@@ -210,17 +223,22 @@
+
+ _joWindow = 0;
+ }
++#endif // SOLAR_JAVA
+
+-
+-
++#ifdef SOLAR_JAVA
+ SjApplet2_Impl::SjApplet2_Impl() throw(com::sun::star::uno::RuntimeException)
+ : _pJVM(NULL),
+ _joAppletExecutionContext(0),
+ _jcAppletExecutionContext(0)
+
+ {}
++#else // !SOLAR_JAVA
++SjApplet2_Impl::SjApplet2_Impl() throw(com::sun::star::uno::RuntimeException)
++{}
++#endif
+
+ SjApplet2_Impl::~SjApplet2_Impl() throw() {
++#ifdef SOLAR_JAVA
+ if (_joAppletExecutionContext) {
+ TKTThreadAttach jenv(_pJVM, _xJavaThreadRegister_11.get());
+
+@@ -230,6 +248,7 @@
+ jenv.pEnv->DeleteGlobalRef(_joAppletExecutionContext);
+ jenv.pEnv->DeleteGlobalRef(_jcAppletExecutionContext);
+ }
++#endif
+ }
+
+ void SjApplet2_Impl::init(Window * pParentWin,
+@@ -238,6 +257,7 @@
+ const SvCommandList & rCmdList)
+ throw(com::sun::star::uno::RuntimeException)
+ {
++#ifdef SOLAR_JAVA
+ _pParentWin = pParentWin;
+
+
+@@ -338,11 +358,14 @@
+ joDocBase, joParameters, _pEmbeddedWindow->_joWindow, (jlong)0); testJavaException(jenv.pEnv);
+ jenv.pEnv->CallVoidMethod(_joAppletExecutionContext, jmAppletExecutionContext_init); testJavaException(jenv.pEnv);
+ jenv.pEnv->CallVoidMethod(_joAppletExecutionContext, jmAppletExecutionContext_startUp); testJavaException(jenv.pEnv);
+-
++#else // !SOLAR_JAVA
++ throwException();
++#endif
+ }
+
+ void SjApplet2_Impl::setSize(const Size & rSize) throw(com::sun::star::uno::RuntimeException)
+ {
++#ifdef SOLAR_JAVA
+ TKTThreadAttach jenv(_pJVM, _xJavaThreadRegister_11.get());
+
+ _pParentWin->SetSizePixel(rSize);
+@@ -350,42 +373,62 @@
+ jmethodID jmAppletExecutionContext_resize = jenv.pEnv->GetMethodID(_jcAppletExecutionContext, "appletResize", "(II)V"); testJavaException(jenv.pEnv);
+ jenv.pEnv->CallVoidMethod(_joAppletExecutionContext, jmAppletExecutionContext_resize, (jint)rSize.Width(),
+ (jint)rSize.Height()); testJavaException(jenv.pEnv);
++#else // !SOLAR_JAVA
++ throwException();
++#endif
+ }
+
+ void SjApplet2_Impl::restart() throw(com::sun::star::uno::RuntimeException)
+ {
++#ifdef SOLAR_JAVA
+ TKTThreadAttach jenv(_pJVM, _xJavaThreadRegister_11.get());
+
+ jmethodID jmAppletExecutionContext_restart = jenv.pEnv->GetMethodID(_jcAppletExecutionContext, "restart", "()V"); testJavaException(jenv.pEnv);
+ jenv.pEnv->CallVoidMethod(_joAppletExecutionContext, jmAppletExecutionContext_restart); testJavaException(jenv.pEnv);
++#else // !SOLAR_JAVA
++ throwException();
++#endif
+ }
+
+ void SjApplet2_Impl::reload() throw(com::sun::star::uno::RuntimeException)
+ {
++#ifdef SOLAR_JAVA
+ TKTThreadAttach jenv(_pJVM, _xJavaThreadRegister_11.get());
+
+ jmethodID jmAppletExecutionContext_reload = jenv.pEnv->GetMethodID(_jcAppletExecutionContext, "reload", "()V"); testJavaException(jenv.pEnv);
+ jenv.pEnv->CallVoidMethod(_joAppletExecutionContext, jmAppletExecutionContext_reload); testJavaException(jenv.pEnv);
++#else // !SOLAR_JAVA
++ throwException();
++#endif
+ }
+
+ void SjApplet2_Impl::start() throw(com::sun::star::uno::RuntimeException)
+ {
++#ifdef SOLAR_JAVA
+ TKTThreadAttach jenv(_pJVM, _xJavaThreadRegister_11.get());
+
+ jmethodID jmAppletExecutionContext_sendStart = jenv.pEnv->GetMethodID(_jcAppletExecutionContext, "sendStart", "()V"); testJavaException(jenv.pEnv);
+ jenv.pEnv->CallVoidMethod(_joAppletExecutionContext, jmAppletExecutionContext_sendStart); testJavaException(jenv.pEnv);
++#else // !SOLAR_JAVA
++ throwException();
++#endif
+ }
+
+ void SjApplet2_Impl::stop() throw(com::sun::star::uno::RuntimeException)
+ {
++#ifdef SOLAR_JAVA
+ TKTThreadAttach jenv(_pJVM, _xJavaThreadRegister_11.get());
+
+ jmethodID jmAppletExecutionContext_sendStop = jenv.pEnv->GetMethodID(_jcAppletExecutionContext, "sendStop", "()V"); testJavaException(jenv.pEnv);
+ jenv.pEnv->CallVoidMethod(_joAppletExecutionContext, jmAppletExecutionContext_sendStop); testJavaException(jenv.pEnv);
++#else // !SOLAR_JAVA
++ throwException();
++#endif
+ }
+
+ void SjApplet2_Impl::close() throw(com::sun::star::uno::RuntimeException)
+ {
++#ifdef SOLAR_JAVA
+ TKTThreadAttach jenv(_pJVM, _xJavaThreadRegister_11.get());
+
+ jmethodID jmAppletExecutionContext_shutdown = jenv.pEnv->GetMethodID(_jcAppletExecutionContext, "shutdown", "()V"); testJavaException(jenv.pEnv);
+@@ -416,5 +459,8 @@
+ }
+ }
+ }
++#else // !SOLAR_JAVA
++ throwException();
++#endif
+ }
+
+--- sj2/source/jscpp/sjapplet_impl.hxx.orig 2003-08-08 21:24:48.000000000 -0700
++++ sj2/source/jscpp/sjapplet_impl.hxx 2003-08-08 21:35:45.000000000 -0700
+@@ -1,13 +1,15 @@
+ #include <cstdarg>
+
+-
++#ifdef SOLAR_JAVA
+ #include <jni.h>
+-
++#endif // SOLAR_JAVA
+
+ #include <unotools/processfactory.hxx>
+
++#ifdef SOLAR_JAVA
+ #include <com/sun/star/java/XJavaVM.hpp>
+ #include <com/sun/star/java/XJavaThreadRegister_11.hpp>
++#endif // SOLAR_JAVA
+
+ #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+
+@@ -16,9 +18,12 @@
+ class SvCommandList;
+ class Size;
+
++#ifdef SOLAR_JAVA
+ struct EmbeddedWindow;
++#endif // SOLAR_JAVA
+
+ struct SjApplet2_Impl {
++#ifdef SOLAR_JAVA
+ Window * _pParentWin;
+
+ JavaVM * _pJVM;
+@@ -29,6 +34,7 @@
+
+ com::sun::star::uno::Reference<com::sun::star::java::XJavaVM> _xJavaVM;
+ com::sun::star::uno::Reference<com::sun::star::java::XJavaThreadRegister_11> _xJavaThreadRegister_11;
++#endif // SOLAR_JAVA
+
+ SjApplet2_Impl() throw(com::sun::star::uno::RuntimeException);
+ ~SjApplet2_Impl() throw();
diff -Naur -x CVS ooo-build.orig/patches/RC3/solenv-set-solar-java-only-if-unset.diff ooo-build/patches/RC3/solenv-set-solar-java-only-if-unset.diff
--- ooo-build.orig/patches/RC3/solenv-set-solar-java-only-if-unset.diff 1969-12-31 16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/solenv-set-solar-java-only-if-unset.diff 2003-09-17 12:18:52.000000000 -0700
@@ -0,0 +1,66 @@
+--- solenv/inc/unxlngi3.mk.orig 2003-04-28 09:46:48.000000000 -0700
++++ solenv/inc/unxlngi3.mk 2003-08-18 22:09:12.000000000 -0700
+@@ -64,7 +64,7 @@
+ ASM=
+ AFLAGS=
+
+-SOLAR_JAVA=TRUE
++SOLAR_JAVA*=TRUE
+ JAVAFLAGSDEBUG=-g
+
+ # filter for supressing verbose messages from linker
+--- solenv/inc/unxlngi4.mk.orig 2003-07-31 01:32:41.000000000 -0700
++++ solenv/inc/unxlngi4.mk 2003-08-18 22:09:12.000000000 -0700
+@@ -64,7 +64,7 @@
+ ASM=
+ AFLAGS=
+
+-SOLAR_JAVA=TRUE
++SOLAR_JAVA*=TRUE
+ JAVAFLAGSDEBUG=-g
+
+ # filter for supressing verbose messages from linker
+--- solenv/inc/unxlngi5.mk.orig 2003-07-31 01:32:41.000000000 -0700
++++ solenv/inc/unxlngi5.mk 2003-08-18 22:09:12.000000000 -0700
+@@ -64,7 +64,7 @@
+ ASM=
+ AFLAGS=
+
+-SOLAR_JAVA=TRUE
++SOLAR_JAVA*=TRUE
+ JAVAFLAGSDEBUG=-g
+
+ # filter for supressing verbose messages from linker
+--- solenv/inc/unxlngppc.mk.orig 2003-04-28 09:47:14.000000000 -0700
++++ solenv/inc/unxlngppc.mk 2003-08-18 22:09:12.000000000 -0700
+@@ -65,7 +65,7 @@
+ ASM=
+ AFLAGS=
+
+-SOLAR_JAVA=TRUE
++SOLAR_JAVA*=TRUE
+ JAVAFLAGSDEBUG=-g
+
+ # filter for supressing verbose messages from linker
+--- solenv/inc/unxlngppc4.mk.orig 2003-06-12 03:02:32.000000000 -0700
++++ solenv/inc/unxlngppc4.mk 2003-08-18 22:09:12.000000000 -0700
+@@ -64,7 +64,7 @@
+ ASM=
+ AFLAGS=
+
+-SOLAR_JAVA=TRUE
++SOLAR_JAVA*=TRUE
+ JAVAFLAGSDEBUG=-g
+
+ # filter for supressing verbose messages from linker
+--- solenv/inc/unxlngs3904.mk.orig 2003-06-12 03:02:43.000000000 -0700
++++ solenv/inc/unxlngs3904.mk 2003-08-18 22:09:12.000000000 -0700
+@@ -64,7 +64,7 @@
+ ASM=
+ AFLAGS=
+
+-SOLAR_JAVA=TRUE
++SOLAR_JAVA*=TRUE
+ JAVAFLAGSDEBUG=-g
+
+ # filter for supressing verbose messages from linker
diff -Naur -x CVS ooo-build.orig/patches/RC3/svg-handle-no-solar-java.diff ooo-build/patches/RC3/svg-handle-no-solar-java.diff
--- ooo-build.orig/patches/RC3/svg-handle-no-solar-java.diff 1969-12-31 16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/svg-handle-no-solar-java.diff 2003-09-17 12:18:52.000000000 -0700
@@ -0,0 +1,155 @@
+--- filter/source/svg/svgfilter.hxx.orig 2003-08-09 19:28:05.000000000 -0700
++++ filter/source/svg/svgfilter.hxx 2003-08-09 21:45:14.000000000 -0700
+@@ -83,9 +83,11 @@
+ #ifndef _COM_SUN_STAR_DOCUMENT_XFILTER_HPP_
+ #include <com/sun/star/document/XFilter.hpp>
+ #endif
++#ifdef SOLAR_JAVA
+ #ifndef _COM_SUN_STAR_DOCUMENT_XIMPORTER_HPP_
+ #include <com/sun/star/document/XImporter.hpp>
+ #endif
++#endif // SOLAR_JAVA
+ #ifndef _COM_SUN_STAR_DOCUMENT_XEXPORTER_HPP_
+ #include <com/sun/star/document/XExporter.hpp>
+ #endif
+@@ -104,9 +106,15 @@
+ #ifndef _CPPUHELPER_IMPLBASE1_HXX_
+ #include <cppuhelper/implbase1.hxx>
+ #endif
++#ifdef SOLAR_JAVA
+ #ifndef _CPPUHELPER_IMPLBASE5_HXX_
+ #include <cppuhelper/implbase5.hxx>
+ #endif
++#else // !SOLAR_JAVA
++#ifndef _CPPUHELPER_IMPLBASE4_HXX_
++#include <cppuhelper/implbase4.hxx>
++#endif
++#endif
+ #ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
+ #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+ #endif
+@@ -152,7 +160,9 @@
+ #include <svx/svdxcgv.hxx>
+ #include <svx/svdobj.hxx>
+ #include <xmloff/xmlexp.hxx>
++#ifdef SOLAR_JAVA
+ #include <sj2/jnihelp.hxx>
++#endif
+ #include "svgfilter.hxx"
+ #include "svgscript.hxx"
+
+@@ -238,11 +248,18 @@
+ class SVGFontExport;
+ class SVGActionWriter;
+
++#ifdef SOLAR_JAVA
+ class SVGFilter : public cppu::WeakImplHelper5 < XFilter,
+ XImporter,
+ XExporter,
+ XInitialization,
+ XServiceInfo >
++#else // !SOLAR_JAVA
++class SVGFilter : public cppu::WeakImplHelper4 < XFilter,
++ XExporter,
++ XInitialization,
++ XServiceInfo >
++#endif
+ {
+ typedef ::std::hash_map< Reference< XInterface >, ObjectRepresentation, HashReferenceXInterface > ObjectMap;
+
+@@ -251,14 +268,18 @@
+ ObjectMap* mpObjects;
+ Reference< XMultiServiceFactory > mxMSF;
+ Reference< XComponent > mxSrcDoc;
++#ifdef SOLAR_JAVA
+ Reference< XComponent > mxDstDoc;
++#endif
+ SvXMLElementExport* mpSVGDoc;
+ SVGExport* mpSVGExport;
+ SVGFontExport* mpSVGFontExport;
+ SVGActionWriter* mpSVGWriter;
+ sal_Bool mbPresentation;
+
++#ifdef SOLAR_JAVA
+ sal_Bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException);
++#endif
+
+ sal_Bool implExport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException);
+ Reference< XDocumentHandler > implCreateExportDocumentHandler( const Reference< XOutputStream >& rxOStm );
+@@ -292,8 +313,10 @@
+ virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) throw(RuntimeException);
+ virtual void SAL_CALL cancel( ) throw (RuntimeException);
+
++#ifdef SOLAR_JAVA
+ // XImporter
+ virtual void SAL_CALL setTargetDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException);
++#endif
+
+ // XExporter
+ virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException);
+--- filter/source/svg/makefile.mk.orig 2003-08-09 20:06:22.000000000 -0700
++++ filter/source/svg/makefile.mk 2003-08-09 20:07:54.000000000 -0700
+@@ -99,10 +99,12 @@
+
+ SLOFILES= $(SLO)$/svguno.obj \
+ $(SLO)$/svgfilter.obj \
+- $(SLO)$/svgimport.obj \
+ $(SLO)$/svgexport.obj \
+ $(SLO)$/svgfontexport.obj \
+ $(SLO)$/svgwriter.obj
++.IF "$(SOLAR_JAVA)"!=""
++SLOFILES+= $(SLO)$/svgimport.obj
++.ENDIF
+
+ # --- Library -----------------------------------
+
+@@ -112,7 +114,6 @@
+ $(SVXLIB) \
+ $(XMLOFFLIB) \
+ $(GOODIESLIB) \
+- $(SJLIB) \
+ $(VCLLIB) \
+ $(UNOTOOLSLIB) \
+ $(TOOLSLIB) \
+@@ -120,7 +121,10 @@
+ $(CPPUHELPERLIB) \
+ $(CPPULIB) \
+ $(SALLIB)
+-
++.IF "$(SOLAR_JAVA)"!=""
++SHL1STDLIBS+=\
++ $(SJLIB)
++.ENDIF
+
+ SHL1DEPN=
+ SHL1IMPLIB= i$(SHL1TARGET)
+--- filter/source/svg/svgfilter.cxx.orig 2003-08-09 20:03:37.000000000 -0700
++++ filter/source/svg/svgfilter.cxx 2003-08-09 21:46:50.000000000 -0700
+@@ -97,9 +97,12 @@
+ if( pFocusWindow )
+ pFocusWindow->EnterWait();
+
++#ifdef SOLAR_JAVA
+ if( mxDstDoc.is() )
+ bRet = implImport( rDescriptor );
+- else if( mxSrcDoc.is() )
++ else
++#endif
++ if( mxSrcDoc.is() )
+ bRet = implExport( rDescriptor );
+ else
+ bRet = sal_False;
+@@ -126,11 +129,13 @@
+
+ // -----------------------------------------------------------------------------
+
++#ifdef SOLAR_JAVA
+ void SAL_CALL SVGFilter::setTargetDocument( const Reference< XComponent >& xDoc )
+ throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException)
+ {
+ mxDstDoc = xDoc;
+ }
++#endif
+
+ // -----------------------------------------------------------------------------
+
diff -Naur -x CVS ooo-build.orig/patches/RC3/xsltfilter-handle-no-solar-java.diff ooo-build/patches/RC3/xsltfilter-handle-no-solar-java.diff
--- ooo-build.orig/patches/RC3/xsltfilter-handle-no-solar-java.diff 1969-12-31 16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/xsltfilter-handle-no-solar-java.diff 2003-09-17 12:18:52.000000000 -0700
@@ -0,0 +1,12 @@
+--- filter/source/xsltfilter/makefile.mk.orig 2003-08-09 22:21:10.000000000 -0700
++++ filter/source/xsltfilter/makefile.mk 2003-08-09 22:21:31.000000000 -0700
+@@ -90,7 +90,9 @@
+ # + $(COPY) $(COPYRECURSE) META-INF $(OUT)$/class$/XSLTFilter$/META-INF
+ # --- Targets ------------------------------------------------------
+ .INCLUDE : target.mk
++.IF "$(SOLAR_JAVA)"!=""
+ $(JAVACLASSFILES) : $(CLASSDIR)
++.ENDIF
+
+ $(CLASSDIR) :
+ $(MKDIR) $(CLASSDIR)
diff -Naur -x CVS ooo-build.orig/patches/RC3/xsltvalidate-handle-no-solar-java.diff ooo-build/patches/RC3/xsltvalidate-handle-no-solar-java.diff
--- ooo-build.orig/patches/RC3/xsltvalidate-handle-no-solar-java.diff 1969-12-31 16:00:00.000000000 -0800
+++ ooo-build/patches/RC3/xsltvalidate-handle-no-solar-java.diff 2003-09-17 12:18:52.000000000 -0700
@@ -0,0 +1,12 @@
+--- filter/source/xsltvalidate/makefile.mk.orig 2003-08-09 22:07:10.000000000 -0700
++++ filter/source/xsltvalidate/makefile.mk 2003-08-09 22:07:23.000000000 -0700
+@@ -87,7 +87,9 @@
+ # + $(COPY) $(COPYRECURSE) META-INF $(OUT)$/class$/META-INF
+ # --- Targets ------------------------------------------------------
+ .INCLUDE : target.mk
++.IF "$(SOLAR_JAVA)"!=""
+ $(JAVACLASSFILES) : $(CLASSDIR)
++.ENDIF
+
+ $(CLASSDIR) :
+ $(MKDIR) $(CLASSDIR)
Reply to: