openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1544164 [1/2] - in /openoffice/branches/ooxml-osba: ./ main/ main/autodoc/source/ary/cpp/ main/autodoc/source/display/html/ main/autodoc/source/display/inc/toolkit/ main/autodoc/source/parser/cpp/ main/autodoc/source/parser_i/idl/ main/ins...
Date Thu, 21 Nov 2013 12:58:59 GMT
Author: jsc
Date: Thu Nov 21 12:58:58 2013
New Revision: 1544164

URL: http://svn.apache.org/r1544164
Log:
update to trunk

Modified:
    openoffice/branches/ooxml-osba/   (props changed)
    openoffice/branches/ooxml-osba/main/autodoc/source/ary/cpp/namechain.cxx
    openoffice/branches/ooxml-osba/main/autodoc/source/display/html/easywri.cxx
    openoffice/branches/ooxml-osba/main/autodoc/source/display/inc/toolkit/outputstack.hxx
    openoffice/branches/ooxml-osba/main/autodoc/source/parser/cpp/sownstck.hxx
    openoffice/branches/ooxml-osba/main/autodoc/source/parser_i/idl/distrib.cxx
    openoffice/branches/ooxml-osba/main/autodoc/source/parser_i/idl/pe_excp.cxx
    openoffice/branches/ooxml-osba/main/autodoc/source/parser_i/idl/pe_iface.cxx
    openoffice/branches/ooxml-osba/main/autodoc/source/parser_i/idl/pe_servi.cxx
    openoffice/branches/ooxml-osba/main/autodoc/source/parser_i/idl/pe_singl.cxx
    openoffice/branches/ooxml-osba/main/autodoc/source/parser_i/idl/pe_struc.cxx
    openoffice/branches/ooxml-osba/main/configure.in
    openoffice/branches/ooxml-osba/main/instsetoo_native/util/openoffice.lst
    openoffice/branches/ooxml-osba/main/set_soenv.in
    openoffice/branches/ooxml-osba/main/solenv/bin/make_installer.pl
    openoffice/branches/ooxml-osba/main/solenv/bin/modules/installer/windows/directory.pm
    openoffice/branches/ooxml-osba/main/solenv/gbuild/platform/macosx.mk
    openoffice/branches/ooxml-osba/main/solenv/inc/unxmacx.mk
    openoffice/branches/ooxml-osba/main/sw/source/core/inc/tabfrm.hxx
    openoffice/branches/ooxml-osba/main/sw/source/core/layout/tabfrm.cxx
    openoffice/branches/ooxml-osba/main/sw/source/filter/ww8/ww8par.cxx
    openoffice/branches/ooxml-osba/main/winaccessibility/source/UAccCOM/makefile.mk

Propchange: openoffice/branches/ooxml-osba/
------------------------------------------------------------------------------
  Merged /openoffice/trunk:r1543343-1544163

