strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit 'libreoffice-3.3.0.2'

Browse source 
Conflicts:
	configure.in
	scp2/source/extensions/directory_extensions.scp
	scp2/source/extensions/module_extensions.scp
	scp2/source/ooo/file_ooo.scp
	set_soenv.in
	solenv/bin/modules/installer/download.pm
	solenv/bin/modules/installer/helppack.pm
	solenv/bin/modules/installer/windows/createfolder.pm
	solenv/bin/modules/installer/worker.pm
	solenv/bin/ooinstall
This commit is contained in:
Jan Holesovsky 2010-12-20 01:11:02 +01:00
commit 70896c190c
34 changed files with 262 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
configure.in
View file

@ -542,6 +542,12 @@ AC_ARG_WITH(theme,
Possible choices: *default, *crystal, *hicontrast, *oxygen, *tango, classic, industrial.]),
,)
AC_ARG_WITH(theme,
AS_HELP_STRING([--with-theme="theme1 theme2..."],
[Choose which themes to include. By default those themes with an '*' are included.
Possible choices: *default, *crystal, *hicontrast, *oxygen, *tango, classic, industrial.]),
,)
AC_ARG_WITH(extension-integration,
AS_HELP_STRING([--with-extension-integration],
[It will integrate the builded extensions to the installer of the product.
@ -550,9 +556,9 @@ AC_ARG_WITH(extension-integration,
AC_ARG_WITH(helppack-integration,
[
--with-helppack-integration It will integrate the helppacks to the installer
--without-helppack-integration It will not integrate the helppacks to the installer
of the product.
Please use this switch to include any helppack.],
Please use this switch to use the online help or separate help packages.],
,)
AC_ARG_WITH(fonts,
@ -1764,9 +1770,8 @@ else
fi
AC_SUBST(WITH_MYSPELL_DICTS)
if test "$WITH_MYSPELL_DICTS" = "NO"; then
AC_MSG_CHECKING([whether to use dicts from external paths])
if test -n "$with_system_dicts" -a "$with_system_dicts" = "yes"; then
AC_MSG_CHECKING([whether to use dicts from external paths])
if test -n "$with_system_dicts" -a "$with_system_dicts" = "yes"; then
AC_MSG_RESULT([yes])
SYSTEM_DICTS=YES
AC_MSG_CHECKING([for spelling dictionary directory])
@ -1790,10 +1795,9 @@ if test "$WITH_MYSPELL_DICTS" = "NO"; then
THES_SYSTEM_DIR=file:///usr/share/mythes
fi
AC_MSG_RESULT([$THES_SYSTEM_DIR])
else
AC_MSG_RESULT([no])
SYSTEM_DICTS=NO
fi
else
AC_MSG_RESULT([no])
SYSTEM_DICTS=NO
fi
AC_SUBST(SYSTEM_DICTS)
AC_SUBST(DICT_SYSTEM_DIR)
@ -3926,6 +3930,16 @@ else
fi
AC_SUBST(GPERF)
dnl ===================================================================
dnl Check for pkg-config
dnl # Note that if there is a possibility the first call to
dnl # PKG_CHECK_MODULES might not happen, you should be sure to include an
dnl # explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
dnl ===================================================================
if test "$_os" != "WNT"; then
PKG_PROG_PKG_CONFIG
fi
dnl ===================================================================
dnl Check for building stax
dnl ===================================================================
@ -5479,6 +5493,12 @@ if test "$with_system_mesa_headers" = "no"; then
else
AC_MSG_RESULT([external])
SYSTEM_MESA_HEADERS=YES
AC_LANG_PUSH(C)
AC_CHECK_HEADER(GL/glxext.h, [],
[ AC_MSG_ERROR(mesa headers not found.)], [#include <GL/glx.h>])
AC_MSG_CHECKING([whether GL/glxext.h defines PFNGLXBINDTEXIMAGEEXTPROC])
AC_EGREP_HEADER(PFNGLXBINDTEXIMAGEEXTPROC, GL/glxext.h, [AC_MSG_RESULT([yes])], AC_MSG_ERROR(no))
AC_LANG_POP(C)
fi
AC_SUBST(SYSTEM_MESA_HEADERS)
@ -6956,6 +6976,21 @@ the root of your Qt installation by exporting QT4DIR before running "configure".
KDE4_CFLAGS="`pkg-config --cflags QtCore` `pkg-config --cflags QtGui` -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
KDE4_LIBS="-L$kde_libdir -L$qt_lib_dir -lkdeui -lkdecore -lQtCore -lQtGui"
AC_LANG_PUSH([C++])
save_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS $KDE4_CFLAGS"
AC_MSG_CHECKING([whether KDE is >= 4.2])
AC_TRY_RUN([
#include <kdeversion.h>
int main(int argc, char **argv) {
if (KDE_VERSION_MAJOR == 4 && KDE_VERSION_MINOR >= 2) return 0;
else return 1;
}
], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([KDE version too old])])
CXXFLAGS=$save_CXXFLAGS
AC_LANG_POP([C++])
# Glib is needed for properly handling Qt event loop with Qt's Glib integration enabled
PKG_CHECK_MODULES(KDE_GLIB,[glib-2.0 >= 2.4],
[KDE_HAVE_GLIB=1],
@ -7063,12 +7098,12 @@ dnl ===================================================================
dnl Test whether to integrate helppacks into the product's installer
dnl ===================================================================
AC_MSG_CHECKING([for helppack integration])
if test "z$with_helppack_integration" = "z" -o "z$with_helppack_integration" = "zno" ; then
if test "z$with_helppack_integration" = "zno" ; then
WITH_HELPPACK_INTEGRATION=NO
AC_MSG_RESULT([no integration])
else
WITH_HELPPACK_INTEGRATION=YES
SCPDEFS="$SCPDEFS -DWITH_HELLPACK_INTEGRATION"
SCPDEFS="$SCPDEFS -DWITH_HELPPACK_INTEGRATION"
AC_MSG_RESULT([integration])
fi
AC_SUBST(WITH_HELPPACK_INTEGRATION)

BIN
instsetoo_native/inc_broffice/windows/msi_templates/Binary/Banner.bmp
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

BIN
instsetoo_native/inc_broffice/windows/msi_templates/Binary/Image.bmp
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 51 KiB

BIN
instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 51 KiB

6
instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf
View file

@ -5,16 +5,16 @@ en-US = "Comment in the Add-Remove-Programs Applet"
en-US = "Department for technical support"
[OOO_ARPHELPLINKTEMPLATE]
en-US = "http://www.openoffice.org"
en-US = "http://www.documentfoundation.org"
[OOO_ARPHELPTELEPHONETEMPLATE]
en-US = "x-xxx-xxx-xxx"
[OOO_ARPURLINFOABOUTTEMPLATE]
en-US = "http://www.openoffice.org"
en-US = "http://www.documentfoundation.org"
[OOO_ARPURLUPDATEINFOTEMPLATE]
en-US = "http://www.openoffice.org"
en-US = "http://www.documentfoundation.org"
[OOO_STR_NEW_DISPLAY_NAME]
en-US = "~New"

BIN
instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 51 KiB

BIN
instsetoo_native/res/nologoinstall.bmp
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 51 KiB

4
instsetoo_native/util/makefile.mk
View file

@ -84,9 +84,9 @@ ALLTAR : $(LOCALPYFILES)
.ELSE # "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
.IF "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack
ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack ooohelppack
.ELSE
ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack sdkoo_en-US ure_en-US
ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack ooohelppack sdkoo_en-US ure_en-US
.ENDIF
.ELSE # "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
ALLTAR : updatepack

16
instsetoo_native/util/openoffice.lst
View file

@ -26,8 +26,8 @@ Globals
REGISTRATION_HOST https://registration.libreoffice.org/RegistrationWeb
REGISTRATIONURL http://survey.libreoffice.org/user/index.php
PROGRESSBARCOLOR 126,170,23
PROGRESSSIZE 320,7
PROGRESSPOSITION 185,206
PROGRESSSIZE 319,10
PROGRESSPOSITION 164,225
PROGRESSFRAMECOLOR 207,208,211
NATIVEPROGRESS true
REGISTRYLAYERNAME Layers
@ -57,7 +57,7 @@ LibreOffice
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION beta3
SHORT_PRODUCTEXTENSION rc2
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
@ -126,7 +126,7 @@ LibreOffice_wJRE
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION beta3
SHORT_PRODUCTEXTENSION rc2
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
@ -191,7 +191,7 @@ LibreOffice_Dev
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION beta3
SHORT_PRODUCTEXTENSION rc2
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION
@ -269,7 +269,7 @@ URE
PRODUCTEXTENSION
BRANDPACKAGEVERSION 3
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION beta3
SHORT_PRODUCTEXTENSION rc2
LICENSENAME LGPL
SERVICESPROJEKT 1
SETSTATICPATH 1
@ -310,7 +310,7 @@ LibreOffice_SDK
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION beta3
SHORT_PRODUCTEXTENSION rc2
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3
@ -355,7 +355,7 @@ LibreOffice_Dev_SDK
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION beta3
SHORT_PRODUCTEXTENSION rc2
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION SDK

2
scp2/source/extensions/file_extensions.scp
View file

@ -330,3 +330,5 @@ End
#endif
#endif
#endif

2
scp2/source/ooo/ooo_brand.scp
View file

@ -35,7 +35,7 @@ Directory gid_Dir_Brand_Root
#else
HostName = ".";
#endif
Styles = (OFFICEDIRECTORY,ISINSTALLLOCATION);
Styles = (OFFICEDIRECTORY,ISINSTALLLOCATION,CREATE);
End
#endif

1
set_soenv.in
View file

@ -1681,6 +1681,7 @@ ToFile( "ENABLE_REPORTBUILDER","@ENABLE_REPORTBUILDER@","e" );
ToFile( "ENABLE_UNIX_QUICKSTARTER", "@ENABLE_UNIX_QUICKSTARTER@", "e" );
ToFile( "SYSTEM_JFREEREPORT","@SYSTEM_JFREEREPORT@","e" );
ToFile( "WITH_THEMES", "@WITH_THEMES@", "e");
ToFile( "WITH_HELPPACK_INTEGRATION", "@WITH_HELPPACK_INTEGRATION@", "e");
ToFile( "WITH_EXTENSION_INTEGRATION", "@WITH_EXTENSION_INTEGRATION@", "e");
ToFile( "OOO_JUNIT_JAR", "@OOO_JUNIT_JAR@", "e" );
ToFile( "SAC_JAR", "@SAC_JAR@", "e" );

10
solenv/bin/make_installer.pl
View file

@ -491,6 +491,7 @@ if (( ! $allvariableshashref->{'XPDINSTALLER'} ) || ( ! $installer::globals::isx
}
if ( $installer::globals::languagepack ) { installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref); }
if ( $installer::globals::helppack ) { installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref); }
if ( $installer::globals::patch ) { installer::scriptitems::use_patch_copy_scpaction($scpactionsinproductarrayref); }
if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions1b.log", $scpactionsinproductarrayref); }
@ -830,7 +831,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles10c.log", $filesinproductlanguageresolvedarrayref); }
}
if ( ! $allvariableshashref->{'NO_README_IN_ROOTDIR'} )
{
$filesinproductlanguageresolvedarrayref = installer::scriptitems::add_License_Files_into_Installdir($filesinproductlanguageresolvedarrayref, $dirsinproductlanguageresolvedarrayref, $languagesarrayref);
@ -1857,6 +1857,9 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
# Creating installation set for Unix language packs, that are not part of multi lingual installation sets
if ( ( $installer::globals::languagepack ) && ( ! $installer::globals::debian ) && ( ! $installer::globals::makedownload ) ) { installer::languagepack::build_installer_for_languagepack($installer::globals::epmoutpath, $allvariableshashref, $includepatharrayref, $languagesarrayref, $languagestringref); }
# Creating installation set for Unix help packs, that are not part of multi lingual installation sets
if ( ( $installer::globals::helppack ) && ( ! $installer::globals::debian ) && ( ! $installer::globals::makedownload ) ) { installer::helppack::build_installer_for_helppack($installer::globals::epmoutpath, $allvariableshashref, $includepatharrayref, $languagesarrayref, $languagestringref); }
# Finalizing patch installation sets
if (( $installer::globals::patch ) && ( $installer::globals::issolarispkgbuild )) { installer::epmfile::finalize_patch($installer::globals::epmoutpath, $allvariableshashref); }
if (( $installer::globals::patch ) && ( $installer::globals::isrpmbuild )) { installer::epmfile::finalize_linux_patch($installer::globals::epmoutpath, $allvariableshashref, $includepatharrayref); }
@ -1895,6 +1898,9 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
# Creating installation set for Unix language packs, that are not part of multi lingual installation sets
if ( ( $installer::globals::languagepack ) && ( ! $installer::globals::debian ) && ( ! $installer::globals::makedownload ) ) { installer::languagepack::build_installer_for_languagepack($newepmdir, $allvariableshashref, $includepatharrayref, $languagesarrayref, $languagestringref); }
# Creating installation set for Unix help packs, that are not part of multi lingual installation sets
if ( ( $installer::globals::helppack ) && ( ! $installer::globals::debian ) && ( ! $installer::globals::makedownload ) ) { installer::helppack::build_installer_for_helpepack($newepmdir, $allvariableshashref, $includepatharrayref, $languagesarrayref, $languagestringref); }
chdir($currentdir); # changing back into start directory
}
@ -2087,7 +2093,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
installer::windows::upgrade::create_upgrade_table($newidtdir, $allvariableshashref);
if ( ! $installer::globals::languagepack ) # the following tables not for language packs
if (( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack )) # the following tables not for language packs or help packs
{
installer::windows::removefile::create_removefile_table($folderitemsinproductlanguageresolvedarrayref, $newidtdir);

22
solenv/bin/modules/installer/download.pm
View file

@ -420,6 +420,7 @@ sub get_installation_type
my $type = "";
if ( $installer::globals::languagepack ) { $type = "langpack"; }
elsif ( $installer::globals::helppack ) { $type = "helppack"; }
else { $type = "install"; }
return $type;
@ -661,6 +662,25 @@ sub get_install_type
$type = $type . "-arc";
}
}
elsif ( $installer::globals::helppack )
{
$type = "helppack";
if ( $installer::globals::isrpmbuild )
{
$type = $type . "-rpm";
}
if ( $installer::globals::isdebbuild )
{
$type = $type . "-deb";
}
if ( $installer::globals::packageformat eq "archive" )
{
$type = $type . "-arc";
}
}
else
{
$type = "install";
@ -1025,7 +1045,7 @@ sub put_windows_productpath_into_template
if (length($locallangs) > $installer::globals::max_lang_length) { $locallangs = "multi lingual"; }
if ( ! $installer::globals::languagepack ) { $productpath = $productpath . " (" . sprintf('%x', time()) . ")"; }
if ( ! $installer::globals::languagepack || ! $installer::globals::helppack ) { $productpath = $productpath . " (" . sprintf('%x', time()) . ")"; }
replace_one_variable($templatefile, "PRODUCTPATHPLACEHOLDER", $productpath);
}

65
solenv/bin/modules/installer/epmfile.pm
View file

@ -318,7 +318,7 @@ sub create_epm_header
my @epmheader = ();
my ($licensefilename, $readmefilename);
my ($licensefilename, $readmefilename, $readmefilenameen);
my $foundlicensefile = 0;
my $foundreadmefile = 0;
@ -388,24 +388,27 @@ sub create_epm_header
{
$licensefilename = "license.txt";
$readmefilename = "readme.txt";
$readmefilenameen = "readme_en-US.txt";
}
else
{
$licensefilename = "LICENSE";
$readmefilename = "README";
$readmefilenameen = "README_en-US";
}
if (( $installer::globals::languagepack ) # in language packs the files LICENSE and README are removed, because they are not language specific
if (( $installer::globals::languagepack ) # in language packs and help packs the files LICENSE and README are removed, because they are not language specific
|| ( $installer::globals::helppack )
|| ( $variableshashref->{'NO_README_IN_ROOTDIR'} ))
{
if ( $installer::globals::iswindowsbuild )
{
$licensefilename = "license_$searchlanguage.txt";
$licensefilename = "license.txt"; # _$searchlanguage.txt";
$readmefilename = "readme_$searchlanguage.txt";
}
else
{
$licensefilename = "LICENSE_$searchlanguage";
$licensefilename = "LICENSE"; # _$searchlanguage";
$readmefilename = "README_$searchlanguage";
}
}
@ -432,18 +435,41 @@ sub create_epm_header
$license_in_package_defined = 1;
}
}
# searching for and readme file
for ( my $i = 0; $i <= $#{$filesinproduct}; $i++ )
# searching for and readme file;
# URE uses special README; others use README_en-US
# it does not matter which one is passed for epm if both are packaged
foreach my $possiblereadmefilename ($readmefilenameen, $readmefilename)
{
my $onefile = ${$filesinproduct}[$i];
my $filename = $onefile->{'Name'};
if ( $filename eq $readmefilename )
last if ($foundreadmefile);
for ( my $i = 0; $i <= $#{$filesinproduct}; $i++ )
{
my $onefile = ${$filesinproduct}[$i];
my $filename = $onefile->{'Name'};
if ( $filename eq $possiblereadmefilename )
{
$foundreadmefile = 1;
$line = "%readme" . " " . $onefile->{'sourcepath'} . "\n";
push(@epmheader, $line);
last;
}
}
}
# the readme file need not be packaged more times in the help content
# it needs to be installed in parallel with the main package anyway
# try to find the README file between all available files (not only between the packaged)
if (!($foundreadmefile) && $installer::globals::helppack)
{
my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$readmefilenameen, "" , 0);
if($$fileref ne "" )
{
$infoline = "Fallback to readme file: \"$$fileref\"!\n";
push(@installer::globals::logfileinfo, $infoline);
$foundreadmefile = 1;
$line = "%readme" . " " . $onefile->{'sourcepath'} . "\n";
$line = "%readme" . " " . $$fileref . "\n";
push(@epmheader, $line);
last;
}
}
@ -502,6 +528,23 @@ sub create_epm_header
last;
}
}
# the license file need not be packaged more times in the langpacks
# they need to be installed in parallel with the main package anyway
# try to find the LICENSE file between all available files (not only between the packaged)
if (!($foundlicensefile) && ($installer::globals::languagepack || $installer::globals::helppack))
{
my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, "" , 0);
if($$fileref ne "" )
{
$infoline = "Fallback to license file: \"$$fileref\"!\n";
push(@installer::globals::logfileinfo, $infoline);
$foundlicensefile = 1;
$line = "%license" . " " . $$fileref . "\n";
push(@epmheader, $line);
}
}
}
if (!($foundlicensefile))

