diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-03 10:45:11 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-03 10:45:11 +0000 |
| commit | e27085142b99d3b63cff192cd1b93ab743937f3b (patch) | |
| tree | 5f74b1a9e76c8eb28641f455c518fb8abab485c5 | |
| parent | 9d5a243d6fa2d28877b0943c587003550c572f0e (diff) | |
INTEGRATION: CWS native87 (1.85.20); FILE MERGED
2007/06/20 08:16:12 is 1.85.20.3: RESYNC: (1.85-1.87); FILE MERGED
2007/05/30 12:42:02 is 1.85.20.2: #i65425# building javainstaller only for SOLAR_JAVA builds
2007/04/19 12:44:13 is 1.85.20.1: #i65425# no java gui installer for patches and language packs
| -rw-r--r-- | solenv/bin/make_installer.pl | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index 2225996bc250..6ce6aac74118 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -4,9 +4,9 @@ # # $RCSfile: make_installer.pl,v $ # -# $Revision: 1.87 $ +# $Revision: 1.88 $ # -# last change: $Author: kz $ $Date: 2007-05-10 13:56:19 $ +# last change: $Author: rt $ $Date: 2007-07-03 11:45:11 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -312,6 +312,12 @@ if ( $installer::globals::iswindowsbuild ) { installer::control::read_encodingli if ( $allvariableshashref->{'ADD_INCLUDE_FILES'} ) { installer::worker::add_variables_from_inc_to_hashref($allvariableshashref, $includepatharrayref); } +################################################ +# Disable xpd installer, if SOLAR_JAVA not set +################################################ + +installer::control::check_java_for_xpd($allvariableshashref); + ##################################### # Analyzing the setup script ##################################### @@ -1517,9 +1523,13 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) # creating the xpd file for the package if ( $installer::globals::isxpdplatform ) { - if (( $allvariableshashref->{'XPDINSTALLER'} ) && ( $installer::globals::call_epm != 0 )) + if (( ! $installer::globals::languagepack ) && ( ! $installer::globals::patch )) { - installer::xpdinstaller::create_xpd_file($onepackage, $packages, $languagestringref, $allvariableshashref, $modulesinproductarrayref, $installdir, $installer::globals::subdir, $linkpackage); + if (( $allvariableshashref->{'XPDINSTALLER'} ) && ( $installer::globals::call_epm != 0 )) + { + installer::xpdinstaller::create_xpd_file($onepackage, $packages, $languagestringref, $allvariableshashref, $modulesinproductarrayref, $installdir, $installer::globals::subdir, $linkpackage); + $installer::globals::xpd_files_prepared = 1; + } } } @@ -1557,7 +1567,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) if (( $installer::globals::patch ) && ( $installer::globals::islinuxrpmbuild )) { installer::epmfile::finalize_linux_patch($installer::globals::subdir, $allvariableshashref, $includepatharrayref); } # Copying the xpd installer into the installation set - if (( $allvariableshashref->{'XPDINSTALLER'} ) && ( $installer::globals::isxpdplatform )) + if (( $allvariableshashref->{'XPDINSTALLER'} ) && ( $installer::globals::isxpdplatform ) && ( $installer::globals::xpd_files_prepared )) { installer::xpdinstaller::create_xpd_installer($installdir, $allvariableshashref); $installer::globals::addjavainstaller = 0; # only one java installer possible |