Modified: openoffice/branches/ooxml-osba/main/autodoc/source/ary/cpp/namechain.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/autodoc/source/ary/cpp/namechain.cxx?rev=1544164&r1=1544163&r2=1544164&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/autodoc/source/ary/cpp/namechain.cxx (original)
+++ openoffice/branches/ooxml-osba/main/autodoc/source/ary/cpp/namechain.cxx Thu Nov 21 12:58:58 2013
@@ -129,7 +129,7 @@ NameChain::Add_Segment( const char * i_s
 List_TplParameter &
 NameChain::Templatize_LastSegment()
 {
-	csv_assert( aSegments.size() > 0 );
+	csv_assert( ! aSegments.empty() );
 
 	return aSegments.back().AddTemplate();
 }
@@ -158,7 +158,7 @@ NameChain::Compare( const NameChain & i_
 const String  &
 NameChain::LastSegment() const
 {
-	if ( aSegments.size() > 0 )
+	if ( ! aSegments.empty() )
 		return aSegments.back().Name();
 	return String::Null_();
 }

Modified: openoffice/branches/ooxml-osba/main/autodoc/source/display/html/easywri.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/autodoc/source/display/html/easywri.cxx?rev=1544164&r1=1544163&r2=1544164&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/autodoc/source/display/html/easywri.cxx (original)
+++ openoffice/branches/ooxml-osba/main/autodoc/source/display/html/easywri.cxx Thu Nov 21 12:58:58 2013
@@ -53,7 +53,7 @@ EasyWriter::Finish_OutputNode()
 csi::xml::Element &
 EasyWriter::Out()
 {
-    csv_assert( aCurDestination.size() > 0);
+    csv_assert( ! aCurDestination.empty() );
     return *aCurDestination.top();
 }
 

Modified: openoffice/branches/ooxml-osba/main/autodoc/source/display/inc/toolkit/outputstack.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/autodoc/source/display/inc/toolkit/outputstack.hxx?rev=1544164&r1=1544163&r2=1544164&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/autodoc/source/display/inc/toolkit/outputstack.hxx (original)
+++ openoffice/branches/ooxml-osba/main/autodoc/source/display/inc/toolkit/outputstack.hxx Thu Nov 21 12:58:58 2013
@@ -57,7 +57,7 @@ class OutputStack
 inline csi::xml::Element &
 OutputStack::Out() const
 {
-    csv_assert( aCurDestination.size() > 0 );
+    csv_assert( ! aCurDestination.empty() );
     return *aCurDestination.top();
 }
 

Modified: openoffice/branches/ooxml-osba/main/autodoc/source/parser/cpp/sownstck.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/autodoc/source/parser/cpp/sownstck.hxx?rev=1544164&r1=1544163&r2=1544164&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/autodoc/source/parser/cpp/sownstck.hxx (original)
+++ openoffice/branches/ooxml-osba/main/autodoc/source/parser/cpp/sownstck.hxx Thu Nov 21 12:58:58 2013
@@ -113,7 +113,7 @@ inline ary::cpp::Namespace &
 ContextForAry::
 S_OwnerStack::CurNamespace() const
 {
-    csv_assert( aStack_Namespaces.size() > 0 );
+    csv_assert( ! aStack_Namespaces.empty() );
     return *aStack_Namespaces.top();
 }
 
@@ -204,7 +204,7 @@ inline void
 ContextForAry::
 S_OwnerStack::SetCurProtection( ary::cpp::E_Protection i_eProtection )
 {
-    csv_assert( aStack_Classes.size() > 0 );
+    csv_assert( ! aStack_Classes.empty() );
     aStack_Classes.top().second = i_eProtection;
 }
 

Modified: openoffice/branches/ooxml-osba/main/autodoc/source/parser_i/idl/distrib.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/autodoc/source/parser_i/idl/distrib.cxx?rev=1544164&r1=1544163&r2=1544164&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/autodoc/source/parser_i/idl/distrib.cxx (original)
+++ openoffice/branches/ooxml-osba/main/autodoc/source/parser_i/idl/distrib.cxx Thu Nov 21 12:58:58 2013
@@ -129,7 +129,7 @@ if (DEBUG_ShowTokens())
 UnoIDL_PE &
 TokenDistributor::ProcessingData::CurEnvironment() const
 {
-	csv_assert(aEnvironments.size() > 0);
+	csv_assert(!aEnvironments.empty());
 	csv_assert(aEnvironments.back().first != 0);
 
 	return *aEnvironments.back().first;

Modified: openoffice/branches/ooxml-osba/main/autodoc/source/parser_i/idl/pe_excp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/autodoc/source/parser_i/idl/pe_excp.cxx?rev=1544164&r1=1544163&r2=1544164&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/autodoc/source/parser_i/idl/pe_excp.cxx (original)
+++ openoffice/branches/ooxml-osba/main/autodoc/source/parser_i/idl/pe_excp.cxx Thu Nov 21 12:58:58 2013
@@ -83,7 +83,7 @@ PE_Exception::TransferData()
 {
 	if (NOT Work().bIsPreDeclaration)
 	{
-		csv_assert(Work().sData_Name.size() > 0);
+		csv_assert(! Work().sData_Name.empty());
 		csv_assert(Work().nCurStruct.IsValid());
 	}
 	Stati().pCurStatus = &Stati().aNone;

Modified: openoffice/branches/ooxml-osba/main/autodoc/source/parser_i/idl/pe_iface.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/autodoc/source/parser_i/idl/pe_iface.cxx?rev=1544164&r1=1544163&r2=1544164&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/autodoc/source/parser_i/idl/pe_iface.cxx (original)
+++ openoffice/branches/ooxml-osba/main/autodoc/source/parser_i/idl/pe_iface.cxx Thu Nov 21 12:58:58 2013
@@ -395,7 +395,7 @@ PE_Interface::TransferData()
 {
 	if (NOT bIsPreDeclaration)
 	{
-		csv_assert(sData_Name.size() > 0);
+		csv_assert(!sData_Name.empty());
 		csv_assert(nCurInterface.IsValid());
 	}
 	else

Modified: openoffice/branches/ooxml-osba/main/autodoc/source/parser_i/idl/pe_servi.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/autodoc/source/parser_i/idl/pe_servi.cxx?rev=1544164&r1=1544163&r2=1544164&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/autodoc/source/parser_i/idl/pe_servi.cxx (original)
+++ openoffice/branches/ooxml-osba/main/autodoc/source/parser_i/idl/pe_servi.cxx Thu Nov 21 12:58:58 2013
@@ -304,7 +304,7 @@ PE_Service::TransferData()
 {
 	if (NOT bIsPreDeclaration)
 	{
-		csv_assert(sData_Name.size() > 0);
+		csv_assert(! sData_Name.empty());
 		csv_assert( (pCurService != 0) != (pCurSiService != 0) );
 	}
 

Modified: openoffice/branches/ooxml-osba/main/autodoc/source/parser_i/idl/pe_singl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/autodoc/source/parser_i/idl/pe_singl.cxx?rev=1544164&r1=1544163&r2=1544164&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/autodoc/source/parser_i/idl/pe_singl.cxx (original)
+++ openoffice/branches/ooxml-osba/main/autodoc/source/parser_i/idl/pe_singl.cxx Thu Nov 21 12:58:58 2013
@@ -225,7 +225,7 @@ PE_Singleton::TransferData()
 {
 	if (NOT bIsPreDeclaration)
 	{
-		csv_assert(sData_Name.size() > 0);
+		csv_assert(! sData_Name.empty());
 		csv_assert( (pCurSingleton != 0) != (pCurSiSingleton != 0) );
 	}
 

Modified: openoffice/branches/ooxml-osba/main/autodoc/source/parser_i/idl/pe_struc.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/autodoc/source/parser_i/idl/pe_struc.cxx?rev=1544164&r1=1544163&r2=1544164&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/autodoc/source/parser_i/idl/pe_struc.cxx (original)
+++ openoffice/branches/ooxml-osba/main/autodoc/source/parser_i/idl/pe_struc.cxx Thu Nov 21 12:58:58 2013
@@ -82,7 +82,7 @@ PE_Struct::TransferData()
 {
     if (NOT Work().bIsPreDeclaration)
     {
-        csv_assert(Work().sData_Name.size() > 0);
+        csv_assert(! Work().sData_Name.empty());
         csv_assert(Work().nCurStruct.IsValid());
     }
     Stati().pCurStatus = &Stati().aNone;

Modified: openoffice/branches/ooxml-osba/main/configure.in
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/configure.in?rev=1544164&r1=1544163&r2=1544164&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/configure.in (original)
+++ openoffice/branches/ooxml-osba/main/configure.in Thu Nov 21 12:58:58 2013
@@ -644,7 +644,7 @@ AC_ARG_WITH(system-redland,
 ],,)
 AC_ARG_WITH(stlport,
 [  --with-stlport         Only building --without-stlport is supported.
-], WITH_STLPORT=$withval , WITH_STLPORT=NO)
+], WITH_STLPORT=$withval , WITH_STLPORT=no)
 AC_ARG_WITH(jdk-home,
 [  --with-jdk-home         if you have installed JDK 1.3 or later on your system
                           please supply the path here.
@@ -2694,8 +2694,8 @@ dnl ====================================
 dnl Checks for what the default STL should be
 dnl ===================================================================
    AC_MSG_CHECKING([what the default STL should be])
-   DEFAULT_TO_STLPORT="no"
-if test "$WITH_STLPORT" != "no"; then
+   DEFAULT_TO_STLPORT="NO"
+if test "$WITH_STLPORT" != "NO"; then
    AC_MSG_ERROR([Option --with-stlport is no longer available.])
 else
    USE_SYSTEM_STL="YES"

Modified: openoffice/branches/ooxml-osba/main/instsetoo_native/util/openoffice.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/instsetoo_native/util/openoffice.lst?rev=1544164&r1=1544163&r2=1544164&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/instsetoo_native/util/openoffice.lst (original)
+++ openoffice/branches/ooxml-osba/main/instsetoo_native/util/openoffice.lst Thu Nov 21 12:58:58 2013
@@ -239,48 +239,6 @@ Apache_OpenOffice_Dev
     }
 }
 
-URE
-{
-    Settings
-    {
-        downloadname URE_{productversion}_{os}_install_{languages}
-        variables
-        {
-            FULLPRODUCTNAME URE
-            PRODUCTNAME URE
-            PRODUCTVERSION 4.1.0
-            PACKAGEVERSION 4.1
-            PACKAGEREVISION 1
-            PRODUCTEXTENSION
-            LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION
-            LICENSENAME ALv2
-            SETSTATICPATH 1
-            NOVERSIONINDIRNAME 1
-            PCPFILENAME ure.pcp
-            POOLPRODUCT 0
-            GLOBALFILEGID gid_File_Dl_Cppu
-            DOWNLOADBANNER urebanner.bmp
-            DOWNLOADBITMAP urebitmap.bmp
-            DOWNLOADSETUPICO ooosetup.ico
-            DONTUSESTARTMENUFOLDER 1
-            RELATIVE_PATHES_IN_DDF 1
-            NOLANGUAGESELECTIONPRODUCT 1
-            AOODOWNLOADNAMEPREFIX Apache_OpenOffice-URE
-            STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/
-            STARTCENTER_INFO_URL http://www.openoffice.org
-            STARTCENTER_TEMPLREP_URL http://templates.openoffice.org
-            STARTCENTER_LAYOUT_STYLE 0
-            ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,version.lst
-            PACKAGEMAP package_names_ext.txt
-            DICT_REPO_URL http://extensions.openoffice.org/dictionaries
-        }
-        active 1
-        compression 5
-        script ure
-        include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/ure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/xml.{minor},{solarenvpath}/{os}/MS
-    }
-}
 
 Apache_OpenOffice_SDK
 {
@@ -307,7 +265,6 @@ Apache_OpenOffice_SDK
             NO_README_IN_ROOTDIR 1
             LICENSENAME ALv2
             IGNOREDIRECTORYLAYER 1
-            NOVERSIONINDIRNAME 0
             NOSPACEINDIRECTORYNAME 1
             NOLANGUAGESELECTIONPRODUCT 1
             CHANGETARGETDIR 1
@@ -362,7 +319,6 @@ Apache_OpenOffice_Dev_SDK
             NO_README_IN_ROOTDIR 1
             LICENSENAME ALv2
             IGNOREDIRECTORYLAYER 1
-            NOVERSIONINDIRNAME 0
             NOSPACEINDIRECTORYNAME 1
             NOLANGUAGESELECTIONPRODUCT 1
             CHANGETARGETDIR 1

Modified: openoffice/branches/ooxml-osba/main/set_soenv.in
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/set_soenv.in?rev=1544164&r1=1544163&r2=1544164&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/set_soenv.in (original)
+++ openoffice/branches/ooxml-osba/main/set_soenv.in Thu Nov 21 12:58:58 2013
@@ -1444,8 +1444,7 @@ elsif ($platform =~ m/cygwin/)
 }
 elsif ($platform =~ m/darwin/)
 {
-   my $STLINC .= $I."/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/c++/v1/";
-   $SOLARINC .= $STLINC . $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers";
+   $SOLARINC .= " " . $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers";
 }
 else
 {  AddWarning( "set_soenv", "$platform not configured for system dependant include dir" );
@@ -1678,7 +1677,7 @@ if ( $platform =~ m/darwin/ )
 # unless you want to do runtime checks for 10.5 api, you also want to use the 10.7 sdk
 # (safer/easier than dealing with the MAC_OS_X_VERSION_MAX_ALLOWED macro)
 # http://developer.apple.com/technotes/tn2002/tn2064.html
-    ToFile( "MACOSX_DEPLOYMENT_TARGET",       "10.7",       "e" );
+    ToFile( "MACOSX_DEPLOYMENT_TARGET",       "10.4",       "e" );
 }
 
 #

Modified: openoffice/branches/ooxml-osba/main/solenv/bin/make_installer.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/solenv/bin/make_installer.pl?rev=1544164&r1=1544163&r2=1544164&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/solenv/bin/make_installer.pl (original)
+++ openoffice/branches/ooxml-osba/main/solenv/bin/make_installer.pl Thu Nov 21 12:58:58 2013
@@ -124,8 +124,6 @@ installer::parameter::saveparameter();
 installer::parameter::getparameter();
 
 # debugging can start after function "getparameter"
-if ( $installer::globals::debug ) { installer::logger::debuginfo("\nPart 1: The platform independent part\n"); }
-if ( $installer::globals::debug ) { installer::logger::debuginfo("\nPart 1a: The language independent part\n"); }
 
 installer::parameter::control_fundamental_parameter();
 installer::parameter::setglobalvariables();
@@ -177,22 +175,16 @@ my $ziplistref = installer::files::read_
 $installer::logger::Info->print( "... analyzing $installer::globals::ziplistname ... \n" );
 
 my ($productblockref, $parent) = installer::ziplist::getproductblock($ziplistref, $installer::globals::product, 1);		# product block from zip.lst
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "productblock.log" ,$productblockref); }
 
 my ($settingsblockref, undef) = installer::ziplist::getproductblock($productblockref, "Settings", 0);		# settings block from zip.lst
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "settingsblock1.log" ,$settingsblockref); }
 
 $settingsblockref = installer::ziplist::analyze_settings_block($settingsblockref);				# select data from settings block in zip.lst
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "settingsblock2.log" ,$settingsblockref); }
 
 my $allsettingsarrayref = installer::ziplist::get_settings_from_ziplist($settingsblockref);
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allsettings1.log" ,$allsettingsarrayref); }
 
 my $allvariablesarrayref = installer::ziplist::get_variables_from_ziplist($settingsblockref);
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allvariables1.log" ,$allvariablesarrayref); }
 
 my ($globalproductblockref, undef) = installer::ziplist::getproductblock($ziplistref, $installer::globals::globalblock, 0);		# global product block from zip.lst
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "globalproductblock.log" ,$globalproductblockref); }
 
 while (defined $parent)
 {
@@ -220,41 +212,30 @@ while (defined $parent)
 if ( $#{$globalproductblockref} > -1 )
 {
     my ($globalsettingsblockref, undef) = installer::ziplist::getproductblock($globalproductblockref, "Settings", 0);		# settings block from zip.lst
-    if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "globalsettingsblock1.log" ,$globalsettingsblockref); }
 
     $globalsettingsblockref = installer::ziplist::analyze_settings_block($globalsettingsblockref);				# select data from settings block in zip.lst
-    if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "globalsettingsblock2.log" ,$globalsettingsblockref); }
     
     my $allglobalsettingsarrayref = installer::ziplist::get_settings_from_ziplist($globalsettingsblockref);