2
solenv/bin/modules/installer/followme.pm
View file

@ -87,6 +87,7 @@ sub save_followme_info
push(@filecontent, "globals:product: $installer::globals::product\n");
push(@filecontent, "globals:patch: $installer::globals::patch\n");
push(@filecontent, "globals:languagepack: $installer::globals::languagepack\n");
push(@filecontent, "globals:helppack: $installer::globals::helppack\n");
push(@filecontent, "globals:installertypedir: $installer::globals::installertypedir\n");
push(@filecontent, "globals:max_lang_length: $installer::globals::max_lang_length\n");
push(@filecontent, "globals:compiler: $installer::globals::compiler\n");
@ -189,6 +190,7 @@ sub read_followme_info
if ( $name eq "product" ) { $installer::globals::product = $value; }
if ( $name eq "patch" ) { $installer::globals::patch = $value; }
if ( $name eq "languagepack" ) { $installer::globals::languagepack = $value; }
if ( $name eq "helppack" ) { $installer::globals::helppack = $value; }
if ( $name eq "installertypedir" ) { $installer::globals::installertypedir = $value; }
if ( $name eq "max_lang_length" ) { $installer::globals::max_lang_length = $value; }
if ( $name eq "compiler" ) { $installer::globals::compiler = $value; }

4
solenv/bin/modules/installer/globals.pm
View file

