Author: af
Date: Mon Dec 16 16:14:34 2013
New Revision: 1551249
URL: http://svn.apache.org/r1551249
Log:
123531: Copy all binary files that are required for language packs. Cleanup.
Modified:
openoffice/trunk/main/instsetoo_native/util/makefile.mk
openoffice/trunk/main/solenv/bin/make_installer.pl
openoffice/trunk/main/solenv/bin/modules/installer/windows/binary.pm
openoffice/trunk/main/solenv/bin/modules/installer/windows/idtglobal.pm
Modified: openoffice/trunk/main/instsetoo_native/util/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/util/makefile.mk?rev=1551249&r1=1551248&r2=1551249&view=diff
==============================================================================
--- openoffice/trunk/main/instsetoo_native/util/makefile.mk (original)
+++ openoffice/trunk/main/instsetoo_native/util/makefile.mk Mon Dec 16 16:14:34
2013
@@ -443,7 +443,23 @@ MSI_LANGPACK_TEMPLATE_FILES= \
components.txt \
ooo_patchcodes.txt \
ooodev_patchcodes.txt \
- Binary/Banner.bmp
+ Binary/Banner.bmp \
+ Binary/Image.bmp \
+ Binary/caution.ico \
+ Binary/dontinstall.ico \
+ Binary/install.ico \
+ Binary/installfirstuse.ico \
+ Binary/installpartial.ico \
+ Binary/installstatemenu.ico \
+ Binary/networkinstall.ico \
+ Binary/newfolder.ico \
+ Binary/openfolder.ico \
+ Binary/setup.ico \
+ Binary/setupcomplete.ico \
+ Binary/setuppartial.ico \
+ Binary/setuprepair.ico \
+ Binary/trashcan.ico \
+ Binary/up.ico
MSI_SDK_TEMPLATE_FILES= \
ActionTe.idt \
Modified: openoffice/trunk/main/solenv/bin/make_installer.pl
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/make_installer.pl?rev=1551249&r1=1551248&r2=1551249&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/make_installer.pl (original)
+++ openoffice/trunk/main/solenv/bin/make_installer.pl Mon Dec 16 16:14:34 2013
@@ -213,11 +213,15 @@ sub MakeWindowsBuild ($$$$$$$$$$$$$$$$$$
installer::systemactions::create_directory($newidtdir);
# Collecting all files with flag "BINARYTABLE"
- my $binarytablefiles =
installer::worker::collect_all_items_with_special_flag($filesinproductlanguageresolvedarrayref
,"BINARYTABLE");
+ my $binarytablefiles =
installer::worker::collect_all_items_with_special_flag(
+ $filesinproductlanguageresolvedarrayref,
+ "BINARYTABLE");
# Removing all files with flag "BINARYTABLE_ONLY"
@installer::globals::binarytableonlyfiles = ();
- $filesinproductlanguageresolvedarrayref =
installer::worker::remove_all_items_with_special_flag($filesinproductlanguageresolvedarrayref
,"BINARYTABLE_ONLY");
+ $filesinproductlanguageresolvedarrayref =
installer::worker::remove_all_items_with_special_flag(
+ $filesinproductlanguageresolvedarrayref,
+ "BINARYTABLE_ONLY");
# Collecting all profileitems with flag "INIFILETABLE" for table "IniFile"
my $inifiletableentries =
installer::worker::collect_all_items_with_special_flag($profileitemsinproductlanguageresolvedarrayref
,"INIFILETABLE");
@@ -400,7 +404,14 @@ sub MakeWindowsBuild ($$$$$$$$$$$$$$$$$$
installer::logger::include_header_into_logfile("Copying idt files to
$languageidtdir:");
-
installer::windows::idtglobal::prepare_language_idt_directory($languageidtdir,
$newidtdir, $onelanguage, $filesinproductlanguageresolvedarrayref,
\@iconfilecollector, $binarytablefiles, $allvariableshashref);
+ installer::windows::idtglobal::prepare_language_idt_directory(
+ $languageidtdir,
+ $newidtdir,
+ $onelanguage,
+ $filesinproductlanguageresolvedarrayref,
+ \@iconfilecollector,
+ $binarytablefiles,
+ $allvariableshashref);
if (( ! $installer::globals::languagepack ) && ( !
$allvariableshashref->{'NOLANGUAGESELECTIONPRODUCT'} ))
{
@@ -513,7 +524,10 @@ sub MakeWindowsBuild ($$$$$$$$$$$$$$$$$$
installer::windows::property::update_checkbox_table($languageidtdir,
$allvariableshashref);
# adding the files from the binary directory into the binary table
- installer::windows::binary::update_binary_table($languageidtdir,
$filesinproductlanguageresolvedarrayref, $binarytablefiles);
+ installer::windows::binary::update_binary_table(
+ $languageidtdir,
+ $filesinproductlanguageresolvedarrayref,
+ $binarytablefiles);
# setting patch codes to detect installed products
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/binary.pm
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/binary.pm?rev=1551249&r1=1551248&r2=1551249&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/binary.pm
(original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/binary.pm Mon
Dec 16 16:14:34 2013
@@ -19,14 +19,14 @@
#
#**************************************************************
-
-
package installer::windows::binary;
use installer::existence;
use installer::files;
use installer::globals;
+use strict;
+
###########################################################################################################
# Updating the table Binary dynamically with all files from $binarytablefiles
# Content:
@@ -45,22 +45,15 @@ sub update_binary_table
# Only the iconfiles, that are used in the shortcut table for the
# FolderItems (entries in Windows startmenu) are added into the icon
table.
- for ( my $i = 0; $i <= $#{$binarytablefiles}; $i++ )
+ foreach my $binaryfile (@$binarytablefiles)
{
- my $binaryfile = ${$binarytablefiles}[$i];
my $binaryfilename = $binaryfile->{'Name'};
my $binaryfiledata = $binaryfilename;
-
- $binaryfilename =~ s/\.//g; # removing "." in filename:
"abc.dll" to "abcdll" in name column
-
- my %binary = ();
-
- $binary{'Name'} = $binaryfilename;
- $binary{'Data'} = $binaryfiledata;
- my $oneline = $binary{'Name'} . "\t" . $binary{'Data'} . "\n";
-
- push(@{$binaryidttable}, $oneline);
+ # removing "." in filename: "abc.dll" to "abcdll" in name column
+ $binaryfilename =~ s/\.//g;
+
+ push @$binaryidttable, $binaryfilename . "\t" . $binaryfiledata
. "\n";
}
# Saving the file
Modified:
openoffice/trunk/main/solenv/bin/modules/installer/windows/idtglobal.pm
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/idtglobal.pm?rev=1551249&r1=1551248&r2=1551249&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/idtglobal.pm
(original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/idtglobal.pm Mon
Dec 16 16:14:34 2013
@@ -779,7 +779,7 @@ sub translate_idtfile
# into one language specific directory
##############################################################
-sub prepare_language_idt_directory
+sub prepare_language_idt_directory ($$$$$$$)
{
my ($destinationdir, $newidtdir, $onelanguage, $filesref,
$iconfilecollector, $binarytablefiles, $allvariables) = @_;
@@ -794,13 +794,21 @@ sub prepare_language_idt_directory
if ( -d $installer::globals::idttemplatepath .
$installer::globals::separator . "Binary")
{
installer::systemactions::create_directory($destinationdir .
$installer::globals::separator . "Binary");
-
installer::systemactions::copy_directory($installer::globals::idttemplatepath .
$installer::globals::separator . "Binary", $destinationdir .
$installer::globals::separator . "Binary");
+ installer::systemactions::copy_directory(
+ $installer::globals::idttemplatepath .
$installer::globals::separator . "Binary",
+ $destinationdir . $installer::globals::separator . "Binary");
if ((( $installer::globals::patch ) && (
$allvariables->{'WINDOWSPATCHBITMAPDIRECTORY'} )) || (
$allvariables->{'WINDOWSBITMAPDIRECTORY'} ))
{
my $bitmapdir = "";
- if ( $allvariables->{'WINDOWSPATCHBITMAPDIRECTORY'} ) {
$bitmapdir = $allvariables->{'WINDOWSPATCHBITMAPDIRECTORY'}; }
- if ( $allvariables->{'WINDOWSBITMAPDIRECTORY'} ) {
$bitmapdir = $allvariables->{'WINDOWSBITMAPDIRECTORY'}; }
+ if ( $allvariables->{'WINDOWSPATCHBITMAPDIRECTORY'} )
+ {
+ $bitmapdir = $allvariables->{'WINDOWSPATCHBITMAPDIRECTORY'};
+ }
+ if ( $allvariables->{'WINDOWSBITMAPDIRECTORY'} )
+ {
+ $bitmapdir = $allvariables->{'WINDOWSBITMAPDIRECTORY'};
+ }
my $newsourcedir = $installer::globals::unpackpath .
$installer::globals::separator . $bitmapdir; # path setting in list file
dependent from unpackpath !?
$installer::logger::Lang->printf("\n");
@@ -812,9 +820,13 @@ sub prepare_language_idt_directory
if ( ! -d $newsourcedir )
{
my $currentdir = cwd();
- installer::exiter::exit_program("ERROR:
Directory $newsourcedir does not exist! Current directory is: $currentdir",
"prepare_language_idt_directory");
+ installer::exiter::exit_program(
+ "ERROR: Directory $newsourcedir does not exist! Current
directory is: $currentdir",
+ "prepare_language_idt_directory");
}
- installer::systemactions::copy_directory($newsourcedir,
$destinationdir . $installer::globals::separator . "Binary");
+ installer::systemactions::copy_directory(
+ $newsourcedir,
+ $destinationdir . $installer::globals::separator . "Binary");
}
}
@@ -822,7 +834,9 @@ sub prepare_language_idt_directory
if ( -d $installer::globals::idttemplatepath .
$installer::globals::separator . "Icon")
{
-
installer::systemactions::copy_directory($installer::globals::idttemplatepath .
$installer::globals::separator . "Icon", $destinationdir .
$installer::globals::separator . "Icon");
+ installer::systemactions::copy_directory(
+ $installer::globals::idttemplatepath .
$installer::globals::separator . "Icon",
+ $destinationdir . $installer::globals::separator . "Icon");
}
# Copying all files in $iconfilecollector, that describe icons of
folderitems
@@ -831,18 +845,24 @@ sub prepare_language_idt_directory
{
my $iconfilename = ${$iconfilecollector}[$i];
installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$iconfilename);
-
installer::systemactions::copy_one_file(${$iconfilecollector}[$i],
$destinationdir . $installer::globals::separator . "Icon" .
$installer::globals::separator . $iconfilename);
+ installer::systemactions::copy_one_file(
+ ${$iconfilecollector}[$i],
+ $destinationdir . $installer::globals::separator . "Icon" .
$installer::globals::separator . $iconfilename);
}
# Copying all files in $binarytablefiles in the binary directory
- for ( my $i = 0; $i <= $#{$binarytablefiles}; $i++ )
+ foreach my $binaryfile (@$binarytablefiles)
{
- my $binaryfile = ${$binarytablefiles}[$i];
my $binaryfilepath = $binaryfile->{'sourcepath'};
my $binaryfilename = $binaryfilepath;
+ $installer::logger::Lang->printf("copying binary file %s to %s\n",
+ $binaryfilepath,
+ $binaryfilename);
installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$binaryfilename);
- installer::systemactions::copy_one_file($binaryfilepath,
$destinationdir . $installer::globals::separator . "Binary" .
$installer::globals::separator . $binaryfilename);
+ installer::systemactions::copy_one_file(
+ $binaryfilepath,
+ $destinationdir . $installer::globals::separator . "Binary" .
$installer::globals::separator . $binaryfilename);
}
# Copying all new created and language independent idt-files to the
destination $destinationdir.