-    if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allglobalsettings1.log" ,$allglobalsettingsarrayref); }
 
     my $allglobalvariablesarrayref = installer::ziplist::get_variables_from_ziplist($globalsettingsblockref);
-    if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allglobalvariables1.log" ,$allglobalvariablesarrayref); }
 
     if ( $#{$allglobalsettingsarrayref} > -1 ) { $allsettingsarrayref = installer::converter::combine_arrays_from_references_first_win($allsettingsarrayref, $allglobalsettingsarrayref); }
     if ( $#{$allglobalvariablesarrayref} > -1 ) { $allvariablesarrayref = installer::converter::combine_arrays_from_references_first_win($allvariablesarrayref, $allglobalvariablesarrayref); }
 }
 
 $allsettingsarrayref = installer::ziplist::remove_multiples_from_ziplist($allsettingsarrayref); # the settings from the zip.lst
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allsettings2.log" ,$allsettingsarrayref); }
 
 $allvariablesarrayref = installer::ziplist::remove_multiples_from_ziplist($allvariablesarrayref);
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allvariables2.log" ,$allvariablesarrayref); }
 
 installer::ziplist::replace_variables_in_ziplist_variables($allvariablesarrayref);
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allvariables2a.log" ,$allvariablesarrayref); }
 
 my $allvariableshashref = installer::converter::convert_array_to_hash($allvariablesarrayref);	# the variables from the zip.lst
-if ( $installer::globals::globallogging ) { installer::files::save_hash($loggingdir . "allvariables3.log", $allvariableshashref); }
 
 installer::ziplist::set_default_productversion_if_required($allvariableshashref);
-if ( $installer::globals::globallogging ) { installer::files::save_hash($loggingdir . "allvariables3a.log", $allvariableshashref); }
 
 installer::ziplist::add_variables_to_allvariableshashref($allvariableshashref);
-if ( $installer::globals::globallogging ) { installer::files::save_hash($loggingdir . "allvariables3b.log", $allvariableshashref); }
 
 installer::ziplist::overwrite_ooovendor( $allvariableshashref );
-if ( $installer::globals::globallogging ) { installer::files::save_hash($loggingdir . "allvariables3c.log", $allvariableshashref); }
 
 ########################################################
 # Check if this is simple packaging mechanism
@@ -301,22 +282,16 @@ if ( $$includepathref eq "" )
 }
 
 my $includepatharrayref = installer::converter::convert_stringlist_into_array($includepathref, ",");
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allpatharray1.log" ,$includepatharrayref); }
 
 installer::ziplist::replace_all_variables_in_pathes($includepatharrayref, $pathvariableshashref);
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allpatharray2.log" ,$includepatharrayref); }
 
 installer::ziplist::replace_minor_in_pathes($includepatharrayref);
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allpatharray3.log" ,$includepatharrayref); }
 
 installer::ziplist::replace_packagetype_in_pathes($includepatharrayref);
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allpatharray3a.log" ,$includepatharrayref); }
 
 installer::ziplist::resolve_relative_pathes($includepatharrayref);
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allpatharray3b.log" ,$includepatharrayref); }
 
 installer::ziplist::remove_ending_separator($includepatharrayref);
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allpatharray3c.log" ,$includepatharrayref); }
 
 ##############################################
 # Collecting all files from all include
@@ -371,39 +346,30 @@ my $setupscriptref = installer::files::r
 # All the variables are defined in $allvariablesarrayref
 
 installer::scpzipfiles::replace_all_ziplistvariables_in_file($setupscriptref, $allvariableshashref);
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "setupscript1.log" ,$setupscriptref); }
 
 # Resolving %variables defined in the installation object
 
 my $allscriptvariablesref = installer::setupscript::get_all_scriptvariables_from_installation_object($setupscriptref);
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "setupscriptvariables1.log" ,$allscriptvariablesref); }
 
 installer::setupscript::add_lowercase_productname_setupscriptvariable($allscriptvariablesref);
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "setupscriptvariables2.log" ,$allscriptvariablesref); }
 
 installer::setupscript::resolve_lowercase_productname_setupscriptvariable($allscriptvariablesref);
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "setupscriptvariables3.log" ,$allscriptvariablesref); }
 
 $setupscriptref = installer::setupscript::replace_all_setupscriptvariables_in_script($setupscriptref, $allscriptvariablesref);
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "setupscript2.log" ,$setupscriptref); }
 
 # Adding all variables defined in the installation object into the hash of all variables.
 # This is needed if variables are defined in the installation object, but not in the zip list file.
 # If there is a definition in the zip list file and in the installation object, the installation object is more important
 
 installer::setupscript::add_installationobject_to_variables($allvariableshashref, $allscriptvariablesref);
-if ( $installer::globals::globallogging ) { installer::files::save_hash($loggingdir . "allvariables4.log", $allvariableshashref); }
 
 # Adding also all variables, that must be included into the $allvariableshashref.
 installer::setupscript::add_forced_properties($allvariableshashref);
-if ( $installer::globals::globallogging ) { installer::files::save_hash($loggingdir . "allvariables5.log", $allvariableshashref); }
 
 # Replacing preset properties, not using the default mechanisms (for example for UNIXPRODUCTNAME)
 installer::setupscript::replace_preset_properties($allvariableshashref);
-if ( $installer::globals::globallogging ) { installer::files::save_hash($loggingdir . "allvariables6.log", $allvariableshashref); }
 
 installer::scpzipfiles::replace_all_ziplistvariables_in_file($setupscriptref, $allvariableshashref);
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "setupscript3.log" ,$setupscriptref); }
 
 
 installer::logger::log_hashref($allvariableshashref);
@@ -413,28 +379,21 @@ $installer::logger::Info->print( "... an
 # Collect all directories in the script to get the destination dirs
 
 my $dirsinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "Directory");
-if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productdirectories1.log", $dirsinproductarrayref); }
 
 if ( $installer::globals::languagepack ) { installer::scriptitems::use_langpack_hostname($dirsinproductarrayref); }
 if ( $installer::globals::patch ) { installer::scriptitems::use_patch_hostname($dirsinproductarrayref); }
-if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productdirectories1a.log", $dirsinproductarrayref); }
 
 if ( $allvariableshashref->{'SHIFT_BASIS_INTO_BRAND_LAYER'} ) { $dirsinproductarrayref = installer::scriptitems::shift_basis_directory_parents($dirsinproductarrayref); }
-if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productdirectories1b.log", $dirsinproductarrayref); }
 if ( $allvariableshashref->{'OFFICEDIRECTORYNAME'} ) { installer::scriptitems::set_officedirectory_name($dirsinproductarrayref, $allvariableshashref->{'OFFICEDIRECTORYNAME'}); }
-if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productdirectories1b.log", $dirsinproductarrayref); }
 
 
 installer::scriptitems::resolve_all_directory_names($dirsinproductarrayref);
-if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productdirectories2.log", $dirsinproductarrayref); }
 
 $installer::logger::Info->print( "... analyzing files ... \n" );
 
 my $filesinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "File");
-if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles1.log", $filesinproductarrayref); }
 
 $filesinproductarrayref = installer::scriptitems::remove_delete_only_files_from_productlists($filesinproductarrayref);