@ -190,7 +190,7 @@ BEGIN
%alllangmodules = ();
$englishlicenseset = 0;
$englishlicense = "";
$englishsolarislicensename = "LICENSE_en-US";
$englishsolarislicensename = "LICENSE"; # _en-US";
$solarisdontcompress = 0;
$patharray = "";
@ -416,7 +416,7 @@ BEGIN
$one_cab_file = 0;
$fix_number_of_cab_files = 1;
$cab_file_per_component = 0;
$cabfilecompressionlevel = 2;
$cabfilecompressionlevel = 7;
$number_of_cabfiles = 1; # only for $fix_number_of_cab_files = 1
$include_cab_in_msi = 0;
$use_packages_for_cabs = 0;

40
solenv/bin/modules/installer/helppack.pm
View file

@ -50,14 +50,22 @@ sub select_help_items
{
my $oneitem = ${$itemsref}[$i];
<<<<<<< HEAD
my $ismultilingual = $oneitem->{'ismultilingual'};
if (!($ismultilingual))
=======
my $styles = "";
if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
if (( $styles =~ /\bHELPPACK\b/ ) || ( $styles =~ /\bFORCEHELPPACK\b/ ))
>>>>>>> libreoffice-3.3.0.2
{
# Files with style "HELPPACK" and "FORCEHELPPACK" also have to be included into the help pack.
# Files with style "HELPPACK" are only included into help packs.
# Files with style "FORCEHELPPACK" are included into help packs and non help packs. They are
# forced, because otherwise they not not be included into helppacks.
<<<<<<< HEAD
my $styles = "";
if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
@ -84,6 +92,34 @@ sub select_help_items
}
}
}
=======
my $ismultilingual = $oneitem->{'ismultilingual'};
if ($ismultilingual)
{
my $specificlanguage = "";
if ( $oneitem->{'specificlanguage'} ) { $specificlanguage = $oneitem->{'specificlanguage'}; }
for ( my $j = 0; $j <= $#{$languagesarrayref}; $j++ ) # iterating over all languages
{
my $onelanguage = ${$languagesarrayref}[$j];
my $locallang = $onelanguage;
$locallang =~ s/-/_/;
if ( $specificlanguage eq $onelanguage )
{
push(@itemsarray, $oneitem);
}
}
}
else
{
push(@itemsarray, $oneitem);
}
}
}
>>>>>>> libreoffice-3.3.0.2
return \@itemsarray;
}
@ -490,7 +526,11 @@ sub build_installer_for_helppack
# find and read english license file
my $licenselanguage = "en-US"; # always english !
<<<<<<< HEAD
my $licensefilename = "LICENSE_" . $licenselanguage;
=======
my $licensefilename = "LICENSE"; # _" . $licenselanguage;
>>>>>>> libreoffice-3.3.0.2
my $licenseincludepatharrayref = installer::worker::get_language_specific_include_pathes($includepatharrayref, $licenselanguage);
my $licenseref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, $licenseincludepatharrayref, 0);

