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. The patch applies to the latest CVS
version as of this message, based on the 1.0.99+1.1rc2pre3 tarball. The
only remaining task to accomplish before moving OpenOffice.org to main
is to delete the compiled jar files (such as xt.jar) from the
orig.tar.gz.
This patch also removes the PRODUCT="FULL" change and fixes the build of
crashrep by removing "--only-mod-libs", since PRODUCT="FULL" disables
crashrep entirely.
Changes:
* 023_jdk_none.diff - If java is disabled with --disable-java,
don't abort the configure script if a JDK is not found.
* 049_solenv_set_solar_java_only_if_unset.diff - Set the
SOLAR_JAVA variable conditionally with "*=".
* 050_readlicense_oo_xsltproc.diff - Use xsltproc to replace
java for xml transforms in readlicense_oo.
* 051_officecfg_xsltproc.diff - Use xsltproc to replace java for
xml transforms in officecfg.
* 052_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.
* 053_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.
* 054_jurt_handle_no_solar_java.diff - Don't build jpipe with
SOLAR_JAVA not set.
* 055_jvmaccess_handle_no_solar_java.diff - Don't build jvmaccess
with SOLAR_JAVA not set.
* 056_jni_uno_handle_no_solar_java.diff - Don't build jni_uno
with SOLAR_JAVA not set.
* 057_javaunohelper_handle_no_solar_java.diff - Don't build
javaunohelper with SOLAR_JAVA not set
* 058_psprint_handle_no_solar_java.diff - Don't use jvmaccess to
get JDK font path with SOLAR_JAVA not set.
* 059_sj2_handle_no_solar_java.diff - When SOLAR_JAVA is not set,
replace java applet support with stubs that throw an exception.
* 060_setup2_handle_no_solar_java.diff - Don't build jvmsetup or
use jvmaccess for java-related setup with SOLAR_JAVA not set.
* 061_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.
* 062_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.
* 063_xsltvalidate_handle_no_solar_java.diff - Disable java
components with SOLAR_JAVA not set.
* 064_xsltfilter_handle_no_solar_java.diff - Disable java
components with SOLAR_JAVA not set.
* 065_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.
* 066_odk_handle_no_solar_java.diff - Disable java components and
documentation of java jars with SOLAR_JAVA not set.
* 070_crashrep_remove_only_mod_libs.diff - Remove unknown switch
"--only-mod-libs" from pkg-config invocation.
* rules - Remove --with-jdkhome and add --disable-java in
configure invocation. Don't look for jdkhome in
DEB_BUILD_OPTIONS. Remove classpath from BUILDCMD. Don't set
JDK_HOME or test for javac in JDK_HOME. Remove PRODUCT="FULL"
from BUILDCMD.
* scripts/detect_java.sh - Deleted.
* setperms - Removed chmod of detect_java.sh.
* control, control.in - Removed JDK and java packages from
Build-Depends, and add xsltproc. Move from contrib to main.
* README - Remove JDK information.
* MANIFEST.i386 - Updated.
* openoffice.org-bin.install - Updated.
* openoffice.org-crashrep.install - Updated.
* openoffice.org.install - Updated.
- Josh Triplett
Attachment:
openoffice.org_no_solar_java.diff.bz2
Description: Binary data