-if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles2.log", $filesinproductarrayref); }
 
 if (( ! $installer::globals::iswindowsbuild ) && 
 	( ! $installer::globals::islinuxrpmbuild ) && 
@@ -446,76 +405,61 @@ if (( ! $installer::globals::iswindowsbu
 	{ installer::control::check_oxtfiles($filesinproductarrayref); }
 
 if ($installer::globals::product =~ /suite/i ) { $filesinproductarrayref = installer::scriptitems::remove_notinsuite_files_from_productlists($filesinproductarrayref); }
-if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles2aa.log", $filesinproductarrayref); }
 
 if (! $installer::globals::languagepack)
 {
 	$filesinproductarrayref = installer::scriptitems::remove_Languagepacklibraries_from_Installset($filesinproductarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles2b.log", $filesinproductarrayref); }
 }
 
 if (! $installer::globals::patch)
 {
 	$filesinproductarrayref = installer::scriptitems::remove_patchonlyfiles_from_Installset($filesinproductarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles2c.log", $filesinproductarrayref); }
 }
 
 if (! $installer::globals::tab)
 {
 	$filesinproductarrayref = installer::scriptitems::remove_tabonlyfiles_from_Installset($filesinproductarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles2c.log", $filesinproductarrayref); }
 }
 
 if (( $installer::globals::packageformat ne "installed" ) && ( $installer::globals::packageformat ne "archive" ))
 {
 	$filesinproductarrayref = installer::scriptitems::remove_installedproductonlyfiles_from_Installset($filesinproductarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles2cc.log", $filesinproductarrayref); }
 }
 
 $installer::logger::Info->print( "... analyzing scpactions ... \n" );
 
 my $scpactionsinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "ScpAction");
-if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions1.log", $scpactionsinproductarrayref); }
 
 if (( ! $allvariableshashref->{'XPDINSTALLER'} ) || ( ! $installer::globals::isxpdplatform ))
 {
 	$scpactionsinproductarrayref = installer::scriptitems::remove_Xpdonly_Items($scpactionsinproductarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions1a.log", $scpactionsinproductarrayref); }
 }
 
 if ( $installer::globals::languagepack ) { installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref); }
 if ( $installer::globals::patch ) { installer::scriptitems::use_patch_copy_scpaction($scpactionsinproductarrayref); }
 if (($installer::globals::devsnapshotbuild)) { installer::scriptitems::use_dev_copy_scpaction($scpactionsinproductarrayref); }
-if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions1b.log", $scpactionsinproductarrayref); }
 
 # $scpactionsinproductarrayref = installer::scriptitems::remove_scpactions_without_name($scpactionsinproductarrayref);
-# if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions2.log", $scpactionsinproductarrayref); }
 
 installer::scriptitems::change_keys_of_scpactions($scpactionsinproductarrayref);
-if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions2.log", $scpactionsinproductarrayref); }
 
 $installer::logger::Info->print( "... analyzing shortcuts ... \n" );
 
 my $linksinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "Shortcut");
-if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productlinks1.log", $linksinproductarrayref); }
 
 $installer::logger::Info->print( "... analyzing unix links ... \n" );
 
 my $unixlinksinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "Unixlink");
-if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "unixlinks1.log", $unixlinksinproductarrayref); }
 
 # $unixlinksinproductarrayref = installer::scriptitems::filter_layerlinks_from_unixlinks($unixlinksinproductarrayref);
-# if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "unixlinks1b.log", $unixlinksinproductarrayref); }
 
 $installer::logger::Info->print( "... analyzing profile ... \n" );
 
 my $profilesinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "Profile");
-if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "profiles1.log", $profilesinproductarrayref); }
 
 $installer::logger::Info->print( "... analyzing profileitems ... \n" );
 
 my $profileitemsinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "ProfileItem");
-if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "profileitems1.log", $profileitemsinproductarrayref); }
 
 my $folderinproductarrayref;
 my $folderitemsinproductarrayref;
@@ -527,31 +471,24 @@ if ( $installer::globals::iswindowsbuild
 	$installer::logger::Info->print( "... analyzing folders ... \n" );
 
 	$folderinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "Folder");
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "folder1.log", $folderinproductarrayref); }
 
 	$installer::logger::Info->print( "... analyzing folderitems ... \n" );
 
 	$folderitemsinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "FolderItem");
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "folderitems1.log", $folderitemsinproductarrayref); }
 
 	installer::setupscript::add_predefined_folder($folderitemsinproductarrayref, $folderinproductarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "folder1b.log", $folderinproductarrayref); }
 
 	installer::setupscript::prepare_non_advertised_files($folderitemsinproductarrayref, $filesinproductarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles2d.log", $filesinproductarrayref); }
 
 	$installer::logger::Info->print( "... analyzing registryitems ... \n" );
 
 	$registryitemsinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "RegistryItem");
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "registryitems1.log", $registryitemsinproductarrayref); }
 
 	$registryitemsinproductarrayref = installer::scriptitems::remove_uninstall_regitems_from_script($registryitemsinproductarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "registryitems1b.log", $registryitemsinproductarrayref); }
 
 	$installer::logger::Info->print( "... analyzing Windows custom actions ... \n" );
 
 	$windowscustomactionsarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "WindowsCustomAction");
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "windowscustomactions1.log", $windowscustomactionsarrayref); }
 }
 
 my $modulesinproductarrayref;
@@ -561,38 +498,29 @@ if (!($installer::globals::is_copy_only_
 	$installer::logger::Info->print( "... analyzing modules ... \n" );
 
 	$modulesinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "Module");
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "modules1.log", $modulesinproductarrayref); }
 
 	if (( ! $allvariableshashref->{'XPDINSTALLER'} ) || ( ! $installer::globals::isxpdplatform ))
 	{
 		$modulesinproductarrayref = installer::scriptitems::remove_Xpdonly_Items($modulesinproductarrayref);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "modules1a.log", $modulesinproductarrayref); }
 	}
 
 	installer::scriptitems::resolve_assigned_modules($modulesinproductarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "modules1b.log", $modulesinproductarrayref); }
 
 	$modulesinproductarrayref = installer::scriptitems::remove_template_modules($modulesinproductarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "modules1c.log", $modulesinproductarrayref); }
 
 	installer::scriptitems::set_children_flag($modulesinproductarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "modules1d.log", $modulesinproductarrayref); }
 
 	installer::scriptitems::collect_all_languagemodules($modulesinproductarrayref);
 
 	# Assigning the modules to the items
 
 	installer::scriptitems::assigning_modules_to_items($modulesinproductarrayref, $filesinproductarrayref, "Files");
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles3.log", $filesinproductarrayref); }
 
 	installer::scriptitems::assigning_modules_to_items($modulesinproductarrayref, $unixlinksinproductarrayref, "Unixlinks");
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "unixlinks2.log", $unixlinksinproductarrayref); }
 
 	installer::scriptitems::assigning_modules_to_items($modulesinproductarrayref, $dirsinproductarrayref, "Dirs");
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productdirectories2aa.log", $dirsinproductarrayref); }
 }
 
-if ( $installer::globals::debug ) { installer::logger::debuginfo("\nEnd of part 1a: The language independent part\n"); }
 
 # saving debug info, before staring part 1b
 if ( $installer::globals::debug ) { installer::logger::savedebug($installer::globals::exitlog); }
@@ -610,14 +538,12 @@ if ( $installer::globals::debug ) { inst
 # The for iterates over all products, separated by an # in the language list
 ###############################################################################
 
-if ( $installer::globals::debug ) { installer::logger::debuginfo("\nPart 1b: The language dependent part\n"); }
 
 # Run the following code block exactly once.
 # This strange version of a do{}while(false) loop exists only to allow (legacy) next statements.
 for (;1;last) 
 {
 	my $languagesarrayref = installer::languages::get_all_languages_for_one_product($installer::globals::languageproduct, $allvariableshashref);
-	if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "languages.log" ,$languagesarrayref); }
 
 	$installer::globals::alllanguagesinproductarrayref = $languagesarrayref;
 	my $languagestringref = installer::languages::get_language_string($languagesarrayref);