2
solenv/bin/modules/installer/languagepack.pm
View file

@ -474,7 +474,7 @@ sub build_installer_for_languagepack
# find and read english license file
my $licenselanguage = "en-US"; # always english !
my $licensefilename = "LICENSE_" . $licenselanguage;
my $licensefilename = "LICENSE"; # _" . $licenselanguage;
my $licenseincludepatharrayref = installer::worker::get_language_specific_include_pathes($includepatharrayref, $licenselanguage);
my $licenseref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, $licenseincludepatharrayref, 0);

27
solenv/bin/modules/installer/scriptitems.pm
View file

@ -1225,6 +1225,7 @@ sub get_Source_Directory_For_Files_From_Includepathlist
if (( $styles =~ /\bSTARREGISTRY\b/ ) || ( $styles =~ /\bFILE_CAN_MISS\b/ )) { $file_can_miss = 1; }
if (( $installer::globals::languagepack ) && ( ! $onefile->{'ismultilingual'} ) && ( ! ( $styles =~ /\bFORCELANGUAGEPACK\b/ ))) { $file_can_miss = 1; }
if (( $installer::globals::helppack ) && ( ! $onefile->{'ismultilingual'} ) && ( ! ( $styles =~ /\bFORCEHELPPACK\b/ ))) { $file_can_miss = 1; }
my $sourcepathref = "";
@ -1354,7 +1355,7 @@ sub remove_Files_Without_Sourcedirectory
{
my $filename = $onefile->{'Name'};
if ( ! $installer::globals::languagepack )
if ( ! $installer::globals::languagepack && !$installer::globals::helppack)
{
$infoline = "ERROR: Removing file $filename from file list.\n";
push( @installer::globals::logfileinfo, $infoline);
@ -1364,7 +1365,7 @@ sub remove_Files_Without_Sourcedirectory
next; # removing this file from list, if sourcepath is empty
}
else # special case for language packs
elsif ( $installer::globals::languagepack ) # special case for language packs
{
if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ ))
{
@ -1383,6 +1384,28 @@ sub remove_Files_Without_Sourcedirectory
$infoline = "INFO: It is not language dependent and can be ignored in language packs.\n";
push( @installer::globals::logfileinfo, $infoline);
next; # removing this file from list, if sourcepath is empty
}
}
else # special case for help packs
{
if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCEHELPPACK\b/ ))
{
$infoline = "ERROR: Removing file $filename from file list.\n";
push( @installer::globals::logfileinfo, $infoline);
push(@missingfiles, "ERROR: File not found: $filename\n");
$error_occured = 1;
next; # removing this file from list, if sourcepath is empty
}
else
{
$infoline = "INFO: Removing file $filename from file list. It is not language dependent.\n";
push( @installer::globals::logfileinfo, $infoline);
$infoline = "INFO: It is not language dependent and can be ignored in help packs.\n";
push( @installer::globals::logfileinfo, $infoline);
next; # removing this file from list, if sourcepath is empty
}
}

