With the attached patch, OpenOffice.org will build without a JDK
installed. This patch adds checks for SOLAR_JAVA to various makefiles,
source files, and setup lists. It uses xsltproc to replace the java xml
manipulations in readlicense_oo and officecfg. The patch applies to the
latest CVS versions of the debian and ooo-build directories based on
version 1.1rc3.
The remaining tasks to accomplish before uploading OpenOffice.org to
main are to delete the compiled jar files (such as xt.jar and jaxp.jar)
from the orig.tar.gz, and to package the "precompiled files for mozilla"
mentioned in debian/README so that OpenOffice.org can build from source
on non-i386 architectures without using packages from outside the main
debian archive.
Changes:
* ooo-build/patches/OOO_1_1_RC3/apply - Added new patches with
descriptions.
+ allow-no-jdk.diff - If java is disabled with --disable-java,
don't abort the configure script if a JDK is not found.
+ solenv-set-solar-java-only-if-unset.diff - Set the SOLAR_JAVA
variable conditionally with "*=".
+ 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.
+ berkeleydb-handle-no-solar-java.diff - If SOLAR_JAVA is not set,
don't pass --enable-java to the configure script, and don't
expect the jar when finished.
+ ridljar-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.
+ jurt-handle-no-solar-java.diff - Don't build jpipe with
SOLAR_JAVA not set.
+ jvmaccess-handle-no-solar-java.diff - Don't build jvmaccess
with SOLAR_JAVA not set.
+ jni-uno-handle-no-solar-java.diff - Don't build jni_uno with
SOLAR_JAVA not set.
+ javaunohelper-handle-no-solar-java.diff - Don't build
javaunohelper with SOLAR_JAVA not set
+ psprint-handle-no-solar-java.diff - Don't use jvmaccess to get
JDK font path with SOLAR_JAVA not set.
+ sj2-handle-no-solar-java.diff - When SOLAR_JAVA is not set,
replace java applet support with stubs that throw an exception.
+ setup2-handle-no-solar-java.diff - Don't build jvmsetup or use
jvmaccess for java-related setup with SOLAR_JAVA not set.
+ scp-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.
+ svg-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.
+ xsltvalidate-handle-no-solar-java.diff - Disable java components
with SOLAR_JAVA not set.
+ xsltfilter-handle-no-solar-java.diff - Disable java components
with SOLAR_JAVA not set.
+ desktop-handle-no-solar-java.diff - Don't build javaldx with
SOLAR_JAVA not set, and check for javaldx in soffice.sh before
using it.
* 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.
* debian/control, debian/control.in - Removed JDK and lib*-java
packages from Build-Depends, and added xsltproc. Moved from contrib
to main.
* README - Removed JDK information.
* MANIFEST.i386, MANIFEST.powerpc, MANIFEST.s390 - Updated.
* openoffice.org.install, openoffice.org-bin.install - Updated.
- Josh Triplett
Attachment:
openoffice.org1.1rc3-no-jdk.diff.bz2
Description: Binary data