@@ -731,7 +657,6 @@ for (;1;last) 
 	################################################
 
 	$includepatharrayref_lang = installer::ziplist::replace_languages_in_pathes($includepatharrayref, $languagesarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allpatharray4.log" ,$includepatharrayref_lang); }
 
 	if ( $installer::globals::refresh_includepathes ) { installer::worker::collect_all_files_from_includepathes($includepatharrayref_lang); }
 
@@ -748,14 +673,11 @@ for (;1;last) 
 	#####################################
 
 	my $dirsinproductlanguageresolvedarrayref = installer::scriptitems::resolving_all_languages_in_productlists($dirsinproductarrayref, $languagesarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productdirectories3.log", $dirsinproductlanguageresolvedarrayref); }
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productdirectories2a.log", $dirsinproductarrayref); }
 
 	# A new directory array is needed ($dirsinproductlanguageresolvedarrayref instead of $dirsinproductarrayref)
 	# because $dirsinproductarrayref is needed in get_Destination_Directory_For_Item_From_Directorylist
 
 	installer::scriptitems::changing_name_of_language_dependent_keys($dirsinproductlanguageresolvedarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productdirectories4.log", $dirsinproductlanguageresolvedarrayref); }
 
 	installer::scriptitems::checking_directories_with_corrupt_hostname($dirsinproductlanguageresolvedarrayref, $languagesarrayref);
 
@@ -768,59 +690,44 @@ for (;1;last) 
 	$installer::logger::Info->print( "... analyzing files ...\n" );
 
 	my $filesinproductlanguageresolvedarrayref = installer::scriptitems::resolving_all_languages_in_productlists($filesinproductarrayref, $languagesarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles4.log", $filesinproductlanguageresolvedarrayref); }
 
 	if ( ! $installer::globals::set_office_start_language )
 	{
 		$filesinproductlanguageresolvedarrayref = installer::scriptitems::remove_office_start_language_files($filesinproductlanguageresolvedarrayref);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles4b.log", $filesinproductlanguageresolvedarrayref); }
 	}
 	
 	installer::scriptitems::changing_name_of_language_dependent_keys($filesinproductlanguageresolvedarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles5.log", $filesinproductlanguageresolvedarrayref); }
 
 	if ( $installer::globals::iswin and $^O =~ /MSWin/i ) { installer::converter::convert_slash_to_backslash($filesinproductlanguageresolvedarrayref); }
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles6.log", $filesinproductlanguageresolvedarrayref); }
 
 	$filesinproductlanguageresolvedarrayref = installer::scriptitems::remove_non_existent_languages_in_productlists($filesinproductlanguageresolvedarrayref, $languagestringref, "Name", "file");
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles7.log", $filesinproductlanguageresolvedarrayref); }
 
 	installer::scriptitems::get_Source_Directory_For_Files_From_Includepathlist($filesinproductlanguageresolvedarrayref, $includepatharrayref_lang, $dirsinproductlanguageresolvedarrayref, "Files");
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles8a.log", $filesinproductlanguageresolvedarrayref); }
 
 	$filesinproductlanguageresolvedarrayref = installer::scriptitems::add_bundled_extension_blobs( $filesinproductlanguageresolvedarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles8b.log", $filesinproductlanguageresolvedarrayref); }
     ($filesinproductlanguageresolvedarrayref,$dirsinproductarrayref) = installer::scriptitems::add_bundled_prereg_extensions(
         $filesinproductlanguageresolvedarrayref, $dirsinproductarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles8c.log", $filesinproductlanguageresolvedarrayref); }
 
 	installer::scriptitems::get_Destination_Directory_For_Item_From_Directorylist($filesinproductlanguageresolvedarrayref, $dirsinproductarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles9.log", $filesinproductlanguageresolvedarrayref); }
 
 	$filesinproductlanguageresolvedarrayref = installer::scriptitems::remove_Files_Without_Sourcedirectory($filesinproductlanguageresolvedarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles10.log", $filesinproductlanguageresolvedarrayref); }
 
 	if ($installer::globals::languagepack)
 	{
 		$filesinproductlanguageresolvedarrayref = installer::scriptitems::remove_Files_For_Languagepacks($filesinproductlanguageresolvedarrayref);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles10c.log", $filesinproductlanguageresolvedarrayref); }
 	}
 
 
 	if ( ! $allvariableshashref->{'NO_README_IN_ROOTDIR'} )
 	{
 		$filesinproductlanguageresolvedarrayref = installer::scriptitems::add_License_Files_into_Installdir($filesinproductlanguageresolvedarrayref, $dirsinproductlanguageresolvedarrayref, $languagesarrayref);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles10b.log", $filesinproductlanguageresolvedarrayref); }
 	}
 
 	$filesinproductlanguageresolvedarrayref = installer::scriptitems::remove_onlyasialanguage_files_from_productlists($filesinproductlanguageresolvedarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles10d.log", $filesinproductlanguageresolvedarrayref); }
 
 	$filesinproductlanguageresolvedarrayref = installer::scriptitems::remove_onlywesternlanguage_files_from_productlists($filesinproductlanguageresolvedarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles10e.log", $filesinproductlanguageresolvedarrayref); }
 
 	installer::scriptitems::make_filename_language_specific($filesinproductlanguageresolvedarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles10f.log", $filesinproductlanguageresolvedarrayref); }
 	
 	######################################################################################
 	# Unzipping files with flag ARCHIVE and putting all included files into the file list
@@ -831,15 +738,12 @@ for (;1;last) 
 	my @additional_paths_from_zipfiles = ();
 
 	$filesinproductlanguageresolvedarrayref = installer::archivefiles::resolving_archive_flag($filesinproductlanguageresolvedarrayref, \@additional_paths_from_zipfiles, $languagestringref, $loggingdir);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles11.log", $filesinproductlanguageresolvedarrayref); }
-	if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "additional_paths.log" ,\@additional_paths_from_zipfiles); }
 
 	# packed files sometimes contain a "$" in their name: HighlightText$1.class. For epm the "$" has to be quoted by "$$" 
 
 	if (!( $installer::globals::iswindowsbuild || $installer::globals::simple ) )
 	{
 		installer::scriptitems::quoting_illegal_filenames($filesinproductlanguageresolvedarrayref);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles12.log", $filesinproductlanguageresolvedarrayref); }
 	}
 
 	#####################################
@@ -849,7 +753,6 @@ for (;1;last) 
 	$installer::logger::Info->print( "... analyzing files with flag SUBST_FILENAME ...\n" );
 
 	installer::substfilenamefiles::resolving_subst_filename_flag($filesinproductlanguageresolvedarrayref, $allvariableshashref, $languagestringref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles12d.log", $filesinproductlanguageresolvedarrayref); }
 
 	#####################################
 	# Files with flag SCPZIP_REPLACE
@@ -860,7 +763,6 @@ for (;1;last) 
 	# Editing files with flag SCPZIP_REPLACE.
 
 	installer::scpzipfiles::resolving_scpzip_replace_flag($filesinproductlanguageresolvedarrayref, $allvariableshashref, "File", $languagestringref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles13.log", $filesinproductlanguageresolvedarrayref); }
 
 	#####################################
 	# Files with flag PATCH_SO_NAME
@@ -871,7 +773,6 @@ for (;1;last) 
 	# Editing files with flag PATCH_SO_NAME.
 
 	installer::scppatchsoname::resolving_patchsoname_flag($filesinproductlanguageresolvedarrayref, $allvariableshashref, "File", $languagestringref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles13b.log", $filesinproductlanguageresolvedarrayref); }
 
 	#####################################
 	# Files with flag HIDDEN
@@ -880,7 +781,6 @@ for (;1;last) 
 	$installer::logger::Info->print( "... analyzing files with flag HIDDEN ...\n" );
 
 	installer::worker::resolving_hidden_flag($filesinproductlanguageresolvedarrayref, $allvariableshashref, "File", $languagestringref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles13c.log", $filesinproductlanguageresolvedarrayref); }
 
 	############################################
 	# Collecting directories for epm list file
@@ -896,34 +796,26 @@ for (;1;last) 
 	# that have a CREATE flag. All other directories are created, if they contain at least one file.
 
 	my ($directoriesforepmarrayref, $alldirectoryhash) = installer::scriptitems::collect_directories_from_filesarray($filesinproductlanguageresolvedarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist1.log", $directoriesforepmarrayref); }
 	
 	($directoriesforepmarrayref, $alldirectoryhash) = installer::scriptitems::collect_directories_with_create_flag_from_directoryarray($dirsinproductlanguageresolvedarrayref, $alldirectoryhash);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist2.log", $directoriesforepmarrayref); }
 	
 	# installer::sorter::sorting_array_of_hashes($directoriesforepmarrayref, "HostName");
-	# if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist3.log", $directoriesforepmarrayref); }
 
 	#########################################################
 	# language dependent scpactions part
 	#########################################################
 
 	my $scpactionsinproductlanguageresolvedarrayref = installer::scriptitems::resolving_all_languages_in_productlists($scpactionsinproductarrayref, $languagesarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions3.log", $scpactionsinproductlanguageresolvedarrayref); }
 
 	installer::scriptitems::changing_name_of_language_dependent_keys($scpactionsinproductlanguageresolvedarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions4.log", $scpactionsinproductlanguageresolvedarrayref); }
 
 	installer::scriptitems::get_Source_Directory_For_Files_From_Includepathlist($scpactionsinproductlanguageresolvedarrayref, $includepatharrayref_lang, $dirsinproductlanguageresolvedarrayref, "ScpActions");
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions5.log", $scpactionsinproductlanguageresolvedarrayref); }
 
 	# Editing scpactions with flag SCPZIP_REPLACE and PATCH_SO_NAME.
 
 	installer::scpzipfiles::resolving_scpzip_replace_flag($scpactionsinproductlanguageresolvedarrayref, $allvariableshashref, "ScpAction", $languagestringref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions6.log", $scpactionsinproductlanguageresolvedarrayref); }
 
 	installer::scppatchsoname::resolving_patchsoname_flag($scpactionsinproductlanguageresolvedarrayref, $allvariableshashref, "ScpAction", $languagestringref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions6a.log", $scpactionsinproductlanguageresolvedarrayref); }
 
 	#########################################################
 	# language dependent links part
@@ -932,27 +824,20 @@ for (;1;last) 
 	$installer::logger::Info->print( "... analyzing links ...\n" );
 
 	my $linksinproductlanguageresolvedarrayref = installer::scriptitems::resolving_all_languages_in_productlists($linksinproductarrayref, $languagesarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productlinks2.log", $linksinproductlanguageresolvedarrayref); }
 
 	installer::scriptitems::changing_name_of_language_dependent_keys($linksinproductlanguageresolvedarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productlinks3.log", $linksinproductlanguageresolvedarrayref); }
 
 	installer::scriptitems::get_destination_file_path_for_links($linksinproductlanguageresolvedarrayref, $filesinproductlanguageresolvedarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productlinks4.log", $linksinproductlanguageresolvedarrayref); }
 
 	installer::scriptitems::get_Destination_Directory_For_Item_From_Directorylist($linksinproductlanguageresolvedarrayref, $dirsinproductarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productlinks5.log", $linksinproductlanguageresolvedarrayref); }
 
 	# Now taking all links that have no FileID but a ShortcutID, linking to another link
 
 	installer::scriptitems::get_destination_link_path_for_links($linksinproductlanguageresolvedarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productlinks6.log", $linksinproductlanguageresolvedarrayref); }
 
 	$linksinproductlanguageresolvedarrayref = installer::scriptitems::remove_workstation_only_items($linksinproductlanguageresolvedarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productlinks7.log", $linksinproductlanguageresolvedarrayref); }
 
 	installer::scriptitems::resolve_links_with_flag_relative($linksinproductlanguageresolvedarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productlinks8.log", $linksinproductlanguageresolvedarrayref); }
 
 	#########################################################
 	# language dependent unix links part
@@ -961,13 +846,10 @@ for (;1;last) 
 	$installer::logger::Info->print( "... analyzing unix links ...\n" );
 
 	my $unixlinksinproductlanguageresolvedarrayref = installer::scriptitems::resolving_all_languages_in_productlists($unixlinksinproductarrayref, $languagesarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "unixlinks3.log", $unixlinksinproductlanguageresolvedarrayref); }
 
 	installer::scriptitems::changing_name_of_language_dependent_keys($unixlinksinproductlanguageresolvedarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "unixlinks4.log", $unixlinksinproductlanguageresolvedarrayref); }
 
 	installer::scriptitems::get_Destination_Directory_For_Item_From_Directorylist($unixlinksinproductlanguageresolvedarrayref, $dirsinproductarrayref);
-	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "unixlinks5.log", $unixlinksinproductlanguageresolvedarrayref); }
 
 	#########################################################
 	# language dependent part for profiles and profileitems
@@ -981,33 +863,25 @@ for (;1;last) 
 		$installer::logger::Info->print( "... creating profiles ...\n" );
 
 		$profilesinproductlanguageresolvedarrayref = installer::scriptitems::resolving_all_languages_in_productlists($profilesinproductarrayref, $languagesarrayref);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "profiles2.log", $profilesinproductlanguageresolvedarrayref); }
 
 		$profileitemsinproductlanguageresolvedarrayref = installer::scriptitems::resolving_all_languages_in_productlists($profileitemsinproductarrayref, $languagesarrayref);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "profileitems2.log", $profilesinproductlanguageresolvedarrayref); }
 
 		installer::scriptitems::changing_name_of_language_dependent_keys($profilesinproductlanguageresolvedarrayref);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "profiles3.log", $profilesinproductlanguageresolvedarrayref); }
 
 		installer::scriptitems::changing_name_of_language_dependent_keys($profileitemsinproductlanguageresolvedarrayref);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "profileitems3.log", $profileitemsinproductlanguageresolvedarrayref); }
 
 		installer::scriptitems::replace_setup_variables($profileitemsinproductlanguageresolvedarrayref, $languagestringref, $allvariableshashref);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "profileitems4.log", $profileitemsinproductlanguageresolvedarrayref); }
 
 		if ( $installer::globals::patch_user_dir )
 		{
 			installer::scriptitems::replace_userdir_variable($profileitemsinproductlanguageresolvedarrayref);
-			if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "profileitems4a.log", $profileitemsinproductlanguageresolvedarrayref); }		
 		}
 
 		installer::scriptitems::get_Destination_Directory_For_Item_From_Directorylist($profilesinproductlanguageresolvedarrayref, $dirsinproductarrayref);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "profiles4.log", $profilesinproductlanguageresolvedarrayref); }
 
 		# Now the Profiles can be created
 
 		installer::profiles::create_profiles($profilesinproductlanguageresolvedarrayref, $profileitemsinproductlanguageresolvedarrayref, $filesinproductlanguageresolvedarrayref, $languagestringref, $allvariableshashref);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles15.log", $filesinproductlanguageresolvedarrayref); }
 	}
 
 	my $registryitemsinproductlanguageresolvedarrayref; # cannot be defined in the following "if ( $installer::globals::iswindowsbuild )"
@@ -1023,10 +897,8 @@ for (;1;last) 
 		$installer::logger::Info->print( "... analyzing folder ...\n" );
 
 		$folderinproductlanguageresolvedarrayref = installer::scriptitems::resolving_all_languages_in_productlists($folderinproductarrayref, $languagesarrayref);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "folder2.log", $folderinproductlanguageresolvedarrayref); }
 
 		installer::scriptitems::changing_name_of_language_dependent_keys($folderinproductlanguageresolvedarrayref);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "folder3.log", $folderinproductlanguageresolvedarrayref); }
 
 		#########################################################
 		# language dependent part for folderitems
@@ -1035,10 +907,8 @@ for (;1;last) 
 		$installer::logger::Info->print( "... analyzing folderitems ...\n" );
 
 		$folderitemsinproductlanguageresolvedarrayref = installer::scriptitems::resolving_all_languages_in_productlists($folderitemsinproductarrayref, $languagesarrayref);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "folderitems2.log", $folderitemsinproductlanguageresolvedarrayref); }
 
 		installer::scriptitems::changing_name_of_language_dependent_keys($folderitemsinproductlanguageresolvedarrayref);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "folderitems3.log", $folderitemsinproductlanguageresolvedarrayref); }
 
 		#########################################################
 		# language dependent part for registryitems
