[Libreoffice-commits] .: 3 commits - instsetoo_native/inc_ooohelppack instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/inc_ure solenv/bin
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Sep 8 11:41:59 PDT 2012
instsetoo_native/inc_ooohelppack/windows/msi_templates/ActionTe.idt | 2
instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt | 2
instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt | 2
instsetoo_native/inc_ooolangpack/windows/msi_templates/ActionTe.idt | 2
instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt | 2
instsetoo_native/inc_ooolangpack/windows/msi_templates/_Validat.idt | 2
instsetoo_native/inc_openoffice/windows/msi_languages/ActionTe.ulf | 12
instsetoo_native/inc_openoffice/windows/msi_templates/ActionTe.idt | 2
instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt | 2
instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt | 2
instsetoo_native/inc_sdkoo/windows/msi_templates/ActionTe.idt | 2
instsetoo_native/inc_sdkoo/windows/msi_templates/InstallE.idt | 2
instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt | 2
instsetoo_native/inc_ure/windows/msi_templates/ActionTe.idt | 2
instsetoo_native/inc_ure/windows/msi_templates/InstallE.idt | 2
instsetoo_native/inc_ure/windows/msi_templates/_Validat.idt | 2
solenv/bin/modules/installer.pm | 13
solenv/bin/modules/installer/windows/idtglobal.pm | 63 -
solenv/bin/modules/installer/windows/selfreg.pm | 79 --
solenv/bin/modules/installer/worker.pm | 360 ----------
20 files changed, 557 deletions(-)
New commits:
commit d2405b54adbfa1ebdefa3b3c6f31c7f298e71cf6
Author: Andras Timar <atimar at suse.com>
Date: Sat Sep 8 20:42:59 2012 +0200
installer: remove unused code
Change-Id: I8f0229b8dd0a135f525076e98996d44be2018050
diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm
index 9bfe9c2..da70c11 100644
--- a/solenv/bin/modules/installer/windows/idtglobal.pm
+++ b/solenv/bin/modules/installer/windows/idtglobal.pm
@@ -1261,59 +1261,6 @@ sub get_free_number_in_uisequence_table
return $newnumber;
}
-##################################################################
-# Searching for a specified string in the feature table
-##################################################################
-
-sub get_feature_name
-{
- my ( $string, $featuretable ) = @_;
-
- my $featurename = "";
-
- for ( my $i = 0; $i <= $#{$featuretable}; $i++ )
- {
- if ( ${$featuretable}[$i] =~ /^\s*(\w+$string)\t/ )
- {
- $featurename = $1;
- last;
- }
- }
-
- return $featurename;
-}
-
-######################################################################
-# Returning the toplevel directory name of one specific file
-######################################################################
-
-sub get_directory_name_from_file
-{
- my ($onefile) = @_;
-
- my $destination = $onefile->{'destination'};
- my $name = $onefile->{'Name'};
-
- $destination =~ s/\Q$name\E\s*$//;
- $destination =~ s/\Q$installer::globals::separator\E\s*$//;
-
- my $path = "";
-
- if ( $destination =~ /\Q$installer::globals::separator\E/ )
- {
- if ( $destination =~ /^\s*(\S.*\S\Q$installer::globals::separator\E)(\S.+\S?)/ )
- {
- $path = $2;
- }
- }
- else
- {
- $path = $destination;
- }
-
- return $path;
-}
-
#############################################################
# Including the new subdir into the directory table
#############################################################
commit e520fa15a5dd1dbee6fd293dc334e90d3244084f
Author: Andras Timar <atimar at suse.com>
Date: Sat Sep 8 20:33:22 2012 +0200
installer does not produce .inf files, corresponding code can go
Change-Id: I98c134457d113dfbb83074fc7ee48cbf952b17b3
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index e1209ca..c78225e 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -972,16 +972,6 @@ sub main {
installer::worker::collect_scpactions($scpactionsinproductlanguageresolvedarrayref);
- #########################################################
- # creating inf files for user system integration
- #########################################################
-
- if (( $installer::globals::iswindowsbuild ) && ( ! $installer::globals::patch )) # Windows specific items: Folder, FolderItem, RegistryItem
- {
- installer::logger::print_message( "... creating inf files ...\n" );
- installer::worker::create_inf_file($filesinproductlanguageresolvedarrayref, $registryitemsinproductlanguageresolvedarrayref, $folderinproductlanguageresolvedarrayref, $folderitemsinproductlanguageresolvedarrayref, $modulesinproductlanguageresolvedarrayref, $languagesarrayref, $languagestringref, $allvariableshashref);
- }
-
###########################################################
# Simple package projects can now start to create the
# installation structure by creating Directories, Files
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
index 933b0b7..e954971 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -288,32 +288,6 @@ sub get_language_specific_include_paths
}
##############################################################
-# Returning the first item with a defined flag
-##############################################################
-
-sub return_first_item_with_special_flag
-{
- my ($itemsref, $flag) = @_;
-
- my $firstitem = "";
-
- for ( my $i = 0; $i <= $#{$itemsref}; $i++ )
- {
- my $oneitem = ${$itemsref}[$i];
- my $styles = "";
- if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'} };
-
- if ( $styles =~ /\b$flag\b/ )
- {
- $firstitem = $oneitem;
- last;
- }
- }
-
- return $firstitem;
-}
-
-##############################################################
# Collecting all items with a defined flag
##############################################################
@@ -515,340 +489,6 @@ sub install_simple ($$$$$$)
}
###########################################################
-# Adding shellnew files into files collector for
-# user installation
-###########################################################
-
-sub add_shellnewfile_into_filesarray
-{
- my ($filesref, $onefile, $inffile) = @_;
-
- my %shellnewfile = ();
- my $shellnewfileref = \%shellnewfile;
-
- installer::converter::copy_item_object($inffile, $shellnewfileref);
-
- $shellnewfileref->{'Name'} = $onefile->{'Name'};
- $shellnewfileref->{'sourcepath'} = $onefile->{'sourcepath'};
- $shellnewfileref->{'gid'} = $onefile->{'gid'} . "_Userinstall";
-
- # the destination has to be adapted
- my $destination = $inffile->{'destination'};
- installer::pathanalyzer::get_path_from_fullqualifiedname(\$destination);
- $destination = $destination . $onefile->{'Name'};
- $shellnewfileref->{'destination'} = $destination;
-
- # add language specific inffile into filesarray
- push(@{$filesref}, $shellnewfileref);
-}
-
-###########################################################
-# Replacing one placehoder in template file
-###########################################################
-
-sub replace_in_template_file
-{
- my ($templatefile, $placeholder, $newstring) = @_;
-
- for ( my $i = 0; $i <= $#{$templatefile}; $i++ )
- {
- ${$templatefile}[$i] =~ s/\Q$placeholder\E/$newstring/g;
- }
-}
-
-###########################################################
-# Replacing one placehoder with an array in template file
-###########################################################
-
-sub replace_array_in_template_file
-{
- my ($templatefile, $placeholder, $arrayref) = @_;
-
- for ( my $i = 0; $i <= $#{$templatefile}; $i++ )
- {
- if ( ${$templatefile}[$i] =~ /\Q$placeholder\E/ )
- {
- my @return = splice(@{$templatefile}, $i, 1, @{$arrayref});
- }
- }
-}
-
-###########################################################
-# Collecting all modules from registry items
-###########################################################
-
-sub collect_all_modules
-{
- my ($registryitemsref) = @_;
-
- my @allmodules = ();
-
- for ( my $i = 0; $i <= $#{$registryitemsref}; $i++ )
- {
- $registryitem = ${$registryitemsref}[$i];
- my $module = $registryitem->{'ModuleID'};
-
- if ( ! grep {$_ eq $module} @allmodules )
- {
- push(@allmodules, $module);
- }
- }
-
- return \@allmodules;
-}
-
-###########################################################
-# Changing the content of the inf file
-###########################################################
-
-sub write_content_into_inf_file
-{
- my ($templatefile, $filesref, $registryitemsref, $folderref, $folderitemsref, $modulesref, $onelanguage, $inffile, $firstlanguage, $allvariableshashref) = @_;
-
- # First part: Shellnew files
- # SHELLNEWFILESPLACEHOLDER
-
- my $rootmodule = 0;
- # inf files can be assigned to "gid_Module_Root_Files_2"
- if ( $inffile->{'modules'} =~ /Module_Root/i ) { $rootmodule = 1; }
-
- if ( $rootmodule )
- {
- my $shellnewstring = "";
-
- for ( my $i = 0; $i <= $#{$filesref}; $i++ )
- {
- my $onefile = ${$filesref}[$i];
- my $directory = $onefile->{'Dir'};
-
- if ( $directory =~ /\bPREDEFINED_OSSHELLNEWDIR\b/ )
- {
- $shellnewstring = $shellnewstring . $onefile->{'Name'} . "\n";
- if (( $firstlanguage ) && ( ! $installer::globals::shellnewfilesadded )) { add_shellnewfile_into_filesarray($filesref, $onefile, $inffile); }
- }
- }
-
- $shellnewstring =~ s/\s*$//;
- replace_in_template_file($templatefile, "SHELLNEWFILESPLACEHOLDER", $shellnewstring);
-
- $installer::globals::shellnewfilesadded = 1;
- }
-
- # Second part: Start menu entries
-
- # The OfficeMenuFolder is defined as: $productname . " " . $productversion;
-
- my $productname = $allvariableshashref->{'PRODUCTNAME'};
- my $productversion = $allvariableshashref->{'PRODUCTVERSION'};
- my $productkey = $productname . " " . $productversion;
-
- replace_in_template_file($templatefile, "OFFICEFOLDERPLACEHOLDER", $productkey);
-
- # Setting name target and infotip for all applications
-
- for ( my $i = 0; $i <= $#{$folderitemsref}; $i++ )
- {
- my $folderitem = ${$folderitemsref}[$i];
-
- my $styles = "";
- if ( $folderitem->{'Styles'} ) { $styles = $folderitem->{'Styles'}; }
- if ( $styles =~ /\bNON_ADVERTISED\b/ ) { next; } # no entry for non-advertised shortcuts
-
- if (( ! $folderitem->{'ismultilingual'} ) || (( $folderitem->{'ismultilingual'} ) && ( $folderitem->{'specificlanguage'} eq $onelanguage )))
- {
- my $gid = $folderitem->{'gid'};
- my $app = $gid;
- $app =~ s/gid_Folderitem_//;
- $app = uc($app);
-
- my $name = $folderitem->{'Name'};
- my $placeholder = "PLACEHOLDER_FOLDERITEM_NAME_" . $app;
- replace_in_template_file($templatefile, $placeholder, $name);
-
- my $tooltip = $folderitem->{'Tooltip'};
- $placeholder = "PLACEHOLDER_FOLDERITEM_TOOLTIP_" . $app;
- replace_in_template_file($templatefile, $placeholder, $tooltip);
-
- my $executablegid = $folderitem->{'FileID'};
- my ($exefile) = grep {$_->{gid} eq $executablegid} @{$filesref};
- if (! defined $exefile) {
- installer::exiter::exit_program("ERROR: Could not find file $executablegid in list of files!", "write_content_into_inf_file");
- }
-
- my $exefilename = $exefile->{'Name'};
- $placeholder = "PLACEHOLDER_FOLDERITEM_TARGET_" . $app;
- replace_in_template_file($templatefile, $placeholder, $exefilename);
- }
- }
-
- # Third part: Windows registry entries
-
- # collecting all modules
-
- my $allmodules = collect_all_modules($registryitemsref);
-
- my @registryitems = ();
- my $allsectionsstring = "";
-
- for ( my $j = 0; $j <= $#{$allmodules}; $j++ )
- {
- my $moduleid = ${$allmodules}[$j];
-
- my $inffilemodule = $inffile->{'modules'};
- # inf files can be assigned to "gid_Module_Root_Files_2", but RegistryItems to "gid_Module_Root"
- if ( $inffilemodule =~ /Module_Root/i ) { $inffilemodule = $installer::globals::rootmodulegid; }
-
- if ( ! ( $moduleid eq $inffilemodule )) { next; }
-
- my $shortmodulename = $moduleid;
- $shortmodulename =~ s/gid_Module_//;
- my $sectionname = "InstRegKeys." . $shortmodulename;
- $allsectionsstring = $allsectionsstring . $sectionname . ",";
- my $sectionheader = "\[" . $sectionname . "\]" . "\n";
- push(@registryitems, $sectionheader);
-
- for ( my $i = 0; $i <= $#{$registryitemsref}; $i++ )
- {
- my $registryitem = ${$registryitemsref}[$i];
-
- if ( ! ( $registryitem->{'ModuleID'} eq $moduleid )) { next; }
-
- if (( ! $registryitem->{'ismultilingual'} ) || (( $registryitem->{'ismultilingual'} ) && ( $registryitem->{'specificlanguage'} eq $onelanguage )))
- {
- # Syntax: HKCR,".bau",,,"soffice.StarConfigFile.6"
-
- my $regroot = "";
- my $parentid = "";
- if ( $registryitem->{'ParentID'} ) { $parentid = $registryitem->{'ParentID'}; }
- if ( $parentid eq "PREDEFINED_HKEY_CLASSES_ROOT" ) { $regroot = "HKCR"; }
- if ( $parentid eq "PREDEFINED_HKEY_LOCAL_MACHINE" ) { $regroot = "HKCU"; }
-
- my $subkey = "";
- if ( $registryitem->{'Subkey'} ) { $subkey = $registryitem->{'Subkey'}; }
- if ( $subkey ne "" ) { $subkey = "\"" . $subkey . "\""; }
-
- my $valueentryname = "";
- if ( $registryitem->{'Name'} ) { $valueentryname = $registryitem->{'Name'}; }
- if ( $valueentryname ne "" ) { $valueentryname = "\"" . $valueentryname . "\""; }
-
- my $flag = "";
-
- my $value = "";
- if ( $registryitem->{'Value'} ) { $value = $registryitem->{'Value'}; }
- if ( $value =~ /\<progpath\>/ ) { $value =~ s/\\\"/\"\"/g; } # Quoting for INF is done by double ""
- $value =~ s/\\\"/\"/g; # no more masquerading of '"'
- $value =~ s/\<progpath\>/\%INSTALLLOCATION\%/g;
- if ( $value ne "" ) { $value = "\"" . $value . "\""; }
-
- my $oneline = $regroot . "," . $subkey . "," . $valueentryname . "," . $flag . "," . $value . "\n";
-
- push(@registryitems, $oneline);
- }
- }
-
- push(@registryitems, "\n"); # empty line after each section
- }
-
- # replacing the $allsectionsstring
- $allsectionsstring =~ s/\,\s*$//;
- replace_in_template_file($templatefile, "ALLREGISTRYSECTIONSPLACEHOLDER", $allsectionsstring);
-
- # replacing the placeholder for all registry keys
- replace_array_in_template_file($templatefile, "REGISTRYKEYSPLACEHOLDER", \@registryitems);
-
-}
-
-###########################################################
-# Creating inf files for local user system integration
-###########################################################
-
-sub create_inf_file
-{
- my ($filesref, $registryitemsref, $folderref, $folderitemsref, $modulesref, $languagesarrayref, $languagestringref, $allvariableshashref) = @_;
-
- # collecting all files with flag INFFILE
-
- my $inf_files = collect_all_items_with_special_flag($filesref ,"INFFILE");
-
- if ( $#{$inf_files} > -1 )
- {
- # create new language specific inffile
- installer::logger::include_header_into_logfile("Creating inf files:");
-
- my $infdirname = "inffiles";
- my $infdir = installer::systemactions::create_directories($infdirname, $languagestringref);
-
- my $infoline = "Number of inf files: $#{$inf_files} + 1 \n";
- push( @installer::globals::logfileinfo, $infoline);
-
- # there are inffiles for all modules
-
- for ( my $i = 0; $i <= $#{$inf_files}; $i++ )
- {
- my $inffile = ${$inf_files}[$i];
- my $inf_file_name = $inffile->{'Name'};
-
- my $templatefilename = $inffile->{'sourcepath'};
-
- if ( ! -f $templatefilename ) { installer::exiter::exit_program("ERROR: Could not find file $templatefilename !", "create_inf_file"); }
-
- # iterating over all languages
-
- for ( my $j = 0; $j <= $#{$languagesarrayref}; $j++ ) # iterating over all languages
- {
- my $firstlanguage = 0;
- if ( $j == 0 ) { $firstlanguage = 1; }
-
- my $onelanguage = ${$languagesarrayref}[$j];
-
- $infoline = "Templatefile: $inf_file_name, Language: $onelanguage \n";
- push( @installer::globals::logfileinfo, $infoline);
-
- my $templatefile = installer::files::read_file($templatefilename);
-
- my $linesbefore = $#{$templatefile};
-
- write_content_into_inf_file($templatefile, $filesref, $registryitemsref, $folderref, $folderitemsref, $modulesref, $onelanguage, $inffile, $firstlanguage, $allvariableshashref);
-
- $infoline = "Lines change: From $linesbefore to $#{$templatefile}.\n";
- push( @installer::globals::logfileinfo, $infoline);
-
- # rename language specific inffile
- my $language_inf_file_name = $inf_file_name;
- my $windowslanguage = installer::windows::language::get_windows_language($onelanguage);
- $language_inf_file_name =~ s/\.inf/_$windowslanguage\.inf/;
-
- my $sourcepath = $infdir . $installer::globals::separator . $language_inf_file_name;
- installer::files::save_file($sourcepath, $templatefile);
-
- $infoline = "Saving file: $sourcepath\n";
- push( @installer::globals::logfileinfo, $infoline);
-
- # creating new file object
-
- my %languageinffile = ();
- my $languageinifileref = \%languageinffile;
-
- if ( $j < $#{$languagesarrayref} ) { installer::converter::copy_item_object($inffile, $languageinifileref); }
- else { $languageinifileref = $inffile; }
-
- $languageinifileref->{'Name'} = $language_inf_file_name;
- $languageinifileref->{'sourcepath'} = $sourcepath;
- # destination and gid also have to be adapted
- $languageinifileref->{'gid'} = $languageinifileref->{'gid'} . "_" . $onelanguage;
- my $destination = $languageinifileref->{'destination'};
- installer::pathanalyzer::get_path_from_fullqualifiedname(\$destination);
- $destination = $destination . $language_inf_file_name;
- $languageinifileref->{'destination'} = $destination;
-
- # add language specific inffile into filesarray
- if ( $j < $#{$languagesarrayref} ) { push(@{$filesref}, $languageinifileref); }
- }
- }
- }
-}
-
-###########################################################
# Selecting patch items
###########################################################
commit 15a2c9adca6a0d5dd196e97312c664bc21ae1b6c
Author: Andras Timar <atimar at suse.com>
Date: Sat Sep 8 20:19:03 2012 +0200
remove SelfReg table from MSI
We did not use it, and it is not recommended to use it. See:
http://msdn.microsoft.com/en-us/library/windows/desktop/aa371608%28v=vs.85%29.aspx
Installation package authors are strongly advised against using self
registration.
Change-Id: I1dc9a5b66646c63d2ee9a672f045595e6bbb2f42
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ActionTe.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ActionTe.idt
index 7263a0a..ec6ecdd 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ActionTe.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ActionTe.idt
@@ -52,8 +52,6 @@ RemoveShortcuts OOO_ACTIONTEXT_82 OOO_ACTIONTEXT_83
RMCCPSearch OOO_ACTIONTEXT_84
Rollback OOO_ACTIONTEXT_85 OOO_ACTIONTEXT_86
RollbackCleanup OOO_ACTIONTEXT_87 OOO_ACTIONTEXT_88
-SelfRegModules OOO_ACTIONTEXT_89 OOO_ACTIONTEXT_90
-SelfUnregModules OOO_ACTIONTEXT_91 OOO_ACTIONTEXT_92
SetODBCFolders OOO_ACTIONTEXT_93
StartServices OOO_ACTIONTEXT_94 OOO_ACTIONTEXT_95
StopServices OOO_ACTIONTEXT_96 OOO_ACTIONTEXT_97
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt
index 7d22ecb..3d29abe 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt
@@ -52,8 +52,6 @@ RemoveShortcuts 1600
RMCCPSearch Not CCP_SUCCESS And CCP_TEST 250
SameProductFound SAMEPRODUCTS 120
ScheduleReboot ISSCHEDULEREBOOT 3125
-SelfRegModules 2850
-SelfUnregModules 1100
SetARPInstallLocation 990
SetODBCFolders 550
StartServices VersionNT 2800
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt
index 4098f92..0759d33 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt
@@ -387,8 +387,6 @@ ReserveCost ReserveFolder Y Identifier Name of a property whose value is as
ReserveCost ReserveKey N Identifier Primary key that uniquely identifies a particular ReserveCost record
ReserveCost ReserveLocal N 0 2147483647 Disk space to reserve if linked component is installed locally.
ReserveCost ReserveSource N 0 2147483647 Disk space to reserve if linked component is installed to run from the source location.
-SelfReg Cost Y 0 32767 The cost of registering the module.
-SelfReg File_ N File 1 Identifier Foreign key into the File table denoting the module that needs to be registered.
ServiceControl Arguments Y Formatted Arguments for the service. Separate by [~].
ServiceControl Component_ N Component 1 Identifier Required foreign key into the Component Table that controls the startup of the service
ServiceControl Event N 0 187 Bit field: Install: 0x1 = Start, 0x2 = Stop, 0x8 = Delete, Uninstall: 0x10 = Start, 0x20 = Stop, 0x80 = Delete
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ActionTe.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ActionTe.idt
index 7263a0a..ec6ecdd 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ActionTe.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ActionTe.idt
@@ -52,8 +52,6 @@ RemoveShortcuts OOO_ACTIONTEXT_82 OOO_ACTIONTEXT_83
RMCCPSearch OOO_ACTIONTEXT_84
Rollback OOO_ACTIONTEXT_85 OOO_ACTIONTEXT_86
RollbackCleanup OOO_ACTIONTEXT_87 OOO_ACTIONTEXT_88
-SelfRegModules OOO_ACTIONTEXT_89 OOO_ACTIONTEXT_90
-SelfUnregModules OOO_ACTIONTEXT_91 OOO_ACTIONTEXT_92
SetODBCFolders OOO_ACTIONTEXT_93
StartServices OOO_ACTIONTEXT_94 OOO_ACTIONTEXT_95
StopServices OOO_ACTIONTEXT_96 OOO_ACTIONTEXT_97
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt
index 7d22ecb..3d29abe 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt
@@ -52,8 +52,6 @@ RemoveShortcuts 1600
RMCCPSearch Not CCP_SUCCESS And CCP_TEST 250
SameProductFound SAMEPRODUCTS 120
ScheduleReboot ISSCHEDULEREBOOT 3125
-SelfRegModules 2850
-SelfUnregModules 1100
SetARPInstallLocation 990
SetODBCFolders 550
StartServices VersionNT 2800
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/_Validat.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/_Validat.idt
index 4098f92..0759d33 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/_Validat.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/_Validat.idt
@@ -387,8 +387,6 @@ ReserveCost ReserveFolder Y Identifier Name of a property whose value is as
ReserveCost ReserveKey N Identifier Primary key that uniquely identifies a particular ReserveCost record
ReserveCost ReserveLocal N 0 2147483647 Disk space to reserve if linked component is installed locally.
ReserveCost ReserveSource N 0 2147483647 Disk space to reserve if linked component is installed to run from the source location.
-SelfReg Cost Y 0 32767 The cost of registering the module.
-SelfReg File_ N File 1 Identifier Foreign key into the File table denoting the module that needs to be registered.
ServiceControl Arguments Y Formatted Arguments for the service. Separate by [~].
ServiceControl Component_ N Component 1 Identifier Required foreign key into the Component Table that controls the startup of the service
ServiceControl Event N 0 187 Bit field: Install: 0x1 = Start, 0x2 = Stop, 0x8 = Delete, Uninstall: 0x10 = Start, 0x20 = Stop, 0x80 = Delete
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/ActionTe.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/ActionTe.ulf
index a69af25..213f6df 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/ActionTe.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/ActionTe.ulf
@@ -280,18 +280,6 @@ en-US = "Removing backup files"
[OOO_ACTIONTEXT_88]
en-US = "File: [1]"
-[OOO_ACTIONTEXT_89]
-en-US = "Registering modules"
-
-[OOO_ACTIONTEXT_90]
-en-US = "File: [1], Folder: [2]"
-
-[OOO_ACTIONTEXT_91]
-en-US = "Unregistering modules"
-
-[OOO_ACTIONTEXT_92]
-en-US = "File: [1], Folder: [2]"
-
[OOO_ACTIONTEXT_93]
en-US = "Initializing ODBC directories"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ActionTe.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ActionTe.idt
index 7263a0a..ec6ecdd 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ActionTe.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ActionTe.idt
@@ -52,8 +52,6 @@ RemoveShortcuts OOO_ACTIONTEXT_82 OOO_ACTIONTEXT_83
RMCCPSearch OOO_ACTIONTEXT_84
Rollback OOO_ACTIONTEXT_85 OOO_ACTIONTEXT_86
RollbackCleanup OOO_ACTIONTEXT_87 OOO_ACTIONTEXT_88
-SelfRegModules OOO_ACTIONTEXT_89 OOO_ACTIONTEXT_90
-SelfUnregModules OOO_ACTIONTEXT_91 OOO_ACTIONTEXT_92
SetODBCFolders OOO_ACTIONTEXT_93
StartServices OOO_ACTIONTEXT_94 OOO_ACTIONTEXT_95
StopServices OOO_ACTIONTEXT_96 OOO_ACTIONTEXT_97
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
index 115ac87..3da59dc 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
@@ -53,8 +53,6 @@ RemoveShortcuts 1600
RMCCPSearch Not CCP_SUCCESS And CCP_TEST 250
SameProductFound SAMEPRODUCTS 120
ScheduleReboot ISSCHEDULEREBOOT 3125
-SelfRegModules 2850
-SelfUnregModules 1100
SetARPInstallLocation 990
SetODBCFolders 550
StartServices VersionNT 2800
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
index 4098f92..0759d33 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
@@ -387,8 +387,6 @@ ReserveCost ReserveFolder Y Identifier Name of a property whose value is as
ReserveCost ReserveKey N Identifier Primary key that uniquely identifies a particular ReserveCost record
ReserveCost ReserveLocal N 0 2147483647 Disk space to reserve if linked component is installed locally.
ReserveCost ReserveSource N 0 2147483647 Disk space to reserve if linked component is installed to run from the source location.
-SelfReg Cost Y 0 32767 The cost of registering the module.
-SelfReg File_ N File 1 Identifier Foreign key into the File table denoting the module that needs to be registered.
ServiceControl Arguments Y Formatted Arguments for the service. Separate by [~].
ServiceControl Component_ N Component 1 Identifier Required foreign key into the Component Table that controls the startup of the service
ServiceControl Event N 0 187 Bit field: Install: 0x1 = Start, 0x2 = Stop, 0x8 = Delete, Uninstall: 0x10 = Start, 0x20 = Stop, 0x80 = Delete
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/ActionTe.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/ActionTe.idt
index 7263a0a..ec6ecdd 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/ActionTe.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/ActionTe.idt
@@ -52,8 +52,6 @@ RemoveShortcuts OOO_ACTIONTEXT_82 OOO_ACTIONTEXT_83
RMCCPSearch OOO_ACTIONTEXT_84
Rollback OOO_ACTIONTEXT_85 OOO_ACTIONTEXT_86
RollbackCleanup OOO_ACTIONTEXT_87 OOO_ACTIONTEXT_88
-SelfRegModules OOO_ACTIONTEXT_89 OOO_ACTIONTEXT_90
-SelfUnregModules OOO_ACTIONTEXT_91 OOO_ACTIONTEXT_92
SetODBCFolders OOO_ACTIONTEXT_93
StartServices OOO_ACTIONTEXT_94 OOO_ACTIONTEXT_95
StopServices OOO_ACTIONTEXT_96 OOO_ACTIONTEXT_97
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/InstallE.idt
index 5cd178e..1b416c0 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/InstallE.idt
@@ -51,8 +51,6 @@ RemoveRegistryValues 1300
RemoveShortcuts 1600
RMCCPSearch Not CCP_SUCCESS And CCP_TEST 250
ScheduleReboot ISSCHEDULEREBOOT 3125
-SelfRegModules 2850
-SelfUnregModules 1100
SetARPInstallLocation 990
SetODBCFolders 550
StartServices VersionNT 2800
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt
index 4098f92..0759d33 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt
@@ -387,8 +387,6 @@ ReserveCost ReserveFolder Y Identifier Name of a property whose value is as
ReserveCost ReserveKey N Identifier Primary key that uniquely identifies a particular ReserveCost record
ReserveCost ReserveLocal N 0 2147483647 Disk space to reserve if linked component is installed locally.
ReserveCost ReserveSource N 0 2147483647 Disk space to reserve if linked component is installed to run from the source location.
-SelfReg Cost Y 0 32767 The cost of registering the module.
-SelfReg File_ N File 1 Identifier Foreign key into the File table denoting the module that needs to be registered.
ServiceControl Arguments Y Formatted Arguments for the service. Separate by [~].
ServiceControl Component_ N Component 1 Identifier Required foreign key into the Component Table that controls the startup of the service
ServiceControl Event N 0 187 Bit field: Install: 0x1 = Start, 0x2 = Stop, 0x8 = Delete, Uninstall: 0x10 = Start, 0x20 = Stop, 0x80 = Delete
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/ActionTe.idt b/instsetoo_native/inc_ure/windows/msi_templates/ActionTe.idt
index 7263a0a..ec6ecdd 100644
--- a/instsetoo_native/inc_ure/windows/msi_templates/ActionTe.idt
+++ b/instsetoo_native/inc_ure/windows/msi_templates/ActionTe.idt
@@ -52,8 +52,6 @@ RemoveShortcuts OOO_ACTIONTEXT_82 OOO_ACTIONTEXT_83
RMCCPSearch OOO_ACTIONTEXT_84
Rollback OOO_ACTIONTEXT_85 OOO_ACTIONTEXT_86
RollbackCleanup OOO_ACTIONTEXT_87 OOO_ACTIONTEXT_88
-SelfRegModules OOO_ACTIONTEXT_89 OOO_ACTIONTEXT_90
-SelfUnregModules OOO_ACTIONTEXT_91 OOO_ACTIONTEXT_92
SetODBCFolders OOO_ACTIONTEXT_93
StartServices OOO_ACTIONTEXT_94 OOO_ACTIONTEXT_95
StopServices OOO_ACTIONTEXT_96 OOO_ACTIONTEXT_97
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_ure/windows/msi_templates/InstallE.idt
index c1de8e4..36b781b 100644
--- a/instsetoo_native/inc_ure/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_ure/windows/msi_templates/InstallE.idt
@@ -53,8 +53,6 @@ RemoveShortcuts 1600
RMCCPSearch Not CCP_SUCCESS And CCP_TEST 250
SameProductFound SAMEPRODUCTS 120
ScheduleReboot ISSCHEDULEREBOOT 3125
-SelfRegModules 2850
-SelfUnregModules 1100
SetARPInstallLocation Not Installed 990
SetODBCFolders 550
StartServices VersionNT 2800
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/_Validat.idt b/instsetoo_native/inc_ure/windows/msi_templates/_Validat.idt
index 4098f92..0759d33 100644
--- a/instsetoo_native/inc_ure/windows/msi_templates/_Validat.idt
+++ b/instsetoo_native/inc_ure/windows/msi_templates/_Validat.idt
@@ -387,8 +387,6 @@ ReserveCost ReserveFolder Y Identifier Name of a property whose value is as
ReserveCost ReserveKey N Identifier Primary key that uniquely identifies a particular ReserveCost record
ReserveCost ReserveLocal N 0 2147483647 Disk space to reserve if linked component is installed locally.
ReserveCost ReserveSource N 0 2147483647 Disk space to reserve if linked component is installed to run from the source location.
-SelfReg Cost Y 0 32767 The cost of registering the module.
-SelfReg File_ N File 1 Identifier Foreign key into the File table denoting the module that needs to be registered.
ServiceControl Arguments Y Formatted Arguments for the service. Separate by [~].
ServiceControl Component_ N Component 1 Identifier Required foreign key into the Component Table that controls the startup of the service
ServiceControl Event N 0 187 Bit field: Install: 0x1 = Start, 0x2 = Stop, 0x8 = Delete, Uninstall: 0x10 = Start, 0x20 = Stop, 0x80 = Delete
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index d5d0be5..e1209ca 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -77,7 +77,6 @@ use installer::windows::msp;
use installer::windows::property;
use installer::windows::removefile;
use installer::windows::registry;
-use installer::windows::selfreg;
use installer::windows::shortcut;
use installer::windows::strip;
use installer::windows::update;
@@ -1542,8 +1541,6 @@ sub main {
{
installer::windows::removefile::create_removefile_table($folderitemsinproductlanguageresolvedarrayref, $newidtdir);
- installer::windows::selfreg::create_selfreg_table($filesinproductlanguageresolvedarrayref, $newidtdir);
-
# Adding Assemblies into the tables MsiAssembly and MsiAssemblyName dynamically
installer::windows::assembly::create_msiassembly_table($filesinproductlanguageresolvedarrayref, $newidtdir);
installer::windows::assembly::create_msiassemblyname_table($filesinproductlanguageresolvedarrayref, $newidtdir);
diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm
index 325ce11..9bfe9c2 100644
--- a/solenv/bin/modules/installer/windows/idtglobal.pm
+++ b/solenv/bin/modules/installer/windows/idtglobal.pm
@@ -544,16 +544,6 @@ sub write_idt_header
push(@{$idtref}, $oneline);
}
- if ( $definestring eq "selfreg" )
- {
- $oneline = "File_\tCost\n";
- push(@{$idtref}, $oneline);
- $oneline = "s72\tI2\n";
- push(@{$idtref}, $oneline);
- $oneline = "SelfReg\tFile_\n";
- push(@{$idtref}, $oneline);
- }
-
if ( $definestring eq "msiassembly" )
{
$oneline = "Component_\tFeature_\tFile_Manifest\tFile_Application\tAttributes\n";
diff --git a/solenv/bin/modules/installer/windows/selfreg.pm b/solenv/bin/modules/installer/windows/selfreg.pm
deleted file mode 100644
index 0a34b4a..0000000
--- a/solenv/bin/modules/installer/windows/selfreg.pm
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-package installer::windows::selfreg;
-
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::worker;
-use installer::windows::idtglobal;
-
-##############################################################
-# Returning the cost for the selfreg table.
-##############################################################
-
-sub get_selfreg_cost
-{
- my ( $onefile ) = @_;
-
- return "0";
-}
-
-####################################################################################
-# Creating the file SelfReg.idt dynamically
-# Content:
-# File_ Cost
-# UpgradeCode VersionMin VersionMax Language Attributes Remove ActionProperty
-####################################################################################
-
-sub create_selfreg_table
-{
- my ($filesref, $basedir) = @_;
-
- my @selfregtable = ();
-
- installer::windows::idtglobal::write_idt_header(\@selfregtable, "selfreg");
-
- # Registering all libraries with flag "SELFREG"
-
- my $selfregfiles = installer::worker::collect_all_items_with_special_flag($filesref, "SELFREG");
-
- for ( my $i = 0; $i <= $#{$selfregfiles}; $i++ )
- {
- my $onefile = ${$selfregfiles}[$i];
-
- my %selfreg = ();
-
- $selfreg{'File_'} = $onefile->{'uniquename'};
- $selfreg{'Cost'} = get_selfreg_cost($onefile);
-
- my $oneline = $selfreg{'File_'} . "\t" . $selfreg{'Cost'} . "\n";
-
- push(@selfregtable, $oneline);
- }
-
- # Saving the file
-
- my $selfregtablename = $basedir . $installer::globals::separator . "SelfReg.idt";
- installer::files::save_file($selfregtablename ,\@selfregtable);
- my $infoline = "Created idt file: $selfregtablename\n";
- push(@installer::globals::logfileinfo, $infoline);
-}
-
-1;
\ No newline at end of file
More information about the Libreoffice-commits
mailing list