[Libreoffice-commits] .: 8 commits - configmgr/source instsetoo_native/util sal/osl set_soenv.in solenv/bin solenv/inc
Tor Lillqvist
tml at kemper.freedesktop.org
Tue Dec 13 05:28:57 PST 2011
configmgr/source/access.cxx | 2
instsetoo_native/util/openoffice.lst | 380 ++++------
sal/osl/unx/makefile.mk | 4
set_soenv.in | 2
solenv/bin/build.pl | 135 ---
solenv/bin/deliver.pl | 1
solenv/bin/make_installer.pl | 79 --
solenv/bin/modules/installer/exiter.pm | 4
solenv/bin/modules/installer/globals.pm | 8
solenv/bin/modules/installer/packagepool.pm | 1048 ----------------------------
solenv/inc/target.mk | 13
11 files changed, 192 insertions(+), 1484 deletions(-)
New commits:
commit 63961609e83e77252d75ced99a4141cba470b696
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Tue Dec 13 15:18:40 2011 +0200
Fix problem when compiling against a wrong colour version of the GNU STL
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index c34a8ac..7fc239c 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -1609,7 +1609,7 @@ void Access::commitChildChanges(
}
NodeMap * members = getNode()->getMemberMap();
if (members != 0) {
- NodeMap::const_iterator j(members->find(i->first));
+ NodeMap::iterator j(members->find(i->first));
if (child.is()) {
// Inserted:
if (j != members->end()) {
commit 1b61b76783d07092fbd88f58777b1273f0898284
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Tue Dec 13 14:25:41 2011 +0200
Untabify
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index cddbc3e..b2f3c20 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -1,168 +1,168 @@
Globals
{
- Settings
- {
- variables
- {
- UREPACKAGEVERSION 3.6.0
- URELAYERVERSION 1
+ Settings
+ {
+ variables
+ {
+ UREPACKAGEVERSION 3.6.0
+ URELAYERVERSION 1
REFERENCEOOOMAJORMINOR 3.4
- UNIXBASISROOTNAME libreoffice3.6
- SERVICETAG_PRODUCTNAME LibreOffice 3.6
- SERVICETAG_PRODUCTVERSION 3.6
- SERVICETAG_PARENTNAME LibreOffice 3.6
- SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
- SERVICETAG_URN urn:uuid:0187debd-e458-11de-82d6-080020a9ed93
- HIDELICENSEDIALOG 1
- PACKAGEPREFIX
- BASISPACKAGEPREFIX libobasis
- UREPACKAGEPREFIX libreoffice
- SOLSUREPACKAGEPREFIX libreoffice
- USE_FILEVERSION 1
- LIBRARYVERSION 9.4.0
+ UNIXBASISROOTNAME libreoffice3.6
+ SERVICETAG_PRODUCTNAME LibreOffice 3.6
+ SERVICETAG_PRODUCTVERSION 3.6
+ SERVICETAG_PARENTNAME LibreOffice 3.6
+ SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
+ SERVICETAG_URN urn:uuid:0187debd-e458-11de-82d6-080020a9ed93
+ HIDELICENSEDIALOG 1
+ PACKAGEPREFIX
+ BASISPACKAGEPREFIX libobasis
+ UREPACKAGEPREFIX libreoffice
+ SOLSUREPACKAGEPREFIX libreoffice
+ USE_FILEVERSION 1
+ LIBRARYVERSION 9.4.0
REGISTRATION_HOST https://registration.libreoffice.org/RegistrationWeb
- REGISTRATIONURL http://survey.libreoffice.org/user/index.php
- PROGRESSBARCOLOR 126,170,23
- PROGRESSSIZE 319,10
- PROGRESSPOSITION 164,225
- PROGRESSFRAMECOLOR 207,208,211
- NATIVEPROGRESS true
- REGISTRYLAYERNAME Layers
+ REGISTRATIONURL http://survey.libreoffice.org/user/index.php
+ PROGRESSBARCOLOR 126,170,23
+ PROGRESSSIZE 319,10
+ PROGRESSPOSITION 164,225
+ PROGRESSFRAMECOLOR 207,208,211
+ NATIVEPROGRESS true
+ REGISTRYLAYERNAME Layers
SERVICEPACK 1
UPDATE_DATABASE 1
CREATE_MSP_INSTALLSET 0
UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
- PACKAGEMAP package_names.txt,package_names_ext.txt
- WINDOWSPATCHLEVEL 8
+ PACKAGEMAP package_names.txt,package_names_ext.txt
+ WINDOWSPATCHLEVEL 8
OOOVENDOR The Document Foundation
- OOODOWNLOADNAME 1
- STARTCENTER_LAYOUT_STYLE 0
- BUILDIDCWS {buildidcws}
- }
- }
+ OOODOWNLOADNAME 1
+ STARTCENTER_LAYOUT_STYLE 0
+ BUILDIDCWS {buildidcws}
+ }
+ }
}
LibreOffice
{
- Settings
- {
- variables
- {
- PRODUCTNAME LibreOffice
- PRODUCTVERSION 3.6
- PRODUCTEXTENSION
- LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta0
+ Settings
+ {
+ variables
+ {
+ PRODUCTNAME LibreOffice
+ PRODUCTVERSION 3.6
+ PRODUCTEXTENSION
+ LONG_PRODUCTEXTENSION
+ SHORT_PRODUCTEXTENSION beta0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3.6
- USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.6.0
- BASEPRODUCTVERSION 3.6
+ BRANDPACKAGEVERSION 3.6
+ USERDIRPRODUCTVERSION 3
+ ABOUTBOXPRODUCTVERSION 3.6.0
+ BASEPRODUCTVERSION 3.6
PCPFILENAME libreoffice.pcp
- UPDATEURL http://update.libreoffice.org/check.php
- ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt
- REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
- ADDSYSTEMINTEGRATION 1
- EVAL
- FILEFORMATNAME OpenOffice.org
- FILEFORMATVERSION 1.0
- WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.6.0
- PACKAGEREVISION {buildid}
- LICENSENAME LGPL
- GLOBALFILEGID gid_File_Lib_Vcl
- GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
- SPELLCHECKERFILE spellchecker_selection.txt
- SETSTATICPATH 1
- OOODOWNLOADNAME 1
- XPDINSTALLER 0
- BETAUPGRADECODE
- STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
- CHANGETARGETDIR 1
- USE_FILEVERSION 1
- LIBRARYVERSION 9.4.0
- PATCHCODEFILE ooo_patchcodes.txt
- RELATIVE_PATHES_IN_DDF 1
+ UPDATEURL http://update.libreoffice.org/check.php
+ ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt
+ REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
+ ADDSYSTEMINTEGRATION 1
+ EVAL
+ FILEFORMATNAME OpenOffice.org
+ FILEFORMATVERSION 1.0
+ WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
+ PACKAGEVERSION 3.6.0
+ PACKAGEREVISION {buildid}
+ LICENSENAME LGPL
+ GLOBALFILEGID gid_File_Lib_Vcl
+ GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
+ SPELLCHECKERFILE spellchecker_selection.txt
+ SETSTATICPATH 1
+ OOODOWNLOADNAME 1
+ XPDINSTALLER 0
+ BETAUPGRADECODE
+ STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
+ CHANGETARGETDIR 1
+ USE_FILEVERSION 1
+ LIBRARYVERSION 9.4.0
+ PATCHCODEFILE ooo_patchcodes.txt
+ RELATIVE_PATHES_IN_DDF 1
STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
STARTCENTER_INFO_URL http://www.libreoffice.org/
STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
STARTCENTER_LAYOUT_STYLE 0
DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
- }
- active 1
- compression 5
- script setup_osl
- downloadname LibO_{productversion}_{os}_install_{languages}
- langpackdownloadname LibO_{productversion}_languagepack_{os}_install_{languages}
- helppackdownloadname LibO_{productversion}_helppack_{os}_install_{languages}
- include {solarenvpath}/{os}/loader2,.,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
- }
+ }
+ active 1
+ compression 5
+ script setup_osl
+ downloadname LibO_{productversion}_{os}_install_{languages}
+ langpackdownloadname LibO_{productversion}_languagepack_{os}_install_{languages}
+ helppackdownloadname LibO_{productversion}_helppack_{os}_install_{languages}
+ include {solarenvpath}/{os}/loader2,.,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+ }
}
LibreOffice_Dev
{
- Settings
- {
- variables
- {
- PRODUCTNAME LOdev
- PRODUCTVERSION 3.6
- PRODUCTEXTENSION
- LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta0
- UNIXBASISROOTNAME lodev3.6
+ Settings
+ {
+ variables
+ {
+ PRODUCTNAME LOdev
+ PRODUCTVERSION 3.6
+ PRODUCTEXTENSION
+ LONG_PRODUCTEXTENSION
+ SHORT_PRODUCTEXTENSION beta0
+ UNIXBASISROOTNAME lodev3.6
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3.6
- USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.6.0
- BASEPRODUCTVERSION 3.6
- DEVELOPMENTPRODUCT 1
- BASISPACKAGEPREFIX lodevbasis
- UREPACKAGEPREFIX lodev
- SOLSUREPACKAGEPREFIX lodev
- REGISTRYLAYERNAME LayerDev
- SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
- UPDATEURL http://update.libreoffice.org/check.php
- ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
- ADDSYSTEMINTEGRATION 1
- EVAL
- FILEFORMATNAME OpenOffice.org
- FILEFORMATVERSION 1.0
- WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.6.0
- PACKAGEREVISION {buildid}
- LICENSENAME LGPL
- GLOBALFILEGID gid_File_Lib_Vcl
- GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
- SPELLCHECKERFILE spellchecker_selection.txt
- SETSTATICPATH 1
- OOODOWNLOADNAME 1
- XPDINSTALLER 0
- BETAUPGRADECODE
- STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
- CHANGETARGETDIR 1
- USE_FILEVERSION 1
- LIBRARYVERSION 9.4.0
- PATCHCODEFILE ooodev_patchcodes.txt
- CODEFILENAME codes_ooodev.txt
- LOCALUSERDIR $ORIGIN/..
- RELATIVE_PATHES_IN_DDF 1
+ BRANDPACKAGEVERSION 3.6
+ USERDIRPRODUCTVERSION 3
+ ABOUTBOXPRODUCTVERSION 3.6.0
+ BASEPRODUCTVERSION 3.6
+ DEVELOPMENTPRODUCT 1
+ BASISPACKAGEPREFIX lodevbasis
+ UREPACKAGEPREFIX lodev
+ SOLSUREPACKAGEPREFIX lodev
+ REGISTRYLAYERNAME LayerDev
+ SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
+ UPDATEURL http://update.libreoffice.org/check.php
+ ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
+ ADDSYSTEMINTEGRATION 1
+ EVAL
+ FILEFORMATNAME OpenOffice.org
+ FILEFORMATVERSION 1.0
+ WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
+ PACKAGEVERSION 3.6.0
+ PACKAGEREVISION {buildid}
+ LICENSENAME LGPL
+ GLOBALFILEGID gid_File_Lib_Vcl
+ GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
+ SPELLCHECKERFILE spellchecker_selection.txt
+ SETSTATICPATH 1
+ OOODOWNLOADNAME 1
+ XPDINSTALLER 0
+ BETAUPGRADECODE
+ STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
+ CHANGETARGETDIR 1
+ USE_FILEVERSION 1
+ LIBRARYVERSION 9.4.0
+ PATCHCODEFILE ooodev_patchcodes.txt
+ CODEFILENAME codes_ooodev.txt
+ LOCALUSERDIR $ORIGIN/..
+ RELATIVE_PATHES_IN_DDF 1
STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
STARTCENTER_INFO_URL http://www.libreoffice.org/
STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
STARTCENTER_LAYOUT_STYLE 0
DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
- }
- active 1
- compression 5
- script setup_osl
- downloadname LibO-dev_{productversion}_{os}_install_{languages}
- langpackdownloadname LibO-dev_{productversion}_languagepack_{os}_install_{languages}
- helppackdownloadname LibO-dev_{productversion}_helppack_{os}_install_{languages}
- include {solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
- }
+ }
+ active 1
+ compression 5
+ script setup_osl
+ downloadname LibO-dev_{productversion}_{os}_install_{languages}
+ langpackdownloadname LibO-dev_{productversion}_languagepack_{os}_install_{languages}
+ helppackdownloadname LibO-dev_{productversion}_helppack_{os}_install_{languages}
+ include {solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+ }
}
URE
@@ -192,7 +192,7 @@ URE
STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
STARTCENTER_LAYOUT_STYLE 0
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
- PACKAGEMAP package_names_ext.txt
+ PACKAGEMAP package_names_ext.txt
DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
}
active 1
@@ -266,7 +266,7 @@ LibreOffice_Dev_SDK
UREPACKAGEPREFIX lodev
SOLSUREPACKAGEPREFIX lodev
REGISTRYLAYERNAME LayerDev
- DEVELOPMENTPRODUCT 1
+ DEVELOPMENTPRODUCT 1
PACK_INSTALLED 1
DMG_VOLUMEEXTENSION SDK
DATABASENAME libreoffice35devsdk
@@ -356,7 +356,7 @@ LibreOffice_Dev_Test
UREPACKAGEPREFIX lodev
SOLSUREPACKAGEPREFIX lodev
REGISTRYLAYERNAME LayerDev
- DEVELOPMENTPRODUCT 1
+ DEVELOPMENTPRODUCT 1
PACK_INSTALLED 1
DMG_VOLUMEEXTENSION TEST
DATABASENAME libreoffice35devtest
@@ -384,63 +384,63 @@ LibreOffice_Dev_Test
OxygenOffice
{
- Settings
- {
- variables
- {
- PRODUCTNAME OxygenOffice
- PRODUCTVERSION 3.6
- PRODUCTEXTENSION
- LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta0
+ Settings
+ {
+ variables
+ {
+ PRODUCTNAME OxygenOffice
+ PRODUCTVERSION 3.6
+ PRODUCTEXTENSION
+ LONG_PRODUCTEXTENSION
+ SHORT_PRODUCTEXTENSION beta0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3.6
- USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.6.0
- BASEPRODUCTVERSION 3.6
+ BRANDPACKAGEVERSION 3.6
+ USERDIRPRODUCTVERSION 3
+ ABOUTBOXPRODUCTVERSION 3.6.0
+ BASEPRODUCTVERSION 3.6
PCPFILENAME openoffice.pcp
- UPDATEURL http://update.libreoffice.org/check.php
- ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt
- REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
- ADDSYSTEMINTEGRATION 1
- EVAL
- FILEFORMATNAME OpenOffice.org
- FILEFORMATVERSION 1.0
- WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.6.0
- PACKAGEREVISION {buildid}
- LICENSENAME LGPL
- SERVICESPROJEKT 1
- GLOBALFILEGID gid_File_Lib_Vcl
- GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
- SPELLCHECKERFILE spellchecker_selection.txt
- SETSTATICPATH 1
- OOODOWNLOADNAME 1
- XPDINSTALLER 0
- BETAUPGRADECODE
- STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
- CHANGETARGETDIR 1
- USE_FILEVERSION 1
- LIBRARYVERSION 9.4.0
- PATCHCODEFILE ooo_patchcodes.txt
- PROGRESSBARCOLOR 126,170,23
- PROGRESSSIZE 430,5
- PROGRESSPOSITION 5,230
- PROGRESSFRAMECOLOR 207,208,211
- RELATIVE_PATHES_IN_DDF 1
+ UPDATEURL http://update.libreoffice.org/check.php
+ ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt
+ REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
+ ADDSYSTEMINTEGRATION 1
+ EVAL
+ FILEFORMATNAME OpenOffice.org
+ FILEFORMATVERSION 1.0
+ WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
+ PACKAGEVERSION 3.6.0
+ PACKAGEREVISION {buildid}
+ LICENSENAME LGPL
+ SERVICESPROJEKT 1
+ GLOBALFILEGID gid_File_Lib_Vcl
+ GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
+ SPELLCHECKERFILE spellchecker_selection.txt
+ SETSTATICPATH 1
+ OOODOWNLOADNAME 1
+ XPDINSTALLER 0
+ BETAUPGRADECODE
+ STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
+ CHANGETARGETDIR 1
+ USE_FILEVERSION 1
+ LIBRARYVERSION 9.4.0
+ PATCHCODEFILE ooo_patchcodes.txt
+ PROGRESSBARCOLOR 126,170,23
+ PROGRESSSIZE 430,5
+ PROGRESSPOSITION 5,230
+ PROGRESSFRAMECOLOR 207,208,211
+ RELATIVE_PATHES_IN_DDF 1
STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
STARTCENTER_INFO_URL http://www.libreoffice.org/
STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
STARTCENTER_LAYOUT_STYLE 0
DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
- }
- active 1
- compression 5
- script setup_osl
- downloadname OOOP_{productversion}_{os}_install_{languages}
- langpackdownloadname OOOP_{productversion}_languagepack_{os}_install_{languages}
- helppackdownloadname OOOP_{productversion}_helppack_{os}_install_{languages}
- include {solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{solarpath}/pck.{minor}/brand
- }
+ }
+ active 1
+ compression 5
+ script setup_osl
+ downloadname OOOP_{productversion}_{os}_install_{languages}
+ langpackdownloadname OOOP_{productversion}_languagepack_{os}_install_{languages}
+ helppackdownloadname OOOP_{productversion}_helppack_{os}_install_{languages}
+ include {solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{solarpath}/pck.{minor}/brand
+ }
}
commit b4774e1730ffa442b086a07820d998cec58e2c17
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Tue Dec 13 14:22:52 2011 +0200
We don't use any 'pooling' when packaging
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 96cfd9a..cddbc3e 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -20,7 +20,6 @@ Globals
SOLSUREPACKAGEPREFIX libreoffice
USE_FILEVERSION 1
LIBRARYVERSION 9.4.0
- POOLPRODUCT 1
REGISTRATION_HOST https://registration.libreoffice.org/RegistrationWeb
REGISTRATIONURL http://survey.libreoffice.org/user/index.php
PROGRESSBARCOLOR 126,170,23
@@ -185,7 +184,6 @@ URE
SETSTATICPATH 1
NOVERSIONINDIRNAME 1
PCPFILENAME ure.pcp
- POOLPRODUCT 0
GLOBALFILEGID gid_File_Dl_Cppu
DONTUSESTARTMENUFOLDER 1
RELATIVE_PATHES_IN_DDF 1
@@ -222,7 +220,6 @@ LibreOffice_SDK
PACKAGEVERSION 3.6.0
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
- POOLPRODUCT 0
DMG_VOLUMEEXTENSION SDK
DATABASENAME libreoffice35sdk
NO_README_IN_ROOTDIR 1
@@ -271,7 +268,6 @@ LibreOffice_Dev_SDK
REGISTRYLAYERNAME LayerDev
DEVELOPMENTPRODUCT 1
PACK_INSTALLED 1
- POOLPRODUCT 0
DMG_VOLUMEEXTENSION SDK
DATABASENAME libreoffice35devsdk
NO_README_IN_ROOTDIR 1
@@ -314,7 +310,6 @@ LibreOffice_Test
PACKAGEVERSION 3.6.0
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
- POOLPRODUCT 0
DMG_VOLUMEEXTENSION TEST
DATABASENAME libreoffice35test
NO_README_IN_ROOTDIR 1
@@ -363,7 +358,6 @@ LibreOffice_Dev_Test
REGISTRYLAYERNAME LayerDev
DEVELOPMENTPRODUCT 1
PACK_INSTALLED 1
- POOLPRODUCT 0
DMG_VOLUMEEXTENSION TEST
DATABASENAME libreoffice35devtest
NO_README_IN_ROOTDIR 1
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 9dfe9b5..64e4c04 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -49,7 +49,6 @@ use installer::languagepack;
use installer::languages;
use installer::logger;
use installer::packagelist;
-use installer::packagepool;
use installer::parameter;
use installer::pathanalyzer;
use installer::profiles;
@@ -1354,39 +1353,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
installer::logger::include_header_into_logfile("Creating package: $packagename ($k)");
- ####################################################
- # Pool check: If package is created at the moment
- # try it again later.
- ####################################################
-
- if (( $installer::globals::patch ) ||
- ( $installer::globals::languagepack ) ||
- ( $installer::globals::helppack ) ||
- ( $installer::globals::packageformat eq "native" ) ||
- ( $installer::globals::packageformat eq "portable" ) ||
- ( $installer::globals::packageformat eq "osx" )) { $allvariableshashref->{'POOLPRODUCT'} = 0; }
-
- if ( $allvariableshashref->{'POOLPRODUCT'} )
- {
- if ( ! $installer::globals::sessionidset ) { installer::packagepool::set_sessionid(); }
- if ( ! $installer::globals::poolpathset ) { installer::packagepool::set_pool_path(); }
- if (( ! $installer::globals::getuidpathset ) && ( $installer::globals::issolarisbuild )) { installer::worker::set_getuid_path($includepatharrayref); }
-
- my $package_is_creatable = installer::packagepool::check_package_availability($packagename);
-
- if (( ! $package_is_creatable ) && ( ! exists($installer::globals::poolshiftedpackages{$packagename}) ))
- {
- splice(@{$packages}, $k, 1); # removing package ...
- push(@{$packages}, $onepackage); # ... and adding it to the end
- $installer::globals::poolshiftedpackages{$packagename} = 1; # only shifting each package once
- $k--; # decreasing the counter
- my $localinfoline = "Pool: Package \"$packagename\" cannot be created at the moment. Trying again later (1).\n";
- installer::logger::print_message($localinfoline);
- push( @installer::globals::logfileinfo, $localinfoline);
- next; # repeating this iteration with new package
- }
- }
-
###########################################
# Root path, can be defined as parameter
###########################################
@@ -1611,42 +1577,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
installer::epmfile::resolve_path_in_epm_list_before_packaging(\@epmfile, $completeepmfilename, "UREPACKAGEPREFIX", $allvariableshashref->{'UREPACKAGEPREFIX'});
installer::files::save_file($completeepmfilename ,\@epmfile);
- #######################################################
- # Now the complete content of the package is known,
- # including variables and shell scripts.
- # Create the package or using the package pool?
- #######################################################
-
- my $use_package_from_pool = 0;
- if ( $allvariableshashref->{'POOLPRODUCT'} ) { $use_package_from_pool = installer::packagepool::package_is_up_to_date($allvariableshashref, $onepackage, $packagename, \@epmfile, $filesinpackage, $installdir, $installer::globals::epmoutpath, $languagestringref); }
-
- if ( $use_package_from_pool == 3 ) # repeat this package later
- {
- my $package_is_creatable = installer::packagepool::check_package_availability($packagename);
-
- if (( ! $package_is_creatable ) && ( ! exists($installer::globals::poolshiftedpackages{$packagename}) ))
- {
- splice(@{$packages}, $k, 1); # removing package ...
- push(@{$packages}, $onepackage); # ... and adding it to the end
- $installer::globals::poolshiftedpackages{$packagename} = 1; # only shifting each package once
- $k--; # decreasing the counter
- my $localinfoline = "\nPool: Package \"$packagename\" cannot be created at the moment. Trying again later (2).\n";
- installer::logger::print_message($localinfoline);
- push( @installer::globals::logfileinfo, $localinfoline);
- next; # repeating this iteration with new package
- }
- }
-
- if ( $use_package_from_pool == 4 ) # There was a problem with pooling. Repeat this package immediately.
- {
- $k--; # decreasing the counter
- my $localinfoline = "\nPool: Package \"$packagename\" had pooling problems. Repeating packaging immediately (3).\n";
- installer::logger::print_message($localinfoline);
- push( @installer::globals::logfileinfo, $localinfoline);
- next; # repeating this iteration
- }
-
- if ( $use_package_from_pool == 0 )
{
# changing into the "install" directory to create installation sets
@@ -1694,6 +1624,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
# solaris patch not needed anymore
}
}
+
else # this is the standard epm (not relocatable) or ( nonlinux and nonsolaris )
{
installer::epmfile::resolve_path_in_epm_list_before_packaging(\@epmfile, $completeepmfilename, "\$\$PRODUCTINSTALLLOCATION", $relocatablepath);
@@ -1714,11 +1645,9 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
}
}
- if ( $allvariableshashref->{'POOLPRODUCT'} ) { installer::packagepool::put_content_into_pool($packagename, $installdir, $installer::globals::epmoutpath, $filesinpackage, \@epmfile); }
-
chdir($currentdir); # changing back into start directory
- } # end of "if ( ! $use_package_from_pool )
+ }
} # end of "if ( ! $installer::globals::simple )
@@ -1726,7 +1655,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
# xpd installation mechanism
###########################################
- # Creating the xpd file for the package. This has to happen always, not determined by $use_package_from_pool
+ # Creating the xpd file for the package. This has to happen always
if ( $installer::globals::isxpdplatform )
{
@@ -1745,8 +1674,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
} # end of "for ( my $k = 0; $k <= $#{$packages}; $k++ )"
- installer::packagepool::log_pool_statistics();
-
##############################################################
# Post epm functionality, after the last package is packed
##############################################################
diff --git a/solenv/bin/modules/installer/exiter.pm b/solenv/bin/modules/installer/exiter.pm
index fa9aeb4..016de1d 100644
--- a/solenv/bin/modules/installer/exiter.pm
+++ b/solenv/bin/modules/installer/exiter.pm
@@ -47,10 +47,6 @@ sub exit_program
if ( $installer::globals::saveinstalldir =~ /_inprogress/ ) { installer::systemactions::rename_string_in_directory($installer::globals::saveinstalldir, "_inprogress", "_witherror"); }
- # Cleaning files from pool tooling
- if ( $installer::globals::processhaspoolcheckfile ) { unlink $installer::globals::poolcheckfilename; }
- if ( $installer::globals::processhaspoollockfile ) { unlink $installer::globals::poollockfilename; }
-
installer::worker::clean_output_tree(); # removing directories created in the output tree
# If @installer::globals::logfileinfo is not empty, it can be used.
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 49f13e6..8c08f43 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -342,15 +342,7 @@ BEGIN
$nopatchfilecollector = "";
@userregistrycollector = ();
$addeduserregitrykeys = 0;
- $poolpathset = 0;
- $poolpath = 0;
- $poollockfilename = "";
- $poolcheckfilename = "";
- %poolshiftedpackages = ();
- %poolpackages = ();
%createpackages = ();
- $processhaspoolcheckfile = 0;
- $processhaspoollockfile = 0;
$newpcfcontentcalculated = 0;
$sessionid = 0;
$sessionidset = 0;
diff --git a/solenv/bin/modules/installer/packagepool.pm b/solenv/bin/modules/installer/packagepool.pm
deleted file mode 100644
index c3f3a91..0000000
--- a/solenv/bin/modules/installer/packagepool.pm
+++ /dev/null
@@ -1,1048 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::packagepool;
-
-use Digest::MD5;
-use installer::exiter;
-use installer::globals;
-use installer::logger;
-use installer::pathanalyzer;
-use installer::worker;
-
-######################################################
-# Checking the md5sum of a file
-######################################################
-
-sub get_md5sum
-{
- my ($filename) = @_;
-
- open(FILE, "<$filename") or die "ERROR: Can't open $filename for creating file hash";
- binmode(FILE);
- my $digest = Digest::MD5->new->addfile(*FILE)->hexdigest;
- close(FILE);
-
- return $digest;
-}
-
-####################################################
-# Setting a unique sessionid to identify this
-# packaging process.
-####################################################
-
-sub set_sessionid
-{
- my $pid = $$; # process id
- my $timer = time(); # time
- $installer::globals::sessionid = $pid . $timer;
- $installer::globals::sessionidset = 1;
- my $infoline = "\nPool: Setting session id: $installer::globals::sessionid.\n";
- push( @installer::globals::logfileinfo, $infoline);
-}
-
-####################################################
-# Setting and creating pool path.
-####################################################
-
-sub set_pool_path
-{
- $installer::globals::unpackpath =~ s/\Q$installer::globals::separator\E\s*$//; # removing ending slashes and backslashes
- $installer::globals::poolpath = $installer::globals::unpackpath . $installer::globals::separator . "pool_" . $installer::globals::packageformat;
- installer::systemactions::create_directory($installer::globals::poolpath);
- $installer::globals::poolpathset = 1;
-}
-
-####################################################
-# Comparing the content of two epm files.
-####################################################
-
-sub compare_epm_content
-{
- my ($oldcontent, $newcontent) = @_;
-
- my $identical = 1;
- my $diffinfo = "";
-
- # Removing empty lines and files from $newcontent
-
- my @newlocalcontent = ();
- for ( my $i = 0; $i <= $#{$newcontent}; $i++ )
- {
- if ( ${$newcontent}[$i] =~ /^\s*$/ ) { next; } # Removing empty lines from $newcontent. Empty lines are also not included into pcf file, from where $oldcontent was read.
- if ( ${$newcontent}[$i] =~ /^\s*f\s+/ ) { next; } # Ignoring files, they can contain temporary pathes
- if (( ${$newcontent}[$i] =~ /^\s*%readme\s+/ ) || ( ${$newcontent}[$i] =~ /^\s*%license\s+/ )) { next; } # ignoring license and readme (language specific!)
- my $oneline = ${$newcontent}[$i];
- $oneline =~ s/\s*$//; # Removing line ends. Also not included in old epm file, that is read from pcf file.
- push(@newlocalcontent, $oneline);
- }
-
- my $oldmember = $#{$oldcontent} + 1;
- my $newmember = $#newlocalcontent + 1;
-
- # comparing the count
- if ( $oldmember != $newmember )
- {
- $identical = 0;
- installer::logger::print_message("\n...... changed length of EPM file\n");
- $diffinfo = "Pool: EPM, different line count: old epm file: $oldmember, new epm file: $newmember\n";
- push(@installer::globals::epmdifflist, $diffinfo);
- }
-
- # comparing the content line for line, so the order must not change
-
- if ( $identical )
- {
- for ( my $i = 0; $i <= $#{$oldcontent}; $i++ )
- {
- if ( ${$oldcontent}[$i] ne $newlocalcontent[$i] )
- {
- $identical = 0;
- my $line = $i + 1;
- installer::logger::print_message("\n...... different content in EPM file\n");
- $diffinfo = "Pool: EPM, line $line changed from \"${$oldcontent}[$i]\" to \"$newlocalcontent[$i]\".\n";
- push(@installer::globals::epmdifflist, $diffinfo);
- last;
- }
- }
- }
-
- return $identical;
-}
-
-####################################################
-# Comparing the content of two pcf files.
-####################################################
-
-sub compare_package_content
-{
- my ($oldcontent, $newcontent) = @_;
-
- my $identical = 1;
- my $infoline = "";
-
- my $oldmember = scalar keys %{$oldcontent};
- my $newmember = scalar keys %{$newcontent};
-
- # comparing the count
-
- if ( $oldmember != $newmember )
- {
- # Logging the difference
- $identical = 0;
- installer::logger::print_message("\n...... different number of files in packages. New number: $newmember, old number: $oldmember\n");
- $infoline = "Different number of files in packages. New number: $newmember, old number: $oldmember\n";
- push(@installer::globals::pcfdiffcomment, $infoline);
- }
-
- # comparing the keys
-
- if ( $identical )
- {
- my $first = 1;
- my $start = "\n";
- foreach my $dest ( keys %{$newcontent} )
- {
- if ( ! exists($oldcontent->{$dest}) )
- {
- $identical = 0;
- installer::logger::print_message("$start...... file only in one package (A): $dest\n");
- $infoline = "File only in existing pool package: $dest\n";
- push(@installer::globals::pcfdiffcomment, $infoline);
- if ( $first ) { $start = ""; }
- $first = 0;
- }
- }
-
- # collecting all differences
- if ( ! $identical )
- {
- foreach my $dest ( keys %{$oldcontent} )
- {
- if ( ! exists($newcontent->{$dest}) )
- {
- $identical = 0;
- installer::logger::print_message("$start...... file only in one package (B): $dest\n");
- $infoline = "File only in new package: $dest\n";
- push(@installer::globals::pcfdiffcomment, $infoline);
- if ( $first ) { $start = ""; }
- $first = 0;
- }
- }
- }
- }
-
- # comparing the checksum
-
- if ( $identical )
- {
- my $first = 1;
-
- foreach my $dest ( keys %{$newcontent} )
- {
- if ( $newcontent->{$dest}->{'md5sum'} ne $oldcontent->{$dest}->{'md5sum'} )
- {
- $identical = 0;
- if ( $first == 1 )
- {
- installer::logger::print_message("\n");
- $first = 0;
- }
- $installer::globals::pcfdifflist{$dest} = 1;
- installer::logger::print_message("...... different file: $dest\n");
- # last;
- }
-
- if ( $installer::globals::iswindowsbuild )
- {
- if ( $newcontent->{$dest}->{'uniquename'} ne $oldcontent->{$dest}->{'uniquename'} )
- {
- $identical = 0;
- $installer::globals::pcfdifflist{$dest} = 1;
- installer::logger::print_message("\n...... different file: $dest");
- # last;
- }
- }
- }
- }
-
- return $identical;
-}
-
-####################################################
-# Calculating content of pcf file.
-####################################################
-
-sub calculate_current_content
-{
- my ($filesarray, $packagename) = @_;
-
- installer::logger::include_timestamp_into_logfile("\nCalculating content for package content file ($packagename), start");
-
- my %globalcontent = ();
-
- for ( my $i = 0; $i <= $#{$filesarray}; $i++ )
- {
- my %onefilehash = ();
-
- my $onefile = ${$filesarray}[$i];
- if ( ! $onefile->{'sourcepath'} ) { installer::exiter::exit_program("ERROR: No sourcepath found for file $onefile->{'gid'}", "calculate_current_content"); }
- my $source = $onefile->{'sourcepath'};
- if ( $onefile->{'zipfilesource'} ) { $source = $onefile->{'zipfilesource'}; }
- if ( ! -f $source ) { installer::exiter::exit_program("ERROR: Sourcefile not found: $source ($onefile->{'gid'})", "calculate_current_content"); }
-
- # For Windows the unique name inside the cabinet file also has to be saved
- my $uniquename = "";
- if ( $installer::globals::iswindowsbuild ) { $uniquename = $onefile->{'uniquename'};}
-
- my $destination = $onefile->{'destination'};
- my $checksum = get_md5sum($source);
-
- $onefilehash{'md5sum'} = $checksum;
- $onefilehash{'uniquename'} = $uniquename;
-
- if ( exists($globalcontent{$destination}) ) { installer::exiter::exit_program("ERROR: Destination not unique: $destination ($onefile->{'gid'})", "calculate_current_content"); }
- $globalcontent{$destination} = \%onefilehash;
- }
-
- installer::logger::include_timestamp_into_logfile("\nCalculating content for package content file ($packagename), start");
-
- return \%globalcontent;
-}
-
-####################################################
-# Writing pcf file.
-####################################################
-
-sub create_pcfcontent_file
-{
- my ($realpackagename, $md5sum, $filesize, $fullpackagename, $pkgversion, $epmfilecontent, $pcffilename) = @_;
-
- my @content = ();
- my $oneline = "PackageName: $realpackagename\n";
- push(@content, $oneline);
-
- $oneline = "md5sum: $md5sum\n";
- push(@content, $oneline);
-
- $oneline = "FileSize: $filesize\n";
- push(@content, $oneline);
-
- $oneline = "FullPackageName: $fullpackagename\n";
- push(@content, $oneline);
-
- $oneline = "PkgVersion: $pkgversion\n";
- push(@content, $oneline);
-
- foreach my $dest (keys %{$installer::globals::newpcfcontent} )
- {
- $oneline = "Files:\t$dest\t$installer::globals::newpcfcontent->{$dest}->{'md5sum'}\t$installer::globals::newpcfcontent->{$dest}->{'uniquename'}\n";
- push(@content, $oneline);
- }
-
- for ( my $i = 0; $i <= $#{$epmfilecontent}; $i++ )
- {
- if ( ${$epmfilecontent}[$i] =~ /^\s*$/ ) { next; } # avoiding empty lines
- if ( ${$epmfilecontent}[$i] =~ /^\s*f\s+/ ) { next; } # ignoring files, because they can contain temporary pathes
- if (( ${$epmfilecontent}[$i] =~ /^\s*%readme\s+/ ) || ( ${$epmfilecontent}[$i] =~ /^\s*%license\s+/ )) { next; } # ignoring license and readme (language specific!)
- $oneline = "EPM:\t${$epmfilecontent}[$i]";
- push(@content, $oneline);
- }
-
- installer::files::save_file($pcffilename, \@content);
-}
-
-#######################################################
-# Reading the content of the package content file.
-#######################################################
-
-sub read_pcf_content
-{
- my ($pcffilename) = @_;
-
- my %allcontent = ();
- my @epmfile = ();
- my $realpackagename = "";
-
- my $content = installer::files::read_file($pcffilename);
-
- for ( my $i = 0; $i <= $#{$content}; $i++ )
- {
- my $line = ${$content}[$i];
-
- if ( $line =~ /^\s*PackageName\:\s*(.*?)\s*$/ )
- {
- $realpackagename = $1;
- $installer::globals::xpdpackageinfo{'RealPackageName'} = $realpackagename;
- next;
- }
-
- if ( $line =~ /^\s*FullPackageName\:\s*(.*?)\s*$/ )
- {
- $installer::globals::xpdpackageinfo{'FullPackageName'} = $1;
- next;
- }
-
- if ( $line =~ /^\s*FileSize\:\s*(.*?)\s*$/ )
- {
- $installer::globals::xpdpackageinfo{'FileSize'} = $1;
- next;
- }
-
- if ( $line =~ /^\s*PkgVersion\:\s*(.*?)\s*$/ )
- {
- $installer::globals::xpdpackageinfo{'PkgVersion'} = $1;
- next;
- }
-
- if ( $line =~ /^\s*md5sum\:\s*(.*?)\s*$/ )
- {
- $installer::globals::xpdpackageinfo{'md5sum'} = $1;
- next;
- }
-
- if ( $line =~ /^\s*Files:\t(.+?)\t(.+?)\t(.*?)\s*$/ )
- {
- my $destination = $1;
- my $checksum = $2;
- my $uniquename = $3;
-
- my %onefilehash = ();
- $onefilehash{'md5sum'} = $checksum;
- $onefilehash{'uniquename'} = $uniquename;
-
- $allcontent{$destination} = \%onefilehash;
- next;
- }
-
- if ( $line =~ /^\s*EPM:\t(.*?)\s*$/ ) # A line can be empty in epm file
- {
- my $epmcontent = $1;
- push(@epmfile, $epmcontent);
- next;
- }
- }
-
- if ( $realpackagename eq "" ) { installer::exiter::exit_program("ERROR: Real package name not found in pcf file: \"$pcffilename\"", "read_pcf_content"); }
-
- return ($realpackagename, \%allcontent, \@epmfile);
-}
-
-####################################################
-# Checking, if a specific package can be
-# created at the moment.
-####################################################
-
-sub check_package_availability
-{
- my ($packagename) = @_;
-
- my $package_is_available = 1;
-
- my $checkfilename = $installer::globals::poolpath . $installer::globals::separator . $packagename . ".pcf.check";
- my $lockfilename = $installer::globals::poolpath . $installer::globals::separator . $packagename . ".pcf.lock";
-
- if (( -f $checkfilename ) || ( -f $lockfilename )) { $package_is_available = 0; }
-
- return $package_is_available;
-}
-
-####################################################
-# Check, if the existence of the check or lock
-# file requires an exit of packaging process.
-####################################################
-
-sub check_pool_exit
-{
- my ( $lockfilename, $timecounter ) = @_;
-
- # How old is this lock file?
- my $timeage = installer::logger::get_file_age($lockfilename);
-
- # if ( $timeage > 1800 ) # file is older than half an hour
- if ( $timeage > 3600 ) # file is older than an hour
- {
- my $timestring = installer::logger::convert_timestring($timeage);
- my $infoline = "\nPool: Attention: \"$lockfilename\" is too old ($timestring). Removing file!\n";
- installer::logger::print_message( "... $infoline" );
- push( @installer::globals::logfileinfo, $infoline);
- unlink $lockfilename;
- # installer::exiter::exit_program("ERROR: Waiting too long for removal of lock file \"$lockfilename\"", "check_pool_exit (packagepool)");
- }
- else
- {
- my $filecontent = installer::files::read_file($lockfilename);
- my $waittime = $timecounter * 10;
- $waittime = installer::logger::convert_timestring($waittime);
- my $infoline = "\nPool: Warning: \"$lockfilename\" blocks this process for $waittime. Lock content: \"${$filecontent}[0]\"\n";
- installer::logger::print_message( "... $infoline" );
- push( @installer::globals::logfileinfo, $infoline);
- }
-}
-
-############################################################################
-# This function logs some information, that can be used to find
-# pool problems.
-############################################################################
-
-sub log_pool_info
-{
- my ( $file_exists ) = @_;
-
- my $infoline = "";
-
- # Content saved in
- # $installer::globals::savelockfilecontent = installer::files::read_file($filename);
- # $installer::globals::savelockfilename = $filename;
-
- if ( $file_exists )
- {
- $infoline = "\nPool Problem: Lock file \"$installer::globals::savelockfilename\" belongs to another process. This process has session id: $installer::globals::sessionid .\n";
- push( @installer::globals::logfileinfo, $infoline);
- $infoline = "Content of Lock file:\n";
- push( @installer::globals::logfileinfo, $infoline);
- foreach my $line ( @{$installer::globals::savelockfilecontent} ) { push( @installer::globals::logfileinfo, $line); }
- }
- else
- {
- $infoline = "\nPool Problem: Lock file \"$installer::globals::savelockfilename\" does not exist anymore (this process has session id: $installer::globals::sessionid) .\n";
- push( @installer::globals::logfileinfo, $infoline);
- }
-}
-
-############################################################################
-# Checking, if this process is the owner of the lock file in the pool.
-# This can be determined by the Process ID, that is written at the
-# beginning of the first line into the lock file.
-############################################################################
-
-sub process_is_owner
-{
- my ( $filename ) = @_;
-
- my $process_is_owner = 0;
-
- $installer::globals::savelockfilecontent = installer::files::read_file($filename);
- $installer::globals::savelockfilename = $filename;
-
- if ( ${$installer::globals::savelockfilecontent}[0] =~ /^\s*\Q$installer::globals::sessionid\E\s+/ ) { $process_is_owner = 1; }
-
- return $process_is_owner;
-}
-
-####################################################
-# Removing a package from installation set, if
-# there were pooling problems.
-####################################################
-
-sub remove_package_from_installset
-{
- my ($newpackagepath) = @_;
-
- my $infoline = "Pool problem: Removing package \"$newpackagepath\" from installation set!\n";
- push(@installer::globals::logfileinfo, $infoline);
-
- if ( -f $newpackagepath ) { unlink $newpackagepath; }
- if ( -d $newpackagepath ) { installer::systemactions::remove_complete_directory($newpackagepath, 1); }
-
- # Keeping the content of @installer::globals::installsetcontent up to date. Removing the last package.
- pop(@installer::globals::installsetcontent);
-}
-
-####################################################
-# Check, if the package is in the pool and if
-# there are no changes in the package.
-####################################################
-
-sub package_is_up_to_date
-{
- my ($allvariables, $onepackage, $packagename, $newepmcontent, $filesinpackage, $installdir, $subdir, $languagestringref) = @_;
-
- installer::logger::print_message_without_newline( "... checking pool package $packagename ..." );
-
- installer::logger::include_header_into_logfile("Checking package in pool: $packagename");
-
- if ( ! $installer::globals::poolpathset ) { installer::packagepool::set_pool_path(); }
- if ( ! $installer::globals::sessionidset ) { installer::packagepool::set_sessionid(); }
-
- my $infoline = "";
- # Resetting some variables for this package
- my $package_is_up_to_date = 0;
- my $realpackagename = "";
- my $oldepmcontent = "";
- my $waited_for_check = 0;
- my $waited_for_lock = 0;
- $installer::globals::newpcfcontentcalculated = 0;
- %installer::globals::pcfdifflist = ();
- @installer::globals::pcfdiffcomment = ();
- @installer::globals::epmdifflist = ();
-
- # Reading the package content file, if this file exists (extension *.pcf)
- my $filename = $installer::globals::poolpath . $installer::globals::separator . $packagename . ".pcf";
- my $checkfilename = $installer::globals::poolpath . $installer::globals::separator . $packagename . ".pcf.check";
- my $lockfilename = $installer::globals::poolpath . $installer::globals::separator . $packagename . ".pcf.lock";
- # Saving name in global variable, so that this file can be removed somewhere else (at the end of "put_content_into_pool").
- $installer::globals::poolcheckfilename = $checkfilename;
- $installer::globals::poollockfilename = $lockfilename;
-
- my @checkfilecontent = ("$installer::globals::sessionid $installer::globals::product $$languagestringref $checkfilename"); # $$ is the process id
- my @lockfilecontent = ("$installer::globals::sessionid $installer::globals::product $$languagestringref $lockfilename"); # $$ is the process id
-
- # Waiting, step 1
- # Checking, if another process checks this package at the moment
- my $timecounter = 0;
- while ( -f $checkfilename )
- {
- $timecounter++;
-
- # including an exit to enable creation of other packages
- if (( $timecounter == 1 ) && ( ! exists($installer::globals::poolshiftedpackages{$packagename}) ))
- {
- $package_is_up_to_date = 3; # repeat this package later
- return $package_is_up_to_date;
- }
-
- $infoline = "Pool: $checkfilename exists. WAITING 10 seconds ($timecounter).\n";
- if ( $timecounter == 1 ) { installer::logger::print_message( "\n" ); }
- installer::logger::print_message( "... $infoline" );
- push( @installer::globals::logfileinfo, $infoline);
- # if ( $timecounter % 50 == 0 ) { check_pool_exit($checkfilename, $timecounter); }
- if ( $timecounter % 100 == 0 ) { check_pool_exit($checkfilename, $timecounter); }
- sleep 10; # process sleeps 10 seconds
- $waited_for_check = 1;
- }
-
- # Creating file, showing that this package is checked at the moment by this process. No other process can reach this.
- installer::files::save_file($checkfilename, \@checkfilecontent); # Creating the Lock, to check this package. This blocks all other processes.
- $installer::globals::processhaspoolcheckfile = 1;
-
- # Check, if the Lock file creation was really successful
- if ( ! -f $checkfilename )
- {
- $infoline = "Pool problem: Pool lock file \"$checkfilename\" could not be created successfully or was removed by another process (A)!\n";
- push( @installer::globals::logfileinfo, $infoline);
- log_pool_info(0);
- $package_is_up_to_date = 4; # repeat this package
- return $package_is_up_to_date;
- }
-
- if ( ! process_is_owner($checkfilename) )
- {
- $infoline = "Pool problem: Pool lock file \"$checkfilename\" belongs to another process (A)!\n";
- push( @installer::globals::logfileinfo, $infoline);
- log_pool_info(1);
- $package_is_up_to_date = 4; # repeat this package
- return $package_is_up_to_date;
- }
-
- $infoline = "Pool: Created file: $checkfilename\n";
- push( @installer::globals::logfileinfo, $infoline);
- if ( $waited_for_check ) { installer::logger::print_message( "... $infoline" ); }
-
- # Waiting, step 2
- # Checking, if another process creates this package at the moment
- $timecounter = 0;
- while ( -f $lockfilename )
- {
- $timecounter++;
- $infoline = "Pool: $lockfilename exists. WAITING 10 seconds ($timecounter).\n";
- if ( $timecounter == 1 ) { installer::logger::print_message( "\n" ); }
- installer::logger::print_message( "... $infoline" );
- push( @installer::globals::logfileinfo, $infoline);
- # if ( $timecounter % 50 == 0 ) { check_pool_exit($lockfilename, $timecounter); }
- if ( $timecounter % 100 == 0 ) { check_pool_exit($lockfilename, $timecounter); }
- sleep 10; # process sleeps 10 seconds
- $waited_for_lock = 1;
- }
-
- # No lock file exists, therefore no process creates this package at the moment. Check can be done now.
- if ( $waited_for_lock ) { installer::logger::print_message( "... Pool: Proceeding, $lockfilename was removed.\n" ); }
-
- my $package_already_exists = 0;
-
- if ( -f $filename )
- {
- # Calculating content for pcf file
- $installer::globals::newpcfcontent = calculate_current_content($filesinpackage, $packagename);
- $installer::globals::newpcfcontentcalculated = 1;
-
- # reading the existing pcf file
- ($realpackagename, $oldpcfcontent, $oldepmcontent) = read_pcf_content($filename);
-
- # First check: Package has to exist in pool (directories on Solaris)
- my $fullpackage = $installer::globals::poolpath . $installer::globals::separator . $realpackagename;
- if ( $installer::globals::issolarisbuild ) { $fullpackage = $fullpackage . ".tar"; }
- if ( -f $fullpackage )
- {
- $package_already_exists = 1;
- # Second check: Only files
- my $content_is_identical = compare_package_content($oldpcfcontent, $installer::globals::newpcfcontent);
-
- # Third check for Unix: Changes in the epm file?
- if (( $content_is_identical ) && ( ! $installer::globals::iswindowsbuild ))
- {
- $content_is_identical = compare_epm_content($oldepmcontent, $newepmcontent);
- }
-
- if ( $content_is_identical ) { $package_is_up_to_date = 1; }
- }
- }
-
- if ( $package_is_up_to_date )
- {
- $infoline = "Pool: $packagename: No new content, using existing package\n";
- push( @installer::globals::logfileinfo, $infoline);
- installer::logger::print_message( "... using package from pool\n" );
- }
- else
- {
- if ( $package_already_exists )
- {
- $infoline = "Pool: $packagename: Contains new content, creating new package. Differences:\n";
- push( @installer::globals::logfileinfo, $infoline);
- foreach my $dest ( sort keys %installer::globals::pcfdifflist ) { push( @installer::globals::logfileinfo, "$dest\n"); }
- foreach my $dest ( @installer::globals::pcfdiffcomment ) { push( @installer::globals::logfileinfo, "$dest"); }
- foreach my $dest ( @installer::globals::epmdifflist ) { push( @installer::globals::logfileinfo, "$dest"); }
- }
- else
- {
- $infoline = "Pool: $packagename: Does not exist in pool.\n";
- push( @installer::globals::logfileinfo, $infoline);
- }
-
- installer::logger::print_message( "... packaging required\n" );
- %installer::globals::xpdpackageinfo = (); # reset the filled hash, because the package cannot be used.
-
- # Creating lock mechanism, so that other processes do not create this package, too.
- installer::files::save_file($lockfilename, \@lockfilecontent); # Creating the Lock, to create this package (Lock for check still exists).
- $installer::globals::processhaspoollockfile = 1;
-
- # Check if creation of Lock file was really successful
-
- if ( ! -f $lockfilename )
- {
- $infoline = "Pool problem: Pool lock file \"$lockfilename\" could not be created successfully or was removed by another process (D)!\n";
- push( @installer::globals::logfileinfo, $infoline);
- log_pool_info(0);
- $package_is_up_to_date = 4; # repeat this package
- return $package_is_up_to_date;
- }
-
- if ( ! process_is_owner($lockfilename) )
- {
- $infoline = "Pool problem: Pool lock file \"$lockfilename\" belongs to another process (D)!\n";
- push( @installer::globals::logfileinfo, $infoline);
- log_pool_info(1);
- $package_is_up_to_date = 4; # repeat this package
- return $package_is_up_to_date;
- }
-
- $infoline = "Pool: Created file: $lockfilename\n";
- push( @installer::globals::logfileinfo, $infoline);
- }
-
- my $newpackagepath = "";
-
- if ( $package_is_up_to_date )
- {
- # Before the package is copied into the installation set, it has to be checked, if this process is really the owner of this lock file..
- # Check, if lock file still exists and if this process is the owner.
-
- if ( ! -f $checkfilename )
- {
- $infoline = "Pool problem: Pool lock file \"$checkfilename\" was removed by another process (B)!\n";
- push( @installer::globals::logfileinfo, $infoline);
- log_pool_info(0);
- $package_is_up_to_date = 4; # repeat this package
- return $package_is_up_to_date;
- }
-
- if ( ! process_is_owner($checkfilename) )
- {
- $infoline = "Pool problem: Pool lock file \"$checkfilename\" belongs to another process (B)!\n";
- push( @installer::globals::logfileinfo, $infoline);
- log_pool_info(1);
- $package_is_up_to_date = 4; # repeat this package
- return $package_is_up_to_date;
- }
-
- # Copying the package from the pool into the installation set
- $newpackagepath = copy_package_from_pool($installdir, $subdir, $realpackagename);
- }
-
- # Before the lock file in the pool can be removed, it has to be checked, if this process is still the owner of this lock file.
- # Check, if lock file still exists and if this process is the owner.
- if ( ! -f $checkfilename )
- {
- $infoline = "Pool problem: Pool lock file \"$checkfilename\" was removed by another process (C)!\n";
- push( @installer::globals::logfileinfo, $infoline);
- log_pool_info(0);
-
- # removing new package from installation set
- if ( $newpackagepath ne "" ) { remove_package_from_installset($newpackagepath); } # A file was copied and a problem occurred with pooling
-
- $package_is_up_to_date = 4; # repeat this package
- return $package_is_up_to_date;
- }
-
- if ( ! process_is_owner($checkfilename) )
- {
- $infoline = "Pool problem: Pool lock file \"$checkfilename\" belongs to another process (C)!\n";
- push( @installer::globals::logfileinfo, $infoline);
- log_pool_info(1);
-
- # removing new package from installation set
- if ( $newpackagepath ne "" ) { remove_package_from_installset($newpackagepath); } # A file was copied and a problem occurred with pooling
-
- $package_is_up_to_date = 4; # repeat this package
- return $package_is_up_to_date;
- }
-
- # Removing the check file, releasing this package for the next process.
- # The Lock to create this package still exists, if required.
- unlink $checkfilename;
- $installer::globals::processhaspoolcheckfile = 0;
- $infoline = "Pool: Removing file: $checkfilename\n";
- push( @installer::globals::logfileinfo, $infoline);
-
- # Last chance before packaging starts, to check, if this process is really still owner
- # of the packaging lock file. If not, this packaging process can be repeated.
- if ( $installer::globals::processhaspoollockfile )
- {
- if ( ! -f $lockfilename )
- {
- $infoline = "Pool problem: Pool lock file \"$lockfilename\" was removed by another process (E)!\n";
- push( @installer::globals::logfileinfo, $infoline);
- log_pool_info(0);
- $package_is_up_to_date = 4; # repeat this package
- return $package_is_up_to_date;
- }
-
- if ( ! process_is_owner($lockfilename) )
- {
- $infoline = "Pool problem: Pool lock file \"$lockfilename\" belongs to another process (E)!\n";
- push( @installer::globals::logfileinfo, $infoline);
- log_pool_info(1);
- $package_is_up_to_date = 4; # repeat this package
- return $package_is_up_to_date;
- }
- }
-
- # Collecting log information
- if ( $package_is_up_to_date == 1 ) { $installer::globals::poolpackages{$packagename} = 1; }
- if ( $package_is_up_to_date == 0 )
- {
- my @packreasons = ();
- if ( $package_already_exists )
- {
- $infoline = "\t\tPool: $packagename: Contains new content, creating new package. Differences:\n";
- push( @packreasons, $infoline);
- foreach my $dest ( sort keys %installer::globals::pcfdifflist ) { push( @packreasons, "\t\t$dest\n"); }
- foreach my $dest ( @installer::globals::pcfdiffcomment ) { push( @packreasons, "\t\t$dest"); }
- foreach my $dest ( @installer::globals::epmdifflist ) { push( @packreasons, "\t\t$dest"); }
- }
- else
- {
- $infoline = "\t\tPool: $packagename: Does not exist in pool.\n";
- push( @packreasons, $infoline);
- }
-
- $installer::globals::createpackages{$packagename} = \@packreasons;
- }
-
- return $package_is_up_to_date;
-}
-
-###################################################
-# Determine, which package was created newly
-###################################################
-
-sub determine_new_packagename
-{
- my ( $dir ) = @_;
-
- my ($newcontent, $allcontent) = installer::systemactions::find_new_content_in_directory($dir, \@installer::globals::installsetcontent);
- @installer::globals::installsetcontent = ();
- foreach my $element ( @{$allcontent} ) { push(@installer::globals::installsetcontent, $element); }
-
- my $newentriesnumber = $#{$newcontent} + 1;
- if ( $newentriesnumber > 1 )
- {
- my $newpackages = "";
- foreach my $onepackage ( @{$newcontent} ) { $newpackages = $newpackages . " " . $onepackage; }
- installer::exiter::exit_program("ERROR: More than one new package in directory $dir ($newpackages)", "determine_new_packagename (packagepool)");
- }
- elsif ( $newentriesnumber < 1 )
- {
- installer::exiter::exit_program("ERROR: No new package in directory $dir", "determine_new_packagename (packagepool)");
- }
- my $newpackage = ${$newcontent}[0];
-
- return $newpackage;
-}
-
-####################################################
-# Including content into the package pool
-####################################################
-
-sub put_content_into_pool
-{
- my ($packagename, $installdir, $subdir, $filesinpackage, $epmfilecontent) = @_;
-
- my $infoline = "";
-
- my $fullinstalldir = $installdir . $installer::globals::separator . $subdir;
- my $fullrealpackagename = determine_new_packagename($fullinstalldir);
- my $realpackagename = $fullrealpackagename;
- installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$realpackagename);
-
- installer::logger::include_header_into_logfile("Adding content into the package pool: $realpackagename (PackageName: $packagename)");
-
- # Calculating content for pcf file, if not already done in "package_is_up_to_date"
- if ( ! $installer::globals::newpcfcontentcalculated )
- {
- $installer::globals::newpcfcontent = calculate_current_content($filesinpackage, $packagename);
- $installer::globals::newpcfcontentcalculated = 1;
- }
-
- # Determining md5sum and FileSize for the new package and saving in pcf file
- my $md5sum = installer::xpdinstaller::get_md5_value($fullrealpackagename);
- my $filesize = installer::xpdinstaller::get_size_value($fullrealpackagename);
- my $fullpackagename = installer::xpdinstaller::get_fullpkgname_value($fullrealpackagename);
- my $pkgversion = installer::xpdinstaller::get_pkgversion_value($fullrealpackagename);
-
- # Put package content file (pcf) into pool
- my $pcffilename = $installer::globals::poolpath . $installer::globals::separator . $packagename . ".pcf";
- create_pcfcontent_file($realpackagename, $md5sum, $filesize, $fullpackagename, $pkgversion, $epmfilecontent, $pcffilename);
-
- # Creating xpd info
- $installer::globals::xpdpackageinfo{'FileSize'} = $filesize;
- $installer::globals::xpdpackageinfo{'FullPackageName'} = $fullpackagename;
- $installer::globals::xpdpackageinfo{'md5sum'} = $md5sum;
- $installer::globals::xpdpackageinfo{'RealPackageName'} = $realpackagename;
- $installer::globals::xpdpackageinfo{'PkgVersion'} = $pkgversion;
-
- # Put package into pool
- $infoline = "Pool: Adding package \"$packagename\" into pool.\n";
- push( @installer::globals::logfileinfo, $infoline);
-
- # Copying with unique name, containing PID. Only renaming if everything was fine.
- my $realdestination = "";
- my $uniquedestination = "";
- if ( -f $fullrealpackagename )
- {
- $realdestination = $installer::globals::poolpath . $installer::globals::separator . $realpackagename;
- $uniquedestination = $realdestination . "." . $installer::globals::sessionid;
- installer::systemactions::copy_one_file($fullrealpackagename, $uniquedestination);
- }
-
- # Copying Solaris packages (as tar files)
- if ( -d $fullrealpackagename )
- {
- my $tarfilename = $packagename . ".tar";
- my $fulltarfilename = $fullinstalldir . $installer::globals::separator . $tarfilename;
- my $size = installer::worker::tar_package($fullinstalldir, $packagename, $tarfilename, $installer::globals::getuidpath);
- if (( ! -f $fulltarfilename ) || ( ! ( $size > 0 ))) { installer::exiter::exit_program("ERROR: Missing file: $fulltarfilename", "put_content_into_pool"); }
- $realdestination = $installer::globals::poolpath . $installer::globals::separator . $tarfilename;
- $uniquedestination = $realdestination . "." . $installer::globals::sessionid;
- installer::systemactions::copy_one_file($fulltarfilename, $uniquedestination);
- unlink $fulltarfilename;
- }
-
- # Before the new package is renamed in the pool, it has to be checked, if this process still has the lock for this package.
- # Check, if lock file still exists and if this process is the owner. Otherwise a pool error occurred.
- if ( ! -f $installer::globals::poollockfilename )
- {
- unlink $uniquedestination; # removing file from pool
- log_pool_info(0);
- installer::exiter::exit_program("ERROR: Pool lock file \"$installer::globals::poollockfilename\" was removed by another process (F)!", "put_content_into_pool");
- }
-
- if ( ! process_is_owner($installer::globals::poollockfilename) )
- {
- unlink $uniquedestination; # removing file from pool
- log_pool_info(1);
- installer::exiter::exit_program("ERROR: Pool lock file \"$installer::globals::poollockfilename\" belongs to another process (F)!", "put_content_into_pool");
- }
-
- # Renaming the file in the pool (atomic step)
- rename($uniquedestination, $realdestination);
-
- $infoline = "Pool: Renamed file: \"$uniquedestination\" to \"$realdestination\".\n";
- push( @installer::globals::logfileinfo, $infoline);
-
- # Before the lock file in the pool can be removed, it has to be checked, if this process is still the owner of this lock file.
- # Check, if lock file still exists and if this process is the owner. Otherwise a pool error occurred.
- if ( ! -f $installer::globals::poollockfilename )
- {
- log_pool_info(0);
- installer::exiter::exit_program("ERROR: Pool lock file \"$installer::globals::poollockfilename\" was removed by another process (G)!", "put_content_into_pool");
- }
-
- if ( ! process_is_owner($installer::globals::poollockfilename) )
- {
- log_pool_info(1);
- installer::exiter::exit_program("ERROR: Pool lock file \"$installer::globals::poollockfilename\" belongs to another process (G)!", "put_content_into_pool");
- }
-
- # Removing lock file, so that other processes can use this package now
- unlink $installer::globals::poollockfilename;
- $installer::globals::processhaspoollockfile = 0;
- $infoline = "Pool: Removing file: $installer::globals::poollockfilename\n";
- push( @installer::globals::logfileinfo, $infoline);
-}
-
-###################################################################
-# Copying a package from the pool into the installation set
-###################################################################
-
-sub copy_package_from_pool
-{
- my ($installdir, $subdir, $packagename) = @_;
-
- my $infoline = "Pool: Using package \"$packagename\" from pool.\n";
- push( @installer::globals::logfileinfo, $infoline);
- my $sourcefile = $installer::globals::poolpath . $installer::globals::separator . $packagename;
- if ( $installer::globals::issolarisbuild ) { $sourcefile = $sourcefile . ".tar"; }
- if ( ! -f $sourcefile ) { installer::exiter::exit_program("ERROR: Missing package in package pool: \"$sourcefile\"", "copy_package_from_pool"); }
- my $destination = $installdir . $installer::globals::separator . $subdir;
- if ( ! -d $destination ) { installer::systemactions::create_directory($destination); }
- my $destinationfile = $destination . $installer::globals::separator . $packagename;
- if ( $installer::globals::issolarisbuild ) { $destinationfile = $destinationfile . ".tar"; }
- if ( -f $sourcefile ) { installer::systemactions::copy_one_file($sourcefile, $destinationfile); }
- # Unpacking for Solaris
- if ( $installer::globals::issolarisbuild )
- {
- my $tarfilename = $packagename . ".tar";
- installer::worker::untar_package($destination, $tarfilename, $installer::globals::getuidpath);
- unlink $destinationfile;
- $destinationfile =~ s/.tar\s*$//;
- }
-
- # Keeping the content of @installer::globals::installsetcontent up to date (with full pathes):
- push(@installer::globals::installsetcontent, $destinationfile);
-
- return $destinationfile;
-}
-
-###################################################################
-# Counting keys in hash
-###################################################################
-
-sub get_count
-{
- my ( $hashref ) = @_;
-
- my $counter = 0;
- foreach my $onekey ( keys %{$hashref} ) { $counter++; }
- return $counter;
-}
-
-###################################################################
-# Logging some pool information
-###################################################################
-
-sub log_pool_statistics
-{
- my $infoline = "";
-
- installer::logger::include_header_into_logfile("Pool statistics:");
-
- # Info collected in global hashes
- # %installer::globals::createpackages
- # %installer::globals::poolpackages
-
- my $pool_packages = get_count(\%installer::globals::poolpackages);
- my $created_packages = get_count(\%installer::globals::createpackages);
-
- $infoline = "Number of packages from pool: $pool_packages\n";
- push( @installer::globals::logfileinfo, $infoline);
-
- foreach my $packagename ( sort keys(%installer::globals::poolpackages) )
- {
- $infoline = "\t$packagename\n";
- push( @installer::globals::logfileinfo, $infoline);
- }
-
- $infoline = "\nNumber of packages that were created: $created_packages\n";
- push( @installer::globals::logfileinfo, $infoline);
-
- foreach my $packagename ( sort keys(%installer::globals::createpackages) )
- {
- $infoline = "\t$packagename\n";
- push( @installer::globals::logfileinfo, $infoline);
- my $reason = $installer::globals::createpackages{$packagename};
-
- for ( my $i = 0; $i <= $#{$reason}; $i++ )
- {
- $infoline = "${$reason}[$i]";
- push( @installer::globals::logfileinfo, $infoline);
- }
- }
-}
-
-1;
commit 42b7c64e528081ff1512adac214b266145a08926
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Tue Dec 13 10:13:39 2011 +0200
Bin a commented out block of crack
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index bdf8ca2..f166e80 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -1934,19 +1934,6 @@ UNOUCRDEPxxx : $(UNOUCRDEP);
.ENDIF # "$(UNOTYPES)" != ""
-##new hid.lst trigger with GEN_HID2=TRUE
-#$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid.lst .PHONY :
-# @echo "Making: " $@
-# @echo $(WORK_STAMP).$(LAST_MINOR) 010101010101010 > $@.$(ROUT).tmp
-# $(COMMAND_ECHO)$(TYPE) $(SOLARCOMMONBINDIR)/hid/*.hid | tr -d "\015" | $(SORT) -u >> $@.$(ROUT).tmp
-# @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-# @-$(RENAME) $@.$(ROUT).tmp $@
-# @-mkdir $(@:d)hid
-# $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/gen_userfeedback_VCL_names.pl $@ $(SOLARCOMMONBINDIR)/win $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv.$(ROUT).tmp
-# @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv $(FI)
-# @-$(RENAME) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv.$(ROUT).tmp $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv
-
-
.IF "$(SOLAR_JAVA)"!=""
.IF "$(JAVACLASSFILES:s/DEFINED//)$(javauno)"!=""
.INCLUDE : tg_java.mk
commit 91963613934e746ed7b5f1d2905d28ecb3d1a269
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Tue Dec 13 10:11:22 2011 +0200
Bin unused use of WORK_STAMP
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index 05c4540..c524ce5 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -438,7 +438,6 @@ sub init_globals
my $common_outdir = $ENV{'COMMON_OUTDIR'};
my $inpath = $ENV{'INPATH'};
my $solarversion = $ENV{'SOLARVERSION'};
- my $work_stamp = $ENV{'WORK_STAMP'};
# do we have a valid environment?
if ( !defined($inpath) ) {
commit b7bd441a7f907114d3e911a440e1b1ffd9b3601b
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Tue Dec 13 10:10:49 2011 +0200
Bin a few lines of weird crack
diff --git a/sal/osl/unx/makefile.mk b/sal/osl/unx/makefile.mk
index 58d496f..1b0b4e3 100644
--- a/sal/osl/unx/makefile.mk
+++ b/sal/osl/unx/makefile.mk
@@ -28,11 +28,7 @@
PRJ=..$/..
PRJNAME=sal
-.IF "$(WORK_STAMP)"=="MIX364"
-TARGET=cppsal
-.ELSE
TARGET=cpposl
-.ENDIF
USE_LDUMP2=TRUE
TARGETTYPE=CUI
commit 5317a92f5712c2f06b6831d5f093ebdbfff699b9
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Tue Dec 13 09:53:08 2011 +0200
Bin unused subs
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index ec8dc11..760642d 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -2213,26 +2213,6 @@ sub get_modes {
$build_modes{$option}++;
};
-sub get_list_of_modules {
- my $option = '';
- my $hash_ref = shift;
- while ($option = shift @ARGV) {
- if ($option =~ /^-+/) {
- unshift(@ARGV, $option);
- return;
- } else {
- if ($option =~ /,/) {
- foreach (split /,/, $option) {
- next if (!$_);
- $$hash_ref{$_}++;
- };
- } else {
- $$hash_ref{$option}++;
- };
- };
- };
-};
-
sub get_modules_passed {
my $hash_ref = shift;
my $option = '';
@@ -2251,121 +2231,6 @@ sub get_modules_passed {
};
};
-sub get_platforms {
- my $platforms_ref = shift;
- if ($only_platform) {
- foreach (split(',', $only_platform)) {
- $$platforms_ref{$_}++;
- }
- $platforms_ref = \%platforms_to_copy;
- };
-
- if (!scalar keys %platforms) {
- # An Auses wish - fallback to INPATH for new platforms
- if (defined $ENV{INPATH}) {
- $$platforms_ref{$ENV{INPATH}}++;
- } else {
- print_error("There is no platform found!!") ;
- };
- };
-};
-
-#
-# This procedure clears solver from delivered
-# by the modules to be build
-#
-sub clear_delivered {
- my $message = 'Clearing up delivered';
- my %backup_vars;
- my $deliver_delete_switches = '-delete';
- if (scalar keys %platforms < scalar keys %platforms_to_copy) {
- $message .= ' without common trees';
- $deliver_delete_switches .= ' -dontdeletecommon';
- $only_common = '';
- };
- print "$message\n";
-
- foreach my $platform (keys %platforms) {
- print "\nRemoving files delivered for $platform\n";
- my %solar_vars = ();
- read_ssolar_vars($platform, \%solar_vars);
- if (scalar keys %solar_vars) {
- foreach (keys %solar_vars) {
- if (!defined $backup_vars{$_}) {
- $backup_vars{$_} = $ENV{$_};
- };
- $ENV{$_} = $solar_vars{$_};
- };
- };
- my $undeliver = "$deliver_command $deliver_delete_switches $nul";
- foreach my $module (sort @modules_built) {
- if (chdir($module_paths{$module})) {
- print "Removing delivered from module $module\n";
- next if ($show);
- if (system($undeliver)) {
- $ENV{$_} = $backup_vars{$_} foreach (keys %backup_vars);
- print_error("Cannot run: $undeliver");
- }
- } else {
- push(@warnings, "Could not remove delivered files from the module $module. Your build can become inconsistent.\n");
- };
- };
- };
- $ENV{$_} = $backup_vars{$_} foreach (keys %backup_vars);
-};
-
-#
-# Run setsolar for given platform and
-# write all variables needed in %solar_vars hash
-#
-sub read_ssolar_vars {
- my ($setsolar, $tmp_file);
- $setsolar = $ENV{ENV_ROOT} . '/etools/setsolar.pl';
- my ($platform, $solar_vars) = @_;
- $setsolar = '/net/jumbo2.germany/buildenv/r/etools/setsolar.pl' if ! -e $setsolar;
- $tmp_file = $ENV{HOME} . "/.solar.env.$$.tmp";
- if (!-e $setsolar) {
- print STDERR "There is no setsolar found. Falling back to current platform settings\n";
- return;
- }
- my $pro = "";
- if ($platform =~ /\.pro$/) {
- $pro = "-pro";
- $platform = $`;
- };
-
- my ($source_root, $cwsname);
- $source_root = '-sourceroot' if (defined $ENV{SOURCE_ROOT_USED});
-
- my $param = "-$ENV{WORK_STAMP} $source_root $pro $platform";
- my $ss_command = "$perl $setsolar -file $tmp_file $param $nul";
- if (system($ss_command)) {
- unlink $tmp_file;
- print_error("Cannot run command:\n$ss_command");
- };
- get_solar_vars($solar_vars, $tmp_file);
-};
-
-#
-# read variables to hash
-#
-sub get_solar_vars {
- my ($solar_vars, $file) = @_;
- my ($var, $value);
- open SOLARTABLE, "<$file" or die "can't open solarfile $file";
- while(<SOLARTABLE>) {
- s/\r\n//o;
- next if(!/^\w+\s+(\w+)/o);
- next if (!defined $deliver_env{$1});
- $var = $1;
- /\'(\S+)\'$/o;
- $value = $1;
- $$solar_vars{$var} = $value;
- };
- close SOLARTABLE;
- unlink $file;
-}
-
#
# Store all available build modi in %build_modes
#
commit 5b4bcc81e1d6a8bea8851faa7781dfada092adb4
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Tue Dec 13 09:38:33 2011 +0200
Kill unused variable
diff --git a/set_soenv.in b/set_soenv.in
index f0e745e..2150be5 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -33,7 +33,7 @@ use File::Basename;
# IIa. Declaring variables for the system commands, etc.
#--------------------------------------------------------
#
-my ( $outfile, $bootfile, $newline, $comment,
+my ( $outfile, $newline, $comment,
$ds, $ps,
$wps, $cur_dir, $par_dir, $I, $L, $tmp, $MINGW,
$platform,
More information about the Libreoffice-commits
mailing list