@@ -1047,10 +917,8 @@ for (;1;last) 
 		$installer::logger::Info->print( "... analyzing registryitems ...\n" );
 
 		$registryitemsinproductlanguageresolvedarrayref = installer::scriptitems::resolving_all_languages_in_productlists($registryitemsinproductarrayref, $languagesarrayref);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "registryitems2.log", $registryitemsinproductlanguageresolvedarrayref); }
 
 		installer::scriptitems::changing_name_of_language_dependent_keys($registryitemsinproductlanguageresolvedarrayref);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "registryitems3.log", $registryitemsinproductlanguageresolvedarrayref); }	
 	}
 
 	#########################################################
@@ -1064,13 +932,10 @@ for (;1;last) 
 		$installer::logger::Info->print( "... analyzing modules ...\n" );
 
 		$modulesinproductlanguageresolvedarrayref = installer::scriptitems::resolving_all_languages_in_productlists($modulesinproductarrayref, $languagesarrayref);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes_modules($loggingdir . "modules2.log", $modulesinproductlanguageresolvedarrayref); }
 
 		$modulesinproductlanguageresolvedarrayref = installer::scriptitems::remove_not_required_language_modules($modulesinproductlanguageresolvedarrayref, $languagesarrayref);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes_modules($loggingdir . "modules2a.log", $modulesinproductlanguageresolvedarrayref); }
 
 		installer::scriptitems::changing_name_of_language_dependent_keys($modulesinproductlanguageresolvedarrayref);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes_modules($loggingdir . "modules3a.log", $modulesinproductlanguageresolvedarrayref); }
 
 		# installer::scriptitems::collect_language_specific_names($modulesinproductlanguageresolvedarrayref);	
 		installer::scriptitems::select_required_language_strings($modulesinproductlanguageresolvedarrayref);	# using english strings
@@ -1083,27 +948,19 @@ for (;1;last) 
 	if ( $installer::globals::languagepack )
 	{
 		$filesinproductlanguageresolvedarrayref = installer::languagepack::select_language_items($filesinproductlanguageresolvedarrayref, $languagesarrayref, "File");
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles16b.log", $filesinproductlanguageresolvedarrayref); }
 		$scpactionsinproductlanguageresolvedarrayref = installer::languagepack::select_language_items($scpactionsinproductlanguageresolvedarrayref, $languagesarrayref, "ScpAction");
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions6b.log", $scpactionsinproductlanguageresolvedarrayref); }
 		$linksinproductlanguageresolvedarrayref = installer::languagepack::select_language_items($linksinproductlanguageresolvedarrayref, $languagesarrayref, "Shortcut");
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productlinks8b.log", $linksinproductlanguageresolvedarrayref); }
 		$unixlinksinproductlanguageresolvedarrayref = installer::languagepack::select_language_items($unixlinksinproductlanguageresolvedarrayref, $languagesarrayref, "Unixlink");
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "unixlinks5.log", $unixlinksinproductlanguageresolvedarrayref); }
 		@{$folderitemsinproductlanguageresolvedarrayref} = (); # no folderitems in languagepacks
 
 		# Collecting the directories again, to include only the language specific directories
 		($directoriesforepmarrayref, $alldirectoryhash) = installer::scriptitems::collect_directories_from_filesarray($filesinproductlanguageresolvedarrayref);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist3alangpack.log", $directoriesforepmarrayref); }
 		($directoriesforepmarrayref, $alldirectoryhash) = installer::scriptitems::collect_directories_with_create_flag_from_directoryarray($dirsinproductlanguageresolvedarrayref, $alldirectoryhash);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist3blangpack.log", $directoriesforepmarrayref); }
 		installer::sorter::sorting_array_of_hashes($directoriesforepmarrayref, "HostName");
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist3clangpack.log", $directoriesforepmarrayref); }
 
 		if ( $installer::globals::iswindowsbuild )
 		{
 			$registryitemsinproductlanguageresolvedarrayref = installer::worker::select_langpack_items($registryitemsinproductlanguageresolvedarrayref, "RegistryItem");
-			if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "registryitems3aa.log", $registryitemsinproductlanguageresolvedarrayref); }			
 		}
 
 	}