12
solenv/bin/modules/installer/simplepackage.pm
View file

@ -110,6 +110,13 @@ sub register_extensions
push( @installer::globals::logfileinfo, $infoline);
}
if (( $installer::globals::helppack ) && ( ! -f $unopkgfile ))
{
$unopkgexists = 0;
$infoline = "Help packs do not contain unopkg!\n";
push( @installer::globals::logfileinfo, $infoline);
}
if ( ! -f $unopkgfile )
{
$unopkgexists = 0;
@ -418,10 +425,11 @@ sub create_package
my $localtempdir = $tempdir;
if (( $installer::globals::languagepack ) || ( $installer::globals::patch ))
if (( $installer::globals::languagepack ) || ( $installer::globals::helppack ) || ( $installer::globals::patch ))
{
$localtempdir = "$tempdir/$packagename";
if ( $installer::globals::languagepack ) { $volume_name = "$volume_name Language Pack"; }
if ( $installer::globals::helppack ) { $volume_name = "$volume_name Help Pack"; }
if ( $installer::globals::patch ) { $volume_name = "$volume_name Patch"; }
# Create tar ball named tarball.tar.bz2
@ -466,6 +474,7 @@ sub create_package
my $scriptrealfilename = "osx_install.applescript";
my $scriptfilename = "";
if ( $installer::globals::languagepack ) { $scriptfilename = "osx_install_languagepack.applescript"; }
if ( $installer::globals::helppack ) { $scriptfilename = "osx_install_helppack.applescript"; }
if ( $installer::globals::patch ) { $scriptfilename = "osx_install_patch.applescript"; }
my $scripthelpersolverfilename = "mac_install.script";
my $scripthelperrealfilename = $volume_name;
@ -608,6 +617,7 @@ sub create_simple_package
{
$downloadname = installer::ziplist::getinfofromziplist($allsettingsarrayref, "downloadname");
if ( $installer::globals::languagepack ) { $downloadname = installer::ziplist::getinfofromziplist($allsettingsarrayref, "langpackdownloadname"); }
if ( $installer::globals::helppack ) { $downloadname = installer::ziplist::getinfofromziplist($allsettingsarrayref, "helppackdownloadname"); }
if ( $installer::globals::patch ) { $downloadname = installer::ziplist::getinfofromziplist($allsettingsarrayref, "patchdownloadname"); }
$packagename = installer::download::resolve_variables_in_downloadname($allvariables, $$downloadname, \$locallanguage);
}

8
solenv/bin/modules/installer/windows/createfolder.pm
View file

@ -96,7 +96,7 @@ sub get_createfolder_component
my $onefile = "";
if ( $installer::globals::languagepack ) { $onefile = get_languagepack_file($filesref, $onedir); }
elsif ( $installer::globals::helppack ) { $onefile = installer::existence::get_specified_file($filesref, 'gid_File_Help_Help_Zip'); }
elsif ( $installer::globals::helppack ) { $onefile = installer::existence::get_specified_file($filesref, 'gid_File_Help_Common_Zip'); }
else { $onefile = installer::existence::get_specified_file($filesref, $globalfilegid); }
return $onefile->{'componentname'};
@ -122,8 +122,8 @@ sub create_createfolder_table
{
my $onedir = ${$dirref}[$i];
# language packs get only language dependent directories
if (( $installer::globals::languagepack ) && ( $onedir->{'specificlanguage'} eq "" )) { next };
# language packs and help packs get only language dependent directories
if (( $installer::globals::languagepack ) || ( $installer::globals::languagepack ) && ( $onedir->{'specificlanguage'} eq "" )) { next };
my $styles = "";
@ -151,4 +151,4 @@ sub create_createfolder_table
}
1;
1;

3
solenv/bin/modules/installer/windows/directory.pm
View file

@ -160,6 +160,7 @@ sub check_sourcedir_addon
if (($installer::globals::addchildprojects) ||
($installer::globals::patch) ||
($installer::globals::languagepack) ||
($installer::globals::helppack) ||
($allvariableshashref->{'CHANGETARGETDIR'}))
{
my $sourcediraddon = "\:\.";
@ -311,7 +312,7 @@ sub add_root_directories
my $oneline = "";
if (( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack ) && ( ! $allvariableshashref->{'DONTUSESTARTMENUFOLDER'} ))
if (( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack ) && ( ! $allvariableshashref->{'DONTUSESTARTMENUFOLDER'} ))
{
my $productname = $allvariableshashref->{'PRODUCTNAME'};
my $productversion = $allvariableshashref->{'PRODUCTVERSION'};

4
solenv/bin/modules/installer/windows/feature.pm
View file

@ -120,8 +120,8 @@ sub get_feature_display
# Special handling for c05office. No program module visible.
if (( $onefeature->{'gid'} eq "gid_Module_Prg" ) && ( $installer::globals::product =~ /c05office/i )) { $display = "0"; }
# making all feature invisible in Language packs!
if ( $installer::globals::languagepack ) { $display = "0"; }
# making all feature invisible in Language packs and in Help packs!
if ( $installer::globals::languagepack || $installer::globals::helppack ) { $display = "0"; }
return $display
}

2
solenv/bin/modules/installer/windows/mergemodule.pm
View file

@ -51,7 +51,7 @@ sub merge_mergemodules_into_msi_database
my ($mergemodules, $filesref, $msifilename, $languagestringref, $language, $languagefile, $allvariables, $includepatharrayref, $allupdatesequences, $allupdatelastsequences, $allupdatediskids) = @_;
my $domerge = 0;
if (( $#{$mergemodules} > -1 ) && ( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack )) { $domerge = 1; }
if (( $#{$mergemodules} > -1 ) && ( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack )) { $domerge = 1; }
if ( $domerge )
{

6
solenv/bin/modules/installer/windows/msp.pm
View file

@ -705,7 +705,7 @@ sub change_patchmetadata_table
my $descriptionvalue = "";
my $base = $allvariables->{'PRODUCTNAME'} . " " . $allvariables->{'PRODUCTVERSION'};
if ( $installer::globals::languagepack ) { $base = $targetproductnamevalue; }
if ( $installer::globals::languagepack || $installer::globals::helppack ) { $base = $targetproductnamevalue; }
my $windowspatchlevel = 0;
if ( $allvariables->{'WINDOWSPATCHLEVEL'} ) { $windowspatchlevel = $allvariables->{'WINDOWSPATCHLEVEL'}; }
@ -984,6 +984,7 @@ sub correct_patch
my $localproduct = $installer::globals::product;
if ( $installer::globals::languagepack ) { $localproduct = $localproduct . "LanguagePack"; }
elsif ( $installer::globals::helppack ) { $localproduct = $localproduct . "HelpPack"; }
if ( $product eq $localproduct ) { $product_is_good = 1; }
@ -1207,6 +1208,7 @@ sub create_msp_patch
my $pcpfilename = $allvariables->{'PCPFILENAME'};
if ( $installer::globals::languagepack ) { $pcpfilename =~ s/.pcp\s*$/languagepack.pcp/; }
elsif ( $installer::globals::helppack ) { $pcpfilename =~ s/.pcp\s*$/helppack.pcp/; }
# Searching the pcp file in the include pathes
my $fullpcpfilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$pcpfilename, $includepatharrayref, 1);
@ -1255,7 +1257,7 @@ sub create_msp_patch
installer::systemactions::copy_complete_directory($oldinstallationsetpath, $mspdir);
# Copying additional patches into the installation set, if required
if (( $allvariables->{'ADDITIONALREQUIREDPATCHES'} ) && ( $allvariables->{'ADDITIONALREQUIREDPATCHES'} ne "" ) && ( ! $installer::globals::languagepack ))
if (( $allvariables->{'ADDITIONALREQUIREDPATCHES'} ) && ( $allvariables->{'ADDITIONALREQUIREDPATCHES'} ne "" ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack ))
{
my $filename = $allvariables->{'ADDITIONALREQUIREDPATCHES'};

11
solenv/bin/modules/installer/windows/property.pm
View file

@ -54,6 +54,7 @@ sub get_arpcomments_for_property_table
}
if ( $installer::globals::languagepack ) { $comment = $comment . " " . "Language Pack"; }
elsif ( $installer::globals::helppack ) { $comment = $comment . " " . "Help Pack"; }
if ( $installer::globals::patch )
{
@ -183,6 +184,11 @@ sub get_productname_for_property_table($$)
my $langstring = get_english_language_string(); # Example: (English, German)
$productname = $name . " " . $version . " Language Pack" . " " . $langstring;
}
elsif ( $installer::globals::helppack )
{
my $langstring = get_english_language_string(); # New: (English, German)
$productname = $name . " " . $version . " Help Pack" . " " . $langstring;
}
if ( $installer::globals::patch )
{
@ -364,6 +370,11 @@ sub set_important_properties
my $onepropertyline = "ISLANGUAGEPACK" . "\t" . "1" . "\n";
push(@{$propertyfile}, $onepropertyline);
}
elsif ( $installer::globals::helppack )
{
my $onepropertyline = "ISHELPPACK" . "\t" . "1" . "\n";
push(@{$propertyfile}, $onepropertyline);
}
my $languagesline = "PRODUCTALLLANGUAGES" . "\t" . $$languagestringref . "\n";
push(@{$propertyfile}, $languagesline);

1
solenv/bin/modules/installer/windows/registry.pm
View file

@ -93,6 +93,7 @@ sub get_registry_component_name
$componentname = $componentname . $addon;
if (( $styles =~ /\bLANGUAGEPACK\b/ ) && ( $installer::globals::languagepack )) { $componentname = $componentname . "_lang"; }
elsif (( $styles =~ /\bHELPPACK\b/ ) && ( $installer::globals::helppack )) { $componentname = $componentname . "_help"; }
if ( $styles =~ /\bALWAYS_REQUIRED\b/ ) { $componentname = $componentname . "_forced"; }
if ( $isrootmodule ) { $installer::globals::registryrootcomponent = $componentname; }

1
solenv/bin/modules/installer/windows/update.pm
View file

@ -215,6 +215,7 @@ sub correct_database
my $localproduct = $installer::globals::product;
if ( $installer::globals::languagepack ) { $localproduct = $localproduct . "LanguagePack"; }
elsif ( $installer::globals::helppack ) { $localproduct = $localproduct . "HelpPack"; }
if ( $product eq $localproduct ) { $product_is_good = 1; }

2
solenv/bin/modules/installer/windows/upgrade.pm
View file

@ -94,7 +94,7 @@ sub create_upgrade_table
# also searching for the beta
if (( $allvariableshashref->{'BETAUPGRADECODE'} ) && ( ! $installer::globals::languagepack ))
if (( $allvariableshashref->{'BETAUPGRADECODE'} ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack ))
{
$newline = $allvariableshashref->{'BETAUPGRADECODE'} . "\t" . "1.0" . "\t" . "\t" . "\t" . "1" . "\t" . "\t" . "BETAPRODUCTS" . "\n";
push(@upgradetable, $newline);

5
solenv/bin/modules/installer/worker.pm
View file

@ -822,7 +822,7 @@ sub install_simple ($$$$$$)
{
my $filelist;
my $fname = $installer::globals::destdir . "/$packagename";
if ($installer::globals::languagepack) { $fname .= ".$languagestring"; }
if ($installer::globals::languagepack || $installer::globals::helppack) { $fname .= ".$languagestring"; }
open ($filelist, ">$fname") || die "Can't open $fname: $!";
print $filelist @lines;
close ($filelist);
@ -3137,7 +3137,8 @@ sub put_license_into_setup
# find and read english license file
my $licenselanguage = "en-US"; # always english !
my $licensefilename = "license_" . $licenselanguage . ".txt";
# my $licensefilename = "LICENSE"; # _" . $licenselanguage;
my $licensefilename = "license"; # . $licenselanguage . ".txt";
my $licenseincludepatharrayref = get_language_specific_include_pathes($includepatharrayref, $licenselanguage);
my $licenseref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, $licenseincludepatharrayref, 0);

1
solenv/bin/modules/installer/ziplist.pm
View file

@ -792,6 +792,7 @@ sub add_variables_to_allvariableshashref
if ( $installer::globals::patch ) { $variableshashref->{'PRODUCTADDON'} = $installer::globals::patchaddon; }
elsif ( $installer::globals::languagepack ) { $variableshashref->{'PRODUCTADDON'} = $installer::globals::languagepackaddon; }
elsif ( $installer::globals::helppack ) { $variableshashref->{'PRODUCTADDON'} = $installer::globals::helppackpackaddon; }
else { $variableshashref->{'PRODUCTADDON'} = ""; }
my $localbuild = $installer::globals::build;

6
solenv/inc/minor.mk
View file

@ -1,5 +1,5 @@
RSCVERSION=330
RSCREVISION=330m17(Build:1)
BUILD=1
LAST_MINOR=m17
RSCREVISION=330m18(Build:4)
BUILD=4
LAST_MINOR=m18
SOURCEVERSION=OOO330

2
solenv/inc/productversion.mk
View file

@ -25,7 +25,7 @@
#
#*************************************************************************
PRODUCTLIST = libreoffice broffice.org
PRODUCTLIST = libreoffice broffice
# default values to minimize maintainance effort
PRODUCTVERSION = 3.3