[Libreoffice-commits] core.git: 2 commits - instsetoo_native/util scp2/source solenv/bin
David Tardon
dtardon at redhat.com
Fri Nov 22 07:58:46 PST 2013
instsetoo_native/util/openoffice.lst.in | 4 +--
scp2/source/ooo/module_hidden_ooo.scp | 9 ++------
solenv/bin/modules/installer/profiles.pm | 21 ++++++++++++-------
solenv/bin/modules/installer/windows/createfolder.pm | 16 ++++++++++----
4 files changed, 31 insertions(+), 19 deletions(-)
New commits:
commit edb0626a37f16b1bf705e8902f0c46ed46a6d0cd
Author: David Tardon <dtardon at redhat.com>
Date: Fri Nov 22 16:54:03 2013 +0100
define module, not file
Change-Id: Ie828de19cc35228cd332ecbb5e11f2edb281bad8
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 0b07ebd..0b2344d 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -60,7 +60,7 @@ LibreOffice
PACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR at .@LIBO_VERSION_MICRO at .@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
PACKAGEREVISION {buildid}
LICENSENAME LGPL
- GLOBALFILEGID gid_File_Lib_Oox
+ ROOTMODULEGID gid_Module_Root_Files_4
GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
SPELLCHECKERFILE spellchecker_selection.txt
OOODOWNLOADNAME 1
@@ -111,7 +111,7 @@ LibreOffice_Dev
PACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR at .@LIBO_VERSION_MICRO at .@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
PACKAGEREVISION {buildid}
LICENSENAME LGPL
- GLOBALFILEGID gid_File_Lib_Oox
+ ROOTMODULEGID gid_Module_Root_Files_4
GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
SPELLCHECKERFILE spellchecker_selection.txt
OOODOWNLOADNAME 1
diff --git a/solenv/bin/modules/installer/profiles.pm b/solenv/bin/modules/installer/profiles.pm
index e873a85..1a811d2 100644
--- a/solenv/bin/modules/installer/profiles.pm
+++ b/solenv/bin/modules/installer/profiles.pm
@@ -75,17 +75,24 @@ sub add_profile_into_filelist
my %profile = ();
- # Taking the base data from the "gid_File_Lib_Oox"
+ # Taking the base data from a file in the root module
- my $vclgid = "gid_File_Lib_Oox";
- if ( $allvariables->{'GLOBALFILEGID'} ) { $vclgid = $allvariables->{'GLOBALFILEGID'}; }
- my ($vclfile) = grep {$_->{gid} eq $vclgid} @{$filesarrayref};
- if (! defined $vclfile) {
- die "Could not find file $vclgid in list of files!";
+ if ( ! $allvariableshashref->{'ROOTMODULEGID'} ) { installer::exiter::exit_program("ERROR: ROOTMODULEGID must be defined in list file!", "add_profile_into_filelist"); }
+ my $rootmodulegid = $allvariableshashref->{'ROOTMODULEGID'};
+ my $rootfile;
+ foreach my $file (@{$filesarrayref}) {
+ if ($file->{'modules'} eq $rootmodulegid)
+ {
+ $rootfile = $file;
+ break;
+ }
+ }
+ if (! defined $rootfile) {
+ die "Could not find any file from module $rootmodulegid in list of files!";
}
# copying all base data
- installer::converter::copy_item_object($vclfile, \%profile);
+ installer::converter::copy_item_object($rootfile, \%profile);
# and overriding all new values
diff --git a/solenv/bin/modules/installer/windows/createfolder.pm b/solenv/bin/modules/installer/windows/createfolder.pm
index 232415d..02b29cd 100644
--- a/solenv/bin/modules/installer/windows/createfolder.pm
+++ b/solenv/bin/modules/installer/windows/createfolder.pm
@@ -76,16 +76,24 @@ sub get_createfolder_component
# Therefore they can only belong to the root module and
# will be added to a component at the root module.
# All directories will be added to the component
- # containing the file $allvariableshashref->{'GLOBALFILEGID'}
+ # $allvariableshashref->{'ROOTMODULEGID'}
- if ( ! $allvariableshashref->{'GLOBALFILEGID'} ) { installer::exiter::exit_program("ERROR: GLOBALFILEGID must be defined in list file!", "get_createfolder_component"); }
+ if ( ! $allvariableshashref->{'ROOTMODULEGID'} ) { installer::exiter::exit_program("ERROR: ROOTMODULEGID must be defined in list file!", "get_createfolder_component"); }
- my $globalfilegid = $allvariableshashref->{'GLOBALFILEGID'};
+ my $rootmodulegid = $allvariableshashref->{'ROOTMODULEGID'};
my $onefile;
if ( $installer::globals::languagepack ) { $onefile = get_languagepack_file($filesref, $onedir); }
elsif ( $installer::globals::helppack ) { ($onefile) = grep {$_->{gid} eq 'gid_File_Help_Common_Zip'} @{$filesref} }
- else { ($onefile) = grep {$_->{gid} eq $globalfilegid} @{$filesref} }
+ else {
+ foreach my $file (@{$filesref}) {
+ if ($file->{'modules'} eq $rootmodulegid)
+ {
+ $onefile = $file;
+ break;
+ }
+ }
+ }
if (! defined $onefile) {
installer::exiter::exit_program("ERROR: Could not find file!", "get_createfolder_component");
commit fe09dbf8cafdf7741ff8086b3683476b58df186c
Author: David Tardon <dtardon at redhat.com>
Date: Fri Nov 22 16:55:34 2013 +0100
.dat files are gone
Change-Id: I7fa5d7f7e9af9e0e785a58f942cf0a401394bafd
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 22edd6c..df6de8e 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -107,8 +107,7 @@ Module gid_Module_Root_Files_3
Sortkey = "1300";
Default = YES;
Styles = (HIDDEN_ROOT);
- Files = (gid_File_Dat_Root3,
- gid_File_Jar_Unoil,
+ Files = (gid_File_Jar_Unoil,
gid_File_Jar_Hsqldb_Sdbc,
gid_File_Jar_Officebean,
gid_File_Jar_Report,
@@ -139,8 +138,7 @@ Module gid_Module_Root_Files_4
Sortkey = "1400";
Default = YES;
Styles = (HIDDEN_ROOT);
- Files = (gid_File_Dat_Root4,
- auto_ooo_ALL,
+ Files = (auto_ooo_ALL,
auto_ooobinarytable_ALL,
gid_File_Lib_Bib,
gid_File_Lib_J,
@@ -164,8 +162,7 @@ Module gid_Module_Root_Files_5
Sortkey = "1500";
Default = YES;
Styles = (HIDDEN_ROOT);
- Files = (gid_File_Dat_Root5,
- gid_File_Lib_Crypto,
+ Files = (gid_File_Lib_Crypto,
#if ! defined SYSTEM_CLUCENE
gid_File_Lib_CLucene,
#endif
More information about the Libreoffice-commits
mailing list