@@ -1115,31 +972,22 @@ for (;1;last) 
 	if (( $installer::globals::patch ) && (( $installer::globals::issolarispkgbuild ) || ( $installer::globals::iswindowsbuild )))
 	{
 		$filesinproductlanguageresolvedarrayref = installer::worker::select_patch_items($filesinproductlanguageresolvedarrayref, "File");
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles16patch.log", $filesinproductlanguageresolvedarrayref); }
 		$scpactionsinproductlanguageresolvedarrayref = installer::worker::select_patch_items($scpactionsinproductlanguageresolvedarrayref, "ScpAction");
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions6patch.log", $scpactionsinproductlanguageresolvedarrayref); }
 		$linksinproductlanguageresolvedarrayref = installer::worker::select_patch_items($linksinproductlanguageresolvedarrayref, "Shortcut");
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productlinks8patch.log", $linksinproductlanguageresolvedarrayref); }
 		$unixlinksinproductlanguageresolvedarrayref = installer::worker::select_patch_items($unixlinksinproductlanguageresolvedarrayref, "Unixlink");
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "unixlinks6patch.log", $unixlinksinproductlanguageresolvedarrayref); }
 		$folderitemsinproductlanguageresolvedarrayref = installer::worker::select_patch_items($folderitemsinproductlanguageresolvedarrayref, "FolderItem");
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfolderitems1patch.log", $folderitemsinproductlanguageresolvedarrayref); }
 		# @{$folderitemsinproductlanguageresolvedarrayref} = (); # no folderitems in languagepacks
 		
 		if ( $installer::globals::iswindowsbuild )
 		{
 			$registryitemsinproductlanguageresolvedarrayref = installer::worker::select_patch_items_without_name($registryitemsinproductlanguageresolvedarrayref, "RegistryItem");
-			if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "registryitems3a.log", $registryitemsinproductlanguageresolvedarrayref); }			
 
 			installer::worker::prepare_windows_patchfiles($filesinproductlanguageresolvedarrayref, $languagestringref, $allvariableshashref);
-			if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles16bpatch.log", $filesinproductlanguageresolvedarrayref); }
 
 			# For Windows patches, the directories can now be collected again
 			($directoriesforepmarrayref, $alldirectoryhash) = installer::scriptitems::collect_directories_from_filesarray($filesinproductlanguageresolvedarrayref);
-			if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist4_patch.log", $directoriesforepmarrayref); }
 		
 			installer::sorter::sorting_array_of_hashes($directoriesforepmarrayref, "HostName");
-			if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist5_patch.log", $directoriesforepmarrayref); }
 		}
 	}
 
@@ -1157,7 +1005,6 @@ for (;1;last) 
 	{
 		$installer::logger::Info->print( "... creating inf files ...\n" );
 		installer::worker::create_inf_file($filesinproductlanguageresolvedarrayref, $registryitemsinproductlanguageresolvedarrayref, $folderinproductlanguageresolvedarrayref, $folderitemsinproductlanguageresolvedarrayref, $modulesinproductlanguageresolvedarrayref, $languagesarrayref, $languagestringref, $allvariableshashref);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles16c.log", $filesinproductlanguageresolvedarrayref); }
 	}
 
 	###########################################
@@ -1168,7 +1015,6 @@ for (;1;last) 
 	if ( $allvariableshashref->{'UPXPRODUCT'} )
 	{
 		installer::upx::upx_on_libraries($filesinproductlanguageresolvedarrayref, $languagestringref);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles16d.log", $filesinproductlanguageresolvedarrayref); }
 	}
 
 	###########################################################
@@ -1200,7 +1046,6 @@ for (;1;last) 
 	installer::packagelist::log_packages_content($packages);
 	installer::packagelist::create_module_destination_hash($packages, $allvariableshashref);
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("\nEnd of part 1b: The language dependent part\n"); }
 
 	# saving debug info, before starting part 2
 	if ( $installer::globals::debug ) { installer::logger::savedebug($installer::globals::exitlog); }
@@ -1209,13 +1054,11 @@ for (;1;last) 
 	# Part 2: The platform dependent part
 	#################################################
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("\nPart 2: The platform dependent part\n"); }
 
 	#################################################
 	# Part 2a: All non-Windows platforms
 	#################################################
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("\nPart 2a: All non-Windows platforms\n"); }
 
 	#########################################################
 	# ... creating epm list file ...
@@ -1366,39 +1209,27 @@ for (;1;last) 
 			#############################################
 
 			my $filesinpackage = installer::converter::copy_collector($filesinproductlanguageresolvedarrayref);
-			if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "files1_" . $packagename . ".log", $filesinpackage); }	
 			my $linksinpackage = installer::converter::copy_collector($linksinproductlanguageresolvedarrayref);
-			if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "links1_" . $packagename . ".log", $linksinpackage); }	
 			my $unixlinksinpackage = installer::converter::copy_collector($unixlinksinproductlanguageresolvedarrayref);
-			if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "unixlinks1_" . $packagename . ".log", $unixlinksinpackage); }	
 			my $dirsinpackage = installer::converter::copy_collector($directoriesforepmarrayref);
-			if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "dirs1_" . $packagename . ".log", $dirsinpackage); }	
 
 			###########################################
 			# setting the root path for the packages
 			###########################################
 			
 			installer::scriptitems::add_rootpath_to_directories($dirsinpackage, $packagerootpath);
-			if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "dirs2_" . $packagename . ".log", $dirsinpackage); }	
 			installer::scriptitems::add_rootpath_to_files($filesinpackage, $packagerootpath);
-			if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "files2_" . $packagename . ".log", $filesinpackage); }	
 			installer::scriptitems::add_rootpath_to_links($linksinpackage, $packagerootpath);
-			if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "links2_" . $packagename . ".log", $linksinpackage); }	
 			installer::scriptitems::add_rootpath_to_files($unixlinksinpackage, $packagerootpath);
-			if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "unixlinks2_" . $packagename . ".log", $unixlinksinpackage); }	
 
 			#################################
 			# collecting items for package
 			#################################
 
 			$filesinpackage = installer::packagelist::find_files_for_package($filesinpackage, $onepackage);
-			if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "files3_" . $packagename . ".log", $filesinpackage); }	
 			$unixlinksinpackage = installer::packagelist::find_files_for_package($unixlinksinpackage, $onepackage);
-			if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "unixlinks3_" . $packagename . ".log", $unixlinksinpackage); }	
 			$linksinpackage = installer::packagelist::find_links_for_package($linksinpackage, $filesinpackage);
-			if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "links3_" . $packagename . ".log", $linksinpackage); }	
 			$dirsinpackage = installer::packagelist::find_dirs_for_package($dirsinpackage, $onepackage);
-			if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "dirs3_" . $packagename . ".log", $dirsinpackage); }	
 
 			###############################################
 			# nothing to do, if $filesinpackage is empty
@@ -1442,7 +1273,6 @@ for (;1;last) 
 			if ( $installer::globals::strip )
 			{
 				installer::strip::strip_libraries($filesinpackage, $languagestringref);
-				if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . $packagename ."_files.log", $filesinpackage); }
 			}
 			
 			###############################################################
@@ -1466,9 +1296,6 @@ for (;1;last) 
 						if ( $installer::globals::patch ) { $installer::globals::call_epm = 1; }	 # enabling packing again
 						$run = 1;
 
-						if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "files3b_" . $packagename . ".log", $filesinpackage); }
-						if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "links3b_" . $packagename . ".log", $linksinpackage); }
-						if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "dirs3b_" . $packagename . ".log", $dirsinpackage); }
 					}
 
 					if (( ! $installer::globals::makelinuxlinkrpm ) && ( ! $run ))
@@ -1481,9 +1308,6 @@ for (;1;last) 
 						$shellscriptsfilename = "";	# shell scripts only need to be included into the link rpm
 						$run = 1;
 
-						if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "files3a_" . $packagename . ".log", $filesinpackage); }
-						if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "links3a_" . $packagename . ".log", $linksinpackage); }
-						if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "dirs3a_" . $packagename . ".log", $dirsinpackage); }
 					}					
 				}							
 			}
@@ -1532,7 +1356,6 @@ for (;1;last) 
 				if (( $installer::globals::patch ) && ( $installer::globals::issolarispkgbuild ))
 				{
 					$filesinpackage = installer::worker::analyze_patch_files($filesinpackage);
-					if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "files4_" . $packagename . ".log", $filesinpackage); }	
 
 					if ( ! ( $#{$filesinpackage} > -1 ))
 					{
@@ -1837,13 +1660,11 @@ for (;1;last) 
 
 	}	# end of "if (!( $installer::globals::iswindowsbuild ))"
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("\nEnd of part 2a: All non-Windows platforms\n"); }
 
 	#################################################
 	# Part 2b: The Windows platform
 	#################################################
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("\nPart 2b: The Windows platform\n"); }
 
 	#####################################################################
 	# ... creating idt files ...
@@ -1863,7 +1684,6 @@ for (;1;last) 
 		if ( $installer::globals::compiler =~ /wntgcci/ )
 		{
 		    installer::windows::strip::strip_binaries($filesinproductlanguageresolvedarrayref, $languagestringref);
-		    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles16e.log", $filesinproductlanguageresolvedarrayref); }
 		}
 
 		$installdir = installer::worker::create_installation_directory($shipinstalldir, $languagestringref, \$current_install_number);
@@ -1902,7 +1722,6 @@ for (;1;last) 
 		# Removing all files with flag "BINARYTABLE_ONLY"
 		@installer::globals::binarytableonlyfiles = ();
 		$filesinproductlanguageresolvedarrayref = installer::worker::remove_all_items_with_special_flag($filesinproductlanguageresolvedarrayref ,"BINARYTABLE_ONLY");
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles17.log", $filesinproductlanguageresolvedarrayref); }
 
 		# Collecting all profileitems with flag "INIFILETABLE" for table "IniFile"
 		my $inifiletableentries = installer::worker::collect_all_items_with_special_flag($profileitemsinproductlanguageresolvedarrayref ,"INIFILETABLE");
@@ -1913,40 +1732,28 @@ for (;1;last) 
 
 		# Add cabinet assignments to files
 		installer::windows::file::assign_cab_to_files($filesinproductlanguageresolvedarrayref);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles17a.log", $filesinproductlanguageresolvedarrayref); }
 		installer::windows::file::assign_sequencenumbers_to_files($filesinproductlanguageresolvedarrayref);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles17b.log", $filesinproductlanguageresolvedarrayref); }
 
 		# Collection all available directory trees
 		installer::windows::directory::collectdirectorytrees($directoriesforepmarrayref);
 
 		$filesinproductlanguageresolvedarrayref = installer::windows::file::create_files_table($filesinproductlanguageresolvedarrayref, \@allfilecomponents, $newidtdir, $allvariableshashref, $uniquefilename);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles17c.log", $filesinproductlanguageresolvedarrayref); }
 
 		installer::windows::directory::create_directory_table($directoriesforepmarrayref, $newidtdir, $allvariableshashref, $shortdirname, $loggingdir);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles18.log", $filesinproductlanguageresolvedarrayref); }
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforidt1.log", $directoriesforepmarrayref); }
 
 		# Attention: The table "Registry.idt" contains language specific strings -> parameter: $languagesarrayref !
 		installer::windows::registry::create_registry_table($registryitemsinproductlanguageresolvedarrayref, \@allregistrycomponents, $newidtdir, $languagesarrayref, $allvariableshashref);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "registryitems4.log", $registryitemsinproductlanguageresolvedarrayref); }
 	
 		installer::windows::component::create_component_table($filesinproductlanguageresolvedarrayref, $registryitemsinproductlanguageresolvedarrayref, $directoriesforepmarrayref, \@allfilecomponents, \@allregistrycomponents, $newidtdir, $componentid, $componentidkeypath, $allvariableshashref);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles19.log", $filesinproductlanguageresolvedarrayref); }
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "registryitems5.log", $registryitemsinproductlanguageresolvedarrayref); }
 
 		# Attention: The table "Feature.idt" contains language specific strings -> parameter: $languagesarrayref !
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "modules4.log", $modulesinproductlanguageresolvedarrayref); }
 		installer::windows::feature::add_uniquekey($modulesinproductlanguageresolvedarrayref);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "modules4a.log", $modulesinproductlanguageresolvedarrayref); }
 		$modulesinproductlanguageresolvedarrayref = installer::windows::feature::sort_feature($modulesinproductlanguageresolvedarrayref);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "modules4b.log", $modulesinproductlanguageresolvedarrayref); }
 		installer::windows::feature::create_feature_table($modulesinproductlanguageresolvedarrayref, $newidtdir, $languagesarrayref, $allvariableshashref);
 
 		installer::windows::featurecomponent::create_featurecomponent_table($filesinproductlanguageresolvedarrayref, $registryitemsinproductlanguageresolvedarrayref, $newidtdir);
 
 		installer::windows::media::create_media_table($filesinproductlanguageresolvedarrayref, $newidtdir, $allvariableshashref);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles20.log", $filesinproductlanguageresolvedarrayref); }
 
 		installer::windows::font::create_font_table($filesinproductlanguageresolvedarrayref, $newidtdir);
 
@@ -1955,7 +1762,6 @@ for (;1;last) 
 		my @iconfilecollector = ();
 
 		installer::windows::shortcut::create_shortcut_table($filesinproductlanguageresolvedarrayref, $linksinproductlanguageresolvedarrayref, $folderinproductlanguageresolvedarrayref, $folderitemsinproductlanguageresolvedarrayref, $directoriesforepmarrayref, $newidtdir, $languagesarrayref, $includepatharrayref, \@iconfilecollector);
-		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "folderitems4.log", $folderitemsinproductlanguageresolvedarrayref); }
 
 		installer::windows::inifile::create_inifile_table($inifiletableentries, $filesinproductlanguageresolvedarrayref, $newidtdir);
 
@@ -2255,7 +2061,6 @@ for (;1;last) 
 		
 	}	 # end of "if ( $installer::globals::iswindowsbuild )"
 
-	if ( $installer::globals::debug ) { installer::logger::debuginfo("\nEnd of part 2b: The Windows platform\n"); }
 
 	# saving file_info file for later analysis
 	my $speciallogfilename = "fileinfo_" . $installer::globals::product . "\.log";

Modified: openoffice/branches/ooxml-osba/main/solenv/bin/modules/installer/windows/directory.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/solenv/bin/modules/installer/windows/directory.pm?rev=1544164&r1=1544163&r2=1544164&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/solenv/bin/modules/installer/windows/directory.pm (original)
+++ openoffice/branches/ooxml-osba/main/solenv/bin/modules/installer/windows/directory.pm Thu Nov 21 12:58:58 2013
@@ -468,11 +468,6 @@ sub add_root_directories
 			$productkey = $productkey . " " . $allvariableshashref->{'POSTVERSIONEXTENSION'}; 
 			$realproductkey = $realproductkey . " " . $allvariableshashref->{'POSTVERSIONEXTENSION'}; 
 		}
-		if ( $allvariableshashref->{'NOVERSIONINDIRNAME'} ) 
-		{ 
-			$productkey = $productname; 
-			$realproductkey = $realproductname; 
-		}
 		if ( $allvariableshashref->{'NOSPACEINDIRECTORYNAME'} ) 
 		{
 			$productkey =~ s/\ /\_/g; 

Modified: openoffice/branches/ooxml-osba/main/solenv/gbuild/platform/macosx.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/solenv/gbuild/platform/macosx.mk?rev=1544164&r1=1544163&r2=1544164&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/solenv/gbuild/platform/macosx.mk (original)
+++ openoffice/branches/ooxml-osba/main/solenv/gbuild/platform/macosx.mk Thu Nov 21 12:58:58 2013
@@ -300,7 +300,7 @@ gb_Library_TARGETTYPEFLAGS := -dynamicli
 gb_Library_SYSPRE := lib
 gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
 gb_Library_PLAINEXT := .dylib
-gb_Library_RTEXT := $(COMID)$(gb_Library_PLAINEXT)
+gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
 
 gb_Library_OOOEXT := $(gb_Library_PLAINEXT)
 gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)

Modified: openoffice/branches/ooxml-osba/main/solenv/inc/unxmacx.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/solenv/inc/unxmacx.mk?rev=1544164&r1=1544163&r2=1544164&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/solenv/inc/unxmacx.mk (original)
+++ openoffice/branches/ooxml-osba/main/solenv/inc/unxmacx.mk Thu Nov 21 12:58:58 2013
@@ -44,7 +44,6 @@ CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRAN
 #.EXPORT: MACOSX_DEPLOYMENT_TARGET
 CDEFS+=-DQUARTZ 
 EXTRA_CDEFS*=-isysroot /Developer/SDKs/MacOSX10.4u.sdk
-.ENDIF
 
 # Name of library where static data members are initialized
 # STATICLIBNAME=static$(DLLPOSTFIX)



Mime